From db044bdf139dfc4760fe0b31dcd726e9d681d22d Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Mon, 21 Sep 2026 12:40:13 +0200 Subject: [PATCH 1/5] Migrate core ITs from maven-verifier to maven-executor maven-verifier is deprecated (apache/maven-verifier#186); the Verifier is now the in-repo org.apache.maven.it.Verifier on maven-executor, as on master. Artifact paths are computed locally, without the toolbox plugin (apache/maven-executor#44). (cherry picked from commit 8b1c9b04a877b3447b3b8cf79525899309b20540) --- core-it-suite/pom.xml | 4 +- .../maven/it/MavenIT0008SimplePluginTest.java | 4 +- .../it/MavenIT0009GoalConfigurationTest.java | 4 +- ...IT0010DependencyClosureResolutionTest.java | 4 +- ...aultVersionByDependencyManagementTest.java | 4 +- .../it/MavenIT0012PomInterpolationTest.java | 4 +- .../MavenIT0018DependencyManagementTest.java | 4 +- ...IT0019PluginVersionMgmtBySuperPomTest.java | 4 +- .../maven/it/MavenIT0021PomProfileTest.java | 4 +- .../it/MavenIT0023SettingsProfileTest.java | 4 +- ...MavenIT0024MultipleGoalExecutionsTest.java | 4 +- ...0025MultipleExecutionLevelConfigsTest.java | 4 +- ...venIT0030DepPomDepMgmtInheritanceTest.java | 4 +- .../it/MavenIT0032MavenPrerequisiteTest.java | 4 +- ...avenIT0037AlternatePomFileSameDirTest.java | 4 +- ...T0038AlternatePomFileDifferentDirTest.java | 4 +- ...T0040PackagingFromPluginExtensionTest.java | 4 +- ...41ArtifactTypeFromPluginExtensionTest.java | 4 +- ...MavenIT0056MultipleGoalExecutionsTest.java | 4 +- .../MavenIT0063SystemScopeDependencyTest.java | 4 +- .../MavenIT0064MojoConfigViaSettersTest.java | 4 +- ...071PluginConfigWithDottedPropertyTest.java | 4 +- ...72InterpolationWithDottedPropertyTest.java | 4 +- .../MavenIT0085TransitiveSystemScopeTest.java | 6 +- .../maven/it/MavenIT0086PluginRealmTest.java | 4 +- ...87PluginRealmWithProjectLevelDepsTest.java | 4 +- .../MavenIT0090EnvVarInterpolationTest.java | 4 +- .../it/MavenIT0108SnapshotUpdateTest.java | 6 +- ...rAuthzAvailableToWagonMgrInPluginTest.java | 4 +- .../it/MavenIT0130CleanLifecycleTest.java | 4 +- .../it/MavenIT0131SiteLifecycleTest.java | 4 +- .../maven/it/MavenIT0132PomLifecycleTest.java | 4 +- .../maven/it/MavenIT0133JarLifecycleTest.java | 4 +- .../maven/it/MavenIT0134WarLifecycleTest.java | 4 +- .../maven/it/MavenIT0135EjbLifecycleTest.java | 4 +- .../maven/it/MavenIT0136RarLifecycleTest.java | 4 +- .../maven/it/MavenIT0137EarLifecycleTest.java | 4 +- .../it/MavenIT0138PluginLifecycleTest.java | 4 +- ...139InterpolationWithProjectPrefixTest.java | 4 +- ...nIT0140InterpolationWithPomPrefixTest.java | 4 +- ...MavenIT0142DirectDependencyScopesTest.java | 4 +- ...nIT0143TransitiveDependencyScopesTest.java | 4 +- ...avenIT0144LifecycleExecutionOrderTest.java | 4 +- .../MavenIT0146InstallerSnapshotNaming.java | 4 +- .../it/MavenIT0199CyclicImportScopeTest.java | 4 +- .../apache/maven/it/MavenITBootstrapTest.java | 4 +- ...TerminallyDeprecatedMethodInGuiceTest.java | 4 +- ...enITgh10937QuotedPipesInMavenOptsTest.java | 4 +- ...enITmng0095ReactorFailureBehaviorTest.java | 6 +- .../MavenITmng0187CollectedProjectsTest.java | 4 +- ...enITmng0249ResolveDepsFromReactorTest.java | 4 +- ...ReactorExecWhenProjectIndependentTest.java | 4 +- ...mng0294MergeGlobalAndUserSettingsTest.java | 4 +- ...enITmng0377PluginLookupFromPrefixTest.java | 4 +- ...nITmng0449PluginVersionResolutionTest.java | 4 +- ...g0461TolerateMissingDependencyPomTest.java | 4 +- .../it/MavenITmng0469ReportConfigTest.java | 4 +- .../it/MavenITmng0471CustomLifecycleTest.java | 4 +- ...MavenITmng0479OverrideCentralRepoTest.java | 6 +- ...0496IgnoreUnknownPluginParametersTest.java | 4 +- .../it/MavenITmng0505VersionRangeTest.java | 4 +- .../MavenITmng0507ArtifactRelocationTest.java | 4 +- ...Tmng0522InheritedPluginMgmtConfigTest.java | 4 +- ...nITmng0553SettingsAuthzEncryptionTest.java | 4 +- ...venITmng0557UserSettingsCliOptionTest.java | 4 +- ...enITmng0612NewestConflictResolverTest.java | 4 +- .../it/MavenITmng0666IgnoreLegacyPomTest.java | 4 +- ...avenITmng0674PluginParameterAliasTest.java | 4 +- .../it/MavenITmng0680ParentBasedirTest.java | 4 +- ...nITmng0761MissingSnapshotDistRepoTest.java | 4 +- .../it/MavenITmng0768OfflineModeTest.java | 6 +- ...73SettingsProfileReactorPollutionTest.java | 4 +- ...ITmng0781PluginConfigVsExecConfigTest.java | 4 +- ...MavenITmng0786ProfileAwareReactorTest.java | 4 +- ...Tmng0814ExplicitProfileActivationTest.java | 4 +- ...avenITmng0818WarDepsNotTransitiveTest.java | 4 +- .../MavenITmng0820ConflictResolutionTest.java | 4 +- .../MavenITmng0823MojoContextPassingTest.java | 4 +- ...Tmng0828PluginConfigValuesInDebugTest.java | 4 +- ...enITmng0836PluginParentResolutionTest.java | 6 +- ...UserPropertyOverridesDefaultValueTest.java | 4 +- ...avenITmng0866EvaluateDefaultValueTest.java | 4 +- ...ng0870ReactorAwarePluginDiscoveryTest.java | 4 +- .../MavenITmng0947OptionalDependencyTest.java | 4 +- ...InjectionViaProjectLevelPluginDepTest.java | 4 +- ...mng0985NonExecutedPluginMgmtGoalsTest.java | 4 +- ...mng1021EqualAttachmentBuildNumberTest.java | 4 +- .../MavenITmng1052PluginMgmtConfigTest.java | 4 +- ...enITmng1073AggregatorForksReactorTest.java | 4 +- ...nITmng1088ReactorPluginResolutionTest.java | 4 +- ...ITmng1142VersionRangeIntersectionTest.java | 4 +- ...avenITmng1144MultipleDefaultGoalsTest.java | 4 +- ...nITmng1233WarDepWithProvidedScopeTest.java | 4 +- .../MavenITmng1323AntrunDependenciesTest.java | 4 +- .../it/MavenITmng1349ChecksumFormatsTest.java | 4 +- .../MavenITmng1412DependenciesOrderTest.java | 4 +- ...enITmng1415QuotedSystemPropertiesTest.java | 4 +- ...mng1491ReactorArtifactIdCollisionTest.java | 6 +- ...Tmng1493NonStandardModulePomNamesTest.java | 4 +- .../it/MavenITmng1701DuplicatePluginTest.java | 6 +- ...ITmng1703PluginMgmtDepInheritanceTest.java | 4 +- ...cedMetadataUpdateDuringDeploymentTest.java | 4 +- ...ValidationErrorIncludesLineNumberTest.java | 4 +- ...nITmng1895ScopeConflictResolutionTest.java | 4 +- ...1957JdkActivationWithVersionRangeTest.java | 4 +- ...mng1992SystemPropOverridesPomPropTest.java | 4 +- ...95InterpolateBooleanModelElementsTest.java | 4 +- ...g2006ChildPathAwareUrlInheritanceTest.java | 4 +- ...estJarDependenciesBrokenInReactorTest.java | 4 +- ...lateWithSettingsProfilePropertiesTest.java | 4 +- ...mng2054PluginExecutionInheritanceTest.java | 4 +- ...enITmng2068ReactorRelativeParentsTest.java | 4 +- ...ersionRangeSatisfiedFromWrongRepoTest.java | 4 +- ...mng2103PluginExecutionInheritanceTest.java | 4 +- ...enITmng2123VersionRangeDependencyTest.java | 4 +- ...4PomInterpolationWithParentValuesTest.java | 4 +- ...g2130ParentLookupFromReactorCacheTest.java | 4 +- ...avenITmng2135PluginBuildInReactorTest.java | 4 +- ...enITmng2136ActiveByDefaultProfileTest.java | 4 +- ...ReactorAwareDepResolutionWhenForkTest.java | 4 +- ...4PluginDepsManagedByParentProfileTest.java | 4 +- .../MavenITmng2196ParentResolutionTest.java | 6 +- .../MavenITmng2199ParentVersionRangeTest.java | 6 +- ...Tmng2201PluginConfigInterpolationTest.java | 4 +- ...2OutputDirectoryReactorResolutionTest.java | 4 +- .../MavenITmng2228ComponentInjectionTest.java | 4 +- ...mng2234ActiveProfilesFromSettingsTest.java | 4 +- .../it/MavenITmng2254PomEncodingTest.java | 4 +- ...ofileActivationBySettingsPropertyTest.java | 4 +- ...277AggregatorAndResolutionPluginsTest.java | 4 +- .../it/MavenITmng2305MultipleProxiesTest.java | 4 +- ...venITmng2309ProfileInjectionOrderTest.java | 4 +- ...venITmng2318LocalParentResolutionTest.java | 4 +- ...nITmng2339BadProjectInterpolationTest.java | 4 +- ...MavenITmng2362DeployedPomEncodingTest.java | 4 +- ...Tmng2363BasedirAwareFileActivatorTest.java | 4 +- .../it/MavenITmng2387InactiveProxyTest.java | 4 +- .../MavenITmng2432PluginPrefixOrderTest.java | 4 +- ...pedDependencyVersionInterpolationTest.java | 4 +- .../it/MavenITmng2562Timestamp322Test.java | 4 +- .../it/MavenITmng2576MakeLikeReactorTest.java | 4 +- ...ITmng2577SettingsXmlInterpolationTest.java | 4 +- ...mng2591MergeInheritedPluginConfigTest.java | 4 +- ...enITmng2605BogusProfileActivationTest.java | 4 +- ...68UsePluginDependenciesForSortingTest.java | 4 +- .../MavenITmng2690MojoLoadingErrorsTest.java | 6 +- .../it/MavenITmng2693SitePluginRealmTest.java | 4 +- ...enITmng2695OfflinePluginSnapshotsTest.java | 4 +- ...Tmng2720SiblingClasspathArtifactsTest.java | 4 +- ...738ProfileIdCollidesWithCliOptionTest.java | 4 +- ...mng2739RequiredRepositoryElementsTest.java | 6 +- ...ginMetadataResolutionErrorMessageTest.java | 6 +- ...avenITmng2744checksumVerificationTest.java | 4 +- ...mng2749ExtensionAvailableToPluginTest.java | 4 +- ...2771PomExtensionComponentOverrideTest.java | 4 +- ...MavenITmng2790LastUpdatedMetadataTest.java | 4 +- .../it/MavenITmng2820PomCommentsTest.java | 4 +- ...ArtifactHandlerAndCustomLifecycleTest.java | 4 +- ...43PluginConfigPropertiesInjectionTest.java | 4 +- ...leActivationByEnvironmentVariableTest.java | 4 +- ...avenITmng2861RelocationsAndRangesTest.java | 4 +- .../it/MavenITmng2865MirrorWildcardTest.java | 4 +- ...71PrePackageSubartifactResolutionTest.java | 4 +- ...MavenITmng2892HideCorePlexusUtilsTest.java | 4 +- ...nITmng2921ActiveAttachedArtifactsTest.java | 4 +- .../MavenITmng2926PluginPrefixOrderTest.java | 4 +- ...ITmng2972OverridePluginDependencyTest.java | 4 +- ...nITmng2994SnapshotRangeRepositoryTest.java | 4 +- ...actorFailureBehaviorMultithreadedTest.java | 6 +- .../it/MavenITmng3012CoreClassImportTest.java | 4 +- ...ng3023ReactorDependencyResolutionTest.java | 6 +- ...nITmng3038TransitiveDepManVersionTest.java | 6 +- ...ng3043BestEffortReactorResolutionTest.java | 4 +- .../MavenITmng3052DepRepoAggregationTest.java | 4 +- ...SnapshotsExcludedFromVersionRangeTest.java | 4 +- ...Tmng3099SettingsProfilesWithNoPomTest.java | 4 +- .../MavenITmng3118TestClassPathOrderTest.java | 4 +- ...mng3122ActiveProfilesNoDuplicatesTest.java | 4 +- ...rmalizationNotBeforeInterpolationTest.java | 4 +- ...seCachedMetadataOfBlacklistedRepoTest.java | 4 +- .../it/MavenITmng3183LoggingToFileTest.java | 4 +- ...enITmng3203DefaultLifecycleExecIdTest.java | 4 +- ...mng3208ProfileAwareReactorSortingTest.java | 4 +- ...venITmng3217InterPluginDependencyTest.java | 4 +- .../it/MavenITmng3220ImportScopeTest.java | 6 +- ...3259DepsDroppedInMultiModuleBuildTest.java | 4 +- ...mng3268MultipleHyphenPCommandLineTest.java | 4 +- .../MavenITmng3284UsingCachedPluginsTest.java | 4 +- .../it/MavenITmng3288SystemScopeDirTest.java | 6 +- ...ng3297DependenciesNotLeakedToMojoTest.java | 4 +- .../MavenITmng3314OfflineSnapshotsTest.java | 4 +- ...nITmng3331ModulePathNormalizationTest.java | 4 +- ...ng3355TranslatedPathInterpolationTest.java | 4 +- ...Tmng3372DirectInvocationOfPluginsTest.java | 4 +- ...Tmng3379ParallelArtifactDownloadsTest.java | 4 +- ...Tmng3380ManagedRelocatedTransdepsTest.java | 4 +- ...Tmng3394POMPluginVersionDominanceTest.java | 4 +- ...anagementForOverConstrainedRangesTest.java | 4 +- .../MavenITmng3401CLIDefaultExecIdTest.java | 4 +- ...enITmng3415JunkRepositoryMetadataTest.java | 4 +- ...Tmng3422ActiveComponentCollectionTest.java | 4 +- ...taUpdatedFromDeploymentRepositoryTest.java | 4 +- .../it/MavenITmng3461MirrorMatchingTest.java | 4 +- ...ecksumVerificationOfDependencyPomTest.java | 6 +- .../it/MavenITmng3475BaseAlignedDirTest.java | 4 +- ...7DependencyResolutionErrorMessageTest.java | 6 +- ...mng3482DependencyPomInterpolationTest.java | 4 +- ...enITmng3485OverrideWagonExtensionTest.java | 4 +- .../it/MavenITmng3498ForkToOtherMojoTest.java | 4 +- .../it/MavenITmng3503Xpp3ShadingTest.java | 4 +- ...ng3506ArtifactHandlersFromPluginsTest.java | 6 +- .../it/MavenITmng3529QuotedCliArgTest.java | 4 +- ...Tmng3535SelfReferentialPropertiesTest.java | 4 +- ...venITmng3536AppendedAbsolutePathsTest.java | 4 +- ...MavenITmng3545ProfileDeactivationTest.java | 4 +- ...decimalOctalPluginParameterConfigTest.java | 4 +- ...Tmng3581PluginUsesWagonDependencyTest.java | 4 +- ...ng3586SystemScopePluginDependencyTest.java | 6 +- ...ITmng3599useHttpProxyForWebDAVMk2Test.java | 4 +- ...enITmng3600DeploymentModeDefaultsTest.java | 4 +- ...ITmng3607ClassLoadersUseValidUrlsTest.java | 4 +- .../MavenITmng3621UNCInheritedPathsTest.java | 4 +- ...ITmng3641ProfileActivationWarningTest.java | 4 +- .../MavenITmng3642DynamicResourcesTest.java | 4 +- .../it/MavenITmng3645POMSyntaxErrorTest.java | 6 +- .../it/MavenITmng3652UserAgentHeaderTest.java | 4 +- ...g3667ResolveDepsWithBadPomVersionTest.java | 4 +- ...ng3671PluginLevelDepInterpolationTest.java | 4 +- ...Tmng3679PluginExecIdInterpolationTest.java | 4 +- ...avenITmng3680InvalidDependencyPOMTest.java | 4 +- ...avenITmng3684BuildPluginParameterTest.java | 4 +- ...avenITmng3693PomFileBasedirChangeTest.java | 4 +- ...nITmng3694ReactorProjectsDynamismTest.java | 4 +- .../MavenITmng3701ImplicitProfileIdTest.java | 4 +- ...ExecutionProjectWithRelativePathsTest.java | 4 +- ...venITmng3710PollutedClonedPluginsTest.java | 4 +- ...MavenITmng3714ToolchainsCliOptionTest.java | 4 +- .../MavenITmng3716AggregatorForkingTest.java | 4 +- ...avenITmng3719PomExecutionOrderingTest.java | 4 +- ...venITmng3723ConcreteParentProjectTest.java | 4 +- ...avenITmng3724ExecutionProjectSyncTest.java | 4 +- ...avenITmng3729MultiForkAggregatorsTest.java | 4 +- .../it/MavenITmng3732ActiveProfilesTest.java | 4 +- ...740SelfReferentialReactorProjectsTest.java | 4 +- ...MavenITmng3746POMPropertyOverrideTest.java | 4 +- ...enITmng3747PrefixedPathExpressionTest.java | 4 +- .../it/MavenITmng3748BadSettingsXmlTest.java | 6 +- ...nITmng3766ToolchainsFromExtensionTest.java | 4 +- ...ng3769ExclusionRelocatedTransdepsTest.java | 4 +- ...775ConflictResolutionBacktrackingTest.java | 4 +- ...ITmng3796ClassImportInconsistencyTest.java | 4 +- ...mng3805ExtensionClassPathOrderingTest.java | 4 +- ...7PluginConfigExpressionEvaluationTest.java | 4 +- ...Tmng3808ReportInheritanceOrderingTest.java | 4 +- ...avenITmng3810BadProfileActivationTest.java | 4 +- ...ingPluginConfigurationInheritanceTest.java | 4 +- ...nITmng3813PluginClassPathOrderingTest.java | 4 +- .../MavenITmng3814BogusProjectCycleTest.java | 4 +- .../MavenITmng3821EqualPluginExecIdsTest.java | 4 +- ...ng3822BasedirAlignedInterpolationTest.java | 4 +- .../it/MavenITmng3827PluginConfigTest.java | 4 +- .../MavenITmng3831PomInterpolationTest.java | 4 +- ...3833PomInterpolationDataFlowChainTest.java | 4 +- ...nITmng3836PluginConfigInheritanceTest.java | 4 +- .../it/MavenITmng3838EqualPluginDepsTest.java | 4 +- ...enITmng3839PomParsingCoalesceTextTest.java | 4 +- .../it/MavenITmng3843PomInheritanceTest.java | 4 +- ...venITmng3845LimitedPomInheritanceTest.java | 4 +- ...ng3846PomInheritanceUrlAdjustmentTest.java | 4 +- ...PluginConfigWithHeterogeneousListTest.java | 4 +- ...ITmng3853ProfileInjectedDistReposTest.java | 4 +- .../MavenITmng3863AutoPluginGroupIdTest.java | 6 +- ...MavenITmng3864PerExecPluginConfigTest.java | 4 +- ...nITmng3866PluginConfigInheritanceTest.java | 4 +- ...72ProfileActivationInRelocatedPomTest.java | 4 +- ...enITmng3873MultipleExecutionGoalsTest.java | 4 +- ...MavenITmng3877BasedirAlignedModelTest.java | 4 +- ...MavenITmng3886ExecutionGoalsOrderTest.java | 4 +- ...avenITmng3887PluginExecutionOrderTest.java | 4 +- ...90TransitiveDependencyScopeUpdateTest.java | 4 +- .../MavenITmng3892ReleaseDeploymentTest.java | 4 +- ...avenITmng3899ExtensionInheritanceTest.java | 4 +- ...900ProfilePropertiesInterpolationTest.java | 4 +- ...ng3904NestedBuildDirInterpolationTest.java | 4 +- ...3906MergedPluginClassPathOrderingTest.java | 4 +- ...mng3916PluginExecutionInheritanceTest.java | 4 +- ...enITmng3924XmlMarkupInterpolationTest.java | 4 +- ...mng3925MergedPluginExecutionOrderTest.java | 4 +- ...g3927PluginDefaultExecutionConfigTest.java | 4 +- ...mng3937MergedPluginExecutionGoalsTest.java | 4 +- ...venITmng3938MergePluginExecutionsTest.java | 4 +- ...MavenITmng3940EnvVarInterpolationTest.java | 4 +- ...ionProjectRestrictedToForkingMojoTest.java | 4 +- ...mng3943PluginExecutionInheritanceTest.java | 4 +- ...avenITmng3944BasedirInterpolationTest.java | 4 +- ...g3947PluginDefaultExecutionConfigTest.java | 4 +- ...8ParentResolutionFromProfileReposTest.java | 4 +- .../it/MavenITmng3951AbsolutePathsTest.java | 4 +- ...nITmng3953AuthenticatedDeploymentTest.java | 4 +- .../MavenITmng3955EffectiveSettingsTest.java | 4 +- ...3970DepResolutionFromProfileReposTest.java | 4 +- .../it/MavenITmng3974MirrorOrderingTest.java | 4 +- .../it/MavenITmng3979ElementJoinTest.java | 4 +- ...3PluginResolutionFromProfileReposTest.java | 4 +- ...avenITmng3991ValidDependencyScopeTest.java | 4 +- ...venITmng3998PluginExecutionConfigTest.java | 4 +- ...venITmng4000MultiPluginExecutionsTest.java | 4 +- ...MavenITmng4005UniqueDependencyKeyTest.java | 6 +- ...venITmng4007PlatformFileSeparatorTest.java | 4 +- .../MavenITmng4008MergedFilterOrderTest.java | 4 +- ...venITmng4009InheritProfileEffectsTest.java | 4 +- ...4016PrefixedPropertyInterpolationTest.java | 4 +- ...4022IdempotentPluginConfigMergingTest.java | 4 +- ...4023ParentProfileOneTimeInjectionTest.java | 4 +- ...ITmng4026ReactorDependenciesOrderTest.java | 4 +- ...ITmng4034ManagedProfileDependencyTest.java | 4 +- ...6ParentResolutionFromSettingsRepoTest.java | 4 +- ...enITmng4040ProfileInjectedModulesTest.java | 4 +- ...4048VersionRangeReactorResolutionTest.java | 4 +- ...nITmng4052ReactorAwareImportScopeTest.java | 4 +- ...enITmng4053PluginConfigAttributesTest.java | 4 +- ...fierBasedDepResolutionFromReactorTest.java | 4 +- ...MavenITmng4068AuthenticatedMirrorTest.java | 4 +- .../MavenITmng4070WhitespaceTrimmingTest.java | 4 +- ...avenITmng4072InactiveProfileReposTest.java | 4 +- ...venITmng4087PercentEncodedFileUrlTest.java | 4 +- ...MavenITmng4091BadPluginDescriptorTest.java | 6 +- ...102InheritedPropertyInterpolationTest.java | 4 +- ...6InterpolationUsesDominantProfileTest.java | 4 +- ...polationUsesDominantProfileSourceTest.java | 4 +- ...avenITmng4112MavenVersionPropertyTest.java | 4 +- .../it/MavenITmng4116UndecodedUrlsTest.java | 4 +- ...mng4129PluginExecutionInheritanceTest.java | 4 +- .../it/MavenITmng4150VersionRangeTest.java | 4 +- .../MavenITmng4162ReportingMigrationTest.java | 4 +- .../MavenITmng4166HideCoreCommonsCliTest.java | 4 +- .../MavenITmng4172EmptyDependencySetTest.java | 4 +- ...nITmng4180PerDependencyExclusionsTest.java | 4 +- ...venITmng4189UniqueVersionSnapshotTest.java | 4 +- .../MavenITmng4190MirrorRepoMergingTest.java | 4 +- .../it/MavenITmng4193UniqueRepoIdTest.java | 6 +- ...avenITmng4196ExclusionOnPluginDepTest.java | 4 +- ...ITmng4199CompileMeetsRuntimeScopeTest.java | 4 +- ...4203TransitiveDependencyExclusionTest.java | 4 +- .../it/MavenITmng4207PluginWithLog4JTest.java | 4 +- ...olationPrefersCliOverProjectPropsTest.java | 4 +- ...Tmng4214MirroredParentSearchReposTest.java | 4 +- ...avenITmng4231SnapshotUpdatePolicyTest.java | 4 +- ...olutionForManuallyCreatedArtifactTest.java | 4 +- ...ng4235HttpAuthDeploymentChecksumsTest.java | 4 +- ...4238ArtifactHandlerExtensionUsageTest.java | 6 +- ...g4262MakeLikeReactorDottedPath370Test.java | 4 +- ...Tmng4262MakeLikeReactorDottedPathTest.java | 4 +- ...269BadReactorResolutionFromOutDirTest.java | 4 +- ...270ArtifactHandlersFromPluginDepsTest.java | 6 +- ...estrictedCoreRealmAccessForPluginTest.java | 4 +- ...avenITmng4274PluginRealmArtifactsTest.java | 4 +- .../MavenITmng4275RelocationWarningTest.java | 4 +- ...mng4276WrongTransitivePlexusUtilsTest.java | 4 +- ...MavenITmng4281PreferLocalSnapshotTest.java | 4 +- .../MavenITmng4283ParentPomPackagingTest.java | 6 +- ...enITmng4291MojoRequiresOnlineModeTest.java | 6 +- ...enITmng4292EnumTypeMojoParametersTest.java | 4 +- ...93RequiresCompilePlusRuntimeScopeTest.java | 4 +- ...mng4304ProjectDependencyArtifactsTest.java | 4 +- .../MavenITmng4305LocalRepoBasedirTest.java | 4 +- ...rictChecksumValidationForMetadataTest.java | 6 +- ...luginParameterExpressionInjectionTest.java | 4 +- ...g4314DirectInvocationOfAggregatorTest.java | 4 +- ...inVersionResolutionFromMultiReposTest.java | 4 +- ...avenITmng4318ProjectExecutionRootTest.java | 4 +- ...9PluginExecutionGoalInterpolationTest.java | 4 +- ...Tmng4320AggregatorAndDependenciesTest.java | 4 +- ...nITmng4321CliUsesPluginMgmtConfigTest.java | 4 +- ...ocalSnapshotSuppressesRemoteCheckTest.java | 4 +- ...udeForkingMojoFromForkedLifecycleTest.java | 4 +- ...imitiveMojoParameterConfigurationTest.java | 4 +- ...avenITmng4331DependencyCollectionTest.java | 4 +- ...ng4332DefaultPluginExecutionOrderTest.java | 4 +- ...MavenITmng4335SettingsOfflineModeTest.java | 6 +- .../it/MavenITmng4338OptionalMojosTest.java | 4 +- ...avenITmng4341PluginExecutionOrderTest.java | 4 +- ...pendentMojoParameterDefaultValuesTest.java | 4 +- ...mng4343MissingReleaseUpdatePolicyTest.java | 6 +- ...ng4344ManagedPluginExecutionOrderTest.java | 4 +- ...ng4345DefaultPluginExecutionOrderTest.java | 4 +- ...47ImportScopeWithSettingsProfilesTest.java | 4 +- ...4348NoUnnecessaryRepositoryAccessTest.java | 4 +- ...49RelocatedArtifactWithInvalidPomTest.java | 4 +- ...350LifecycleMappingExecutionOrderTest.java | 4 +- ...inDependencyResolutionFromPomRepoTest.java | 4 +- ...tensionAutomaticVersionResolutionTest.java | 4 +- ...dlessRelookupFromActiveCollectionTest.java | 4 +- ...ifecycleMappingDiscoveryInReactorTest.java | 4 +- ...lyReachableParentOutsideOfReactorTest.java | 4 +- .../it/MavenITmng4360WebDavSupportTest.java | 4 +- ...4361ForceDependencySnapshotUpdateTest.java | 4 +- ...namicAdditionOfDependencyArtifactTest.java | 4 +- ...Tmng4365XmlMarkupInAttributeValueTest.java | 4 +- ...mng4367LayoutAwareMirrorSelectionTest.java | 4 +- ...68TimestampAwareArtifactInstallerTest.java | 4 +- ...eSystemPathInterpolatedWithEnvVarTest.java | 6 +- ...ng4381ExtensionSingletonComponentTest.java | 4 +- ...enITmng4383ValidDependencyVersionTest.java | 6 +- ...ycleMappingFromExtensionInReactorTest.java | 6 +- .../it/MavenITmng4386DebugLoggingTest.java | 4 +- .../it/MavenITmng4387QuietLoggingTest.java | 4 +- ...g4393ParseExternalParenPomLenientTest.java | 4 +- ...enITmng4396AntBased20xMojoSupportTest.java | 4 +- .../it/MavenITmng4400RepositoryOrderTest.java | 4 +- ...ng4401RepositoryOrderForParentPomTest.java | 4 +- ...avenITmng4402DuplicateChildModuleTest.java | 6 +- ...ng4403LenientDependencyPomParsingTest.java | 4 +- .../it/MavenITmng4404UniqueProfileIdTest.java | 6 +- .../MavenITmng4405ValidPluginVersionTest.java | 6 +- ...nITmng4408NonExistentSettingsFileTest.java | 6 +- .../maven/it/MavenITmng4410UsageHelpTest.java | 4 +- .../it/MavenITmng4411VersionInfoTest.java | 4 +- ...MavenITmng4412OfflineModeInPluginTest.java | 6 +- ...Tmng4413MirroringOfDependencyRepoTest.java | 4 +- ...avenITmng4415InheritedPluginOrderTest.java | 4 +- ...6PluginOrderAfterProfileInjectionTest.java | 4 +- ...ecatedPomInterpolationExpressionsTest.java | 4 +- ...PluginExecutionPhaseInterpolationTest.java | 4 +- ...DataFromPluginParameterExpressionTest.java | 4 +- .../MavenITmng4428FollowHttpRedirectTest.java | 4 +- ...29CompRequirementOnNonDefaultImplTest.java | 4 +- ...g4430DistributionManagementStatusTest.java | 6 +- ...Tmng4433ForceParentSnapshotUpdateTest.java | 4 +- ...ITmng4436SingletonComponentLookupTest.java | 4 +- ...0StubModelForMissingDependencyPomTest.java | 4 +- ...esolutionOfSnapshotWithClassifierTest.java | 4 +- ...PluginVersionFromLifecycleMappingTest.java | 4 +- ...4459InMemorySettingsKeptEncryptedTest.java | 4 +- ...venITmng4461ArtifactUploadMonitorTest.java | 4 +- ...pendencyManagementImportVersionRanges.java | 6 +- ...4PlatformIndependentFileSeparatorTest.java | 4 +- ...ginPrefixFromLocalCacheOfDownRepoTest.java | 4 +- ...thenticatedDeploymentToCustomRepoTest.java | 4 +- ...470AuthenticatedDeploymentToProxyTest.java | 4 +- ...ng4474PerLookupWagonInstantiationTest.java | 4 +- ...Tmng4482ForcePluginSnapshotUpdateTest.java | 4 +- ...88ValidateExternalParenPomLenientTest.java | 4 +- ...ITmng4489MirroringOfExtensionRepoTest.java | 4 +- ...avenITmng4498IgnoreBrokenMetadataTest.java | 4 +- ...500NoUpdateOfTimestampedSnapshotsTest.java | 4 +- ...ailUponMissingDependencyParentPomTest.java | 6 +- ...mng4526MavenProjectArtifactsScopeTest.java | 4 +- ...cludeWagonsFromMavenCoreArtifactsTest.java | 4 +- ...g4536RequiresNoProjectForkingMojoTest.java | 4 +- ...tiveComponentCollectionThreadSafeTest.java | 4 +- ...oreArtifactFilterConsidersGroupIdTest.java | 4 +- ...Tmng4554PluginPrefixMappingUpdateTest.java | 4 +- ...g4555MetaversionResolutionOfflineTest.java | 6 +- ...venITmng4561MirroringOfPluginRepoTest.java | 4 +- ...65MultiConditionProfileActivationTest.java | 4 +- ...odelVersionSurroundedByWhitespaceTest.java | 4 +- ...PluginDepUsedForCliInvocInReactorTest.java | 4 +- ...solutionFromVersionlessPluginMgmtTest.java | 4 +- ...tedPomUsesSystemAndUserPropertiesTest.java | 6 +- ...0DependencyOptionalFlagManagementTest.java | 4 +- ...15ValidateRequiredPluginParameterTest.java | 6 +- ...ng4618AggregatorBuiltAfterModulesTest.java | 4 +- ...ingsXmlInterpolationWithXmlMarkupTest.java | 4 +- ...lidationErrorUponMissingSystemDepTest.java | 4 +- ...33DualCompilerExecutionsWeaveModeTest.java | 4 +- ...ictPomParsingRejectsMisplacedTextTest.java | 6 +- ...654ArtifactHandlerForMainArtifactTest.java | 4 +- .../it/MavenITmng4666CoreRealmImportTest.java | 4 +- ...77DisabledPluginConfigInheritanceTest.java | 4 +- ...enITmng4679SnapshotUpdateInPluginTest.java | 4 +- ...ng4684DistMgmtOverriddenByProfileTest.java | 4 +- ...0InterdependentConflictResolutionTest.java | 4 +- ...96MavenProjectDependencyArtifactsTest.java | 4 +- ...ependencyManagementExclusionMergeTest.java | 4 +- ...ITmng4721OptionalPluginDependencyTest.java | 4 +- ...rrorProxyAuthUsedByProjectBuilderTest.java | 4 +- ...MavenITmng4745PluginVersionUpdateTest.java | 4 +- ...venITmng4747JavaAgentUsedByPluginTest.java | 4 +- ...edMavenProjectDependencyArtifactsTest.java | 4 +- ...etchRemoteMetadataForVersionRangeTest.java | 4 +- ...ng4761PluginLevelDependencyScopesTest.java | 4 +- ...enITmng4765LocalPomProjectBuilderTest.java | 4 +- ...768NearestMatchConflictResolutionTest.java | 4 +- ...ResolutionDoesntTouchDisabledRepoTest.java | 6 +- ...ResolutionDoesntTouchDisabledRepoTest.java | 6 +- ...kedReactorPluginVersionResolutionTest.java | 4 +- ...DepsWithVersionRangeFromLocalRepoTest.java | 4 +- ...g4781DeploymentToNexusStagingRepoTest.java | 4 +- ...ransitiveResolutionInForkedThreadTest.java | 4 +- ...enITmng4786AntBased21xMojoSupportTest.java | 4 +- ...4788InstallationToCustomLocalRepoTest.java | 4 +- ...4789ScopeInheritanceMeetsConflictTest.java | 4 +- ...tBuilderResolvesRemotePomArtifactTest.java | 4 +- ...InReactorProjectForkedByLifecycleTest.java | 4 +- ...mng4800NearestWinsVsScopeWideningTest.java | 4 +- ...ng4811CustomComponentConfiguratorTest.java | 4 +- ...lutionOfDependenciesDuringReactorTest.java | 4 +- ...enITmng4829ChecksumFailureWarningTest.java | 4 +- ...entProjectResolvedFromRemoteReposTest.java | 4 +- .../MavenITmng4840MavenPrerequisiteTest.java | 4 +- ...42ParentResolutionOfDependencyPomTest.java | 4 +- ...rResolutionAttachedWithExclusionsTest.java | 4 +- ...Tmng4874UpdateLatestPluginVersionTest.java | 4 +- ...venITmng4877DeployUsingPrivateKeyTest.java | 4 +- ...lUponOverconstrainedVersionRangesTest.java | 4 +- ...0MakeLikeReactorConsidersVersionsTest.java | 4 +- ...ITmng4891RobustSnapshotResolutionTest.java | 4 +- ...PluginDepWithNonRelocatedMavenApiTest.java | 4 +- ...erPropertyVsDependencyPomPropertyTest.java | 4 +- ...LifecycleMappingWithSameGoalTwiceTest.java | 4 +- ...ontainerLookupRealmDuringMojoExecTest.java | 4 +- .../maven/it/MavenITmng4936EventSpyTest.java | 4 +- ...Tmng4952MetadataReleaseInfoUpdateTest.java | 4 +- ...55LocalVsRemoteSnapshotResolutionTest.java | 4 +- ...venITmng4960MakeLikeReactorResumeTest.java | 4 +- ...mng4963ParentResolutionFromMirrorTest.java | 4 +- ...nITmng4966AbnormalUrlPreservationTest.java | 4 +- ...ExtensionVisibleToPluginInReactorTest.java | 4 +- ...ofileInjectedPluginExecutionOrderTest.java | 4 +- ...87TimestampBasedSnapshotSelectionTest.java | 4 +- .../it/MavenITmng4991NonProxyHostsTest.java | 4 +- ...4992MapStylePropertiesParamConfigTest.java | 4 +- ...g5000ChildPathAwareUrlInheritanceTest.java | 4 +- ...onRangeDependencyParentResolutionTest.java | 4 +- .../MavenITmng5009AggregationCycleTest.java | 4 +- ...CollectionArrayFromUserPropertiesTest.java | 4 +- ...012CollectionVsArrayParamCoercionTest.java | 4 +- ...ConfigureParamBeanFromScalarValueTest.java | 4 +- ...sedCompLookupFromChildPluginRealmTest.java | 4 +- ...nITmng5064SuppressSnapshotUpdatesTest.java | 4 +- ...AtDependencyWithImpliedClassifierTest.java | 4 +- ...gatorDepResolutionModuleExtensionTest.java | 4 +- ...137ReactorResolutionInForkedBuildTest.java | 4 +- .../maven/it/MavenITmng5175WagonHttpTest.java | 4 +- ...MavenITmng5206PlexusLifecycleHonoured.java | 4 +- .../MavenITmng5208EventSpyParallelTest.java | 4 +- .../it/MavenITmng5214DontMapWsdlToJar.java | 4 +- .../it/MavenITmng5222MojoDeprecatedTest.java | 4 +- .../it/MavenITmng5224InjectedSettings.java | 4 +- ...nITmng5230MakeReactorWithExcludesTest.java | 4 +- ...SettingsProfilesRepositoriesOrderTest.java | 4 +- .../MavenITmng5338FileOptionToDirectory.java | 4 +- .../maven/it/MavenITmng5382Jsr330Plugin.java | 4 +- ...venITmng5387ArtifactReplacementPlugin.java | 4 +- ...89LifecycleParticipantAfterSessionEnd.java | 4 +- ...418FileProjectPropertiesActivatorTest.java | 4 +- ...gacyStringSearchModelInterpolatorTest.java | 4 +- ...enITmng5452MavenBuildTimestampUTCTest.java | 4 +- .../it/MavenITmng5482AetherNotFoundTest.java | 6 +- .../it/MavenITmng5503ZipInReactorTest.java | 4 +- .../MavenITmng5530MojoExecutionScopeTest.java | 4 +- ...venITmng5557ProperlyRestrictedReactor.java | 6 +- ...luginRelocationLosesConfigurationTest.java | 4 +- ...nITmng5572ReactorPluginExtensionsTest.java | 4 +- .../it/MavenITmng5576CdFriendlyVersions.java | 4 +- .../it/MavenITmng5578SessionScopeTest.java | 4 +- ...avenITmng5581LifecycleMappingDelegate.java | 6 +- .../it/MavenITmng5591WorkspaceReader.java | 4 +- ...ITmng5608ProfileActivationWarningTest.java | 4 +- ...ITmng5639ImportScopePomResolutionTest.java | 4 +- ...40LifecycleParticipantAfterSessionEnd.java | 6 +- ...663NestedImportScopePomResolutionTest.java | 4 +- .../maven/it/MavenITmng5669ReadPomsOnce.java | 4 +- .../it/MavenITmng5716ToolchainsTypeTest.java | 4 +- ...Tmng5742BuildExtensionClassloaderTest.java | 4 +- ...53CustomMojoExecutionConfiguratorTest.java | 4 +- .../it/MavenITmng5768CliExecutionIdTest.java | 4 +- .../it/MavenITmng5771CoreExtensionsTest.java | 4 +- ...nITmng5774ConfigurationProcessorsTest.java | 6 +- ...venITmng5783PluginDependencyFiltering.java | 4 +- ...venITmng5805PkgTypeMojoConfiguration2.java | 4 +- .../it/MavenITmng5840ParentVersionRanges.java | 4 +- ...nITmng5840RelativePathReactorMatching.java | 4 +- ...ITmng5868NoDuplicateAttachedArtifacts.java | 4 +- .../maven/it/MavenITmng5889FindBasedir.java | 4 +- ...ng5895CIFriendlyUsageWithPropertyTest.java | 4 +- ...ltimoduleWithEARFailsToResolveWARTest.java | 4 +- ...ostInTranstiveManagedDependenciesTest.java | 4 +- ...enITmng5958LifecyclePhaseBinaryCompat.java | 6 +- ...ng5965ParallelBuildMultipliesWorkTest.java | 6 +- .../MavenITmng6057CheckReactorOrderTest.java | 4 +- ...avenITmng6071GetResourceWithCustomPom.java | 4 +- .../it/MavenITmng6084Jsr250PluginTest.java | 4 +- .../it/MavenITmng6090CIFriendlyTest.java | 4 +- .../it/MavenITmng6118SubmoduleInvocation.java | 4 +- ...xecutionConfigurationInterferenceTest.java | 4 +- ...nITmng6173GetAllProjectsInReactorTest.java | 4 +- ...6173GetProjectsAndDependencyGraphTest.java | 4 +- ...ITmng6189SiteReportPluginsWarningTest.java | 4 +- ...mng6210CoreExtensionsCustomScopesTest.java | 4 +- .../maven/it/MavenITmng6223FindBasedir.java | 4 +- ...Tmng6240PluginExtensionAetherProvider.java | 4 +- .../it/MavenITmng6255FixConcatLines.java | 4 +- ...g6256SpecialCharsAlternatePOMLocation.java | 4 +- ...enITmng6326CoreExtensionsNotFoundTest.java | 6 +- .../maven/it/MavenITmng6330RelativePath.java | 6 +- .../it/MavenITmng6386BaseUriPropertyTest.java | 4 +- .../it/MavenITmng6391PrintVersionTest.java | 4 +- .../MavenITmng6506PackageAnnotationTest.java | 4 +- ...ITmng6511OptionalProjectSelectionTest.java | 6 +- ...nITmng6558ToolchainsBuildingEventTest.java | 4 +- ...AnnotationShouldNotReExecuteGoalsTest.java | 6 +- ...6609ProfileActivationForPackagingTest.java | 4 +- .../maven/it/MavenITmng6720FailFastTest.java | 6 +- ...Tmng6754TimestampInMultimoduleProject.java | 4 +- ...9TransitiveDependencyRepositoriesTest.java | 4 +- ...Tmng6972AllowAccessToGraphPackageTest.java | 4 +- ...1ProjectListShouldIncludeChildrenTest.java | 6 +- .../maven/it/MavenITmng7038RootdirTest.java | 6 +- ...g7045DropUselessAndOutdatedCdiApiTest.java | 6 +- .../MavenITmng7110ExtensionClassloader.java | 6 +- ...ITmng7112ProjectsWithNonRecursiveTest.java | 6 +- ...ITmng7128BlockExternalHttpReactorTest.java | 6 +- .../MavenITmng7160ExtensionClassloader.java | 6 +- .../it/MavenITmng7228LeakyModelTest.java | 4 +- ...ITmng7244IgnorePomPrefixInExpressions.java | 6 +- ...fecycleActivatedInSpecifiedModuleTest.java | 4 +- ...venITmng7335MissingJarInParallelBuild.java | 6 +- .../MavenITmng7349RelocationWarningTest.java | 4 +- .../MavenITmng7353CliGoalInvocationTest.java | 4 +- ...ng7404IgnorePrefixlessExpressionsTest.java | 6 +- ...7464ReadOnlyMojoParametersWarningTest.java | 4 +- ...g7468UnsupportedPluginsParametersTest.java | 4 +- .../MavenITmng7470ResolverTransportTest.java | 4 +- .../it/MavenITmng7474SessionScopeTest.java | 4 +- .../maven/it/MavenITmng7487DeadlockTest.java | 6 +- ...04NotWarnUnsupportedReportPluginsTest.java | 6 +- ...ng7529VersionRangeRepositorySelection.java | 4 +- .../MavenITmng7566JavaPrerequisiteTest.java | 4 +- .../apache/maven/it/MavenITmng7587Jsr330.java | 4 +- ...venITmng7606DependencyImportScopeTest.java | 4 +- .../it/MavenITmng7679SingleMojoNoPomTest.java | 4 +- .../it/MavenITmng7697PomWithEmojiTest.java | 4 +- .../maven/it/MavenITmng7716BuildDeadlock.java | 4 +- .../MavenITmng7737ProfileActivationTest.java | 4 +- ...ITmng7819FileLockingWithSnapshotsTest.java | 4 +- ...Tmng7939PluginsValidationExcludesTest.java | 4 +- ...Tmng8106OverlappingDirectoryRolesTest.java | 4 +- .../apache/maven/it/TestSuiteOrdering.java | 2 +- .../pom.xml | 4 +- core-it-support/maven-it-helper/pom.xml | 19 +- .../it/AbstractMavenIntegrationTestCase.java | 2 - .../apache/maven/it/ResourceExtractor.java | 145 +++ .../maven/it/VerificationException.java | 42 + .../java/org/apache/maven/it/Verifier.java | 1006 +++++++++++++++++ pom.xml | 6 +- 647 files changed, 2570 insertions(+), 1364 deletions(-) create mode 100644 core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/ResourceExtractor.java create mode 100644 core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/VerificationException.java create mode 100644 core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java diff --git a/core-it-suite/pom.xml b/core-it-suite/pom.xml index e6e37a9ef..78827275a 100644 --- a/core-it-suite/pom.xml +++ b/core-it-suite/pom.xml @@ -104,8 +104,8 @@ under the License. - org.apache.maven.shared - maven-verifier + org.apache.maven.executor + maven-executor diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java index 740339a53..149180bf1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0008SimplePluginTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java index 805f1256f..d5a37c84a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIf; import org.junit.jupiter.api.condition.JRE; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java index a59b04316..9830de61a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0010DependencyClosureResolutionTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java index e3338a5b4..b2c58b9c5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0011DefaultVersionByDependencyManagementTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java index 5d8766650..10b25c8b4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0012PomInterpolationTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java index e34002d68..7feecbafd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0018DependencyManagementTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java index 4367cdad6..a545f3c90 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0019PluginVersionMgmtBySuperPomTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java index 74e63084f..fc29ae5ac 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0021PomProfileTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java index 72e59e2b8..4c6651537 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0023SettingsProfileTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java index 76f68d175..bb887a740 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java index 61dd1145a..6ba8ce8c3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java index aa7b04ebf..3db453dbb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0030DepPomDepMgmtInheritanceTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java index 928193b33..161fcb555 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0032MavenPrerequisiteTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java index 59b512e21..1285d00de 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java index cddb8c3a4..131d26921 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java index 3a5588320..0c0496547 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java index 0943b03bf..a9ef5fb5b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java index 1911a5d88..8841c11a2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0056MultipleGoalExecutionsTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java index 1f60680f3..670b870f8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0063SystemScopeDependencyTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java index 500313c42..7a331a738 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0064MojoConfigViaSettersTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java index 68d1e9744..e3c7d9fb1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java index fb47fcaef..f33738ac3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java index 33da96873..881dc45ef 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.Collection; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0085TransitiveSystemScopeTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java index a09d92556..785d0e389 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java index f0fb91129..f98bc2b74 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java index 78d661059..46ac82e23 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0090EnvVarInterpolationTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java index aaacc4763..4b5cba698 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java @@ -26,9 +26,9 @@ import java.util.Locale; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java index 63d8218b7..fd4cf1850 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java index 8f49ff0d0..e5808f058 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java index b9a5ebc22..1816ed066 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java index 6ad27808a..4a62b394f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java index c2156f118..6768acb20 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java index f2b877a72..fee7c8ad4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java index 2ee41efee..51fa4d002 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java index 95ecf5b6e..6633fe946 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java index 422466f7e..cf42ad2dd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java index ebe274f5b..622ea2c53 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java index 5c82e4391..2f0da7d27 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java index a8d50e14b..dda9c6ed0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java index fc2d56fdd..8cb7f8f2d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java index 7b1aebc2c..f6a5d35d2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java index 340f45ae6..a29d3830c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java index 26b97beb0..290b0b827 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java @@ -23,8 +23,8 @@ import java.net.InetAddress; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java index 6021b676f..21d60af04 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0199CyclicImportScopeTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java index 2e30525b6..8fff54b3e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java index ab75fc7e1..80aff08a6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java index 00a2bb2db..bac9416c5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java @@ -22,8 +22,8 @@ import java.util.Properties; import org.apache.maven.shared.utils.StringUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java index 716513642..035749e96 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java index b579e9294..132423d73 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java index edbc5b841..8808e1a73 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java index 9f02ad1c6..ee0a24fd1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java index 3ec17fbd9..fb43a0a51 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java index 49538bf47..13d9829b1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java index 797fbbb8a..a25e9467e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java index f8dbeb33c..22473a38f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java index 023083e31..44e2d5d2e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java index 5deef8815..c79a5e4b1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java index 256c9c4ad..01714b7f5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java index 9b156f3e0..79d709ae1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java index 676633f5f..0c2012a95 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Collection; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java index f5d626548..a6ee23a1e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java index 096c46291..e69d9641e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java index 9508923a8..ee6f95747 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java index 6f8047405..8f0559a8d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java index d0d0a6947..970fe44b9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java index dfc9b2c90..57126c5af 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java index 68c478045..51fa11f41 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java index 15373739b..76681a677 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java index 78cbe1bcc..aec828368 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java index 4b6689b3b..6fc89fb13 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java @@ -29,9 +29,9 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java index 70380b77f..8640cc8d3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java index 5f710a1f5..061ea8ec2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java index 42bbf9525..e764ed731 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java index 77d54f0cd..4c302c448 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java index 95faf9af0..2421da1eb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java @@ -22,8 +22,8 @@ import java.util.Collection; import java.util.Collections; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java index 42f798a83..cb342fd31 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Collection; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java index be446da28..a10726604 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java index f5b043868..e58135478 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java @@ -24,8 +24,8 @@ import java.util.Locale; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java index fc9e9f2f8..f4dc4c95a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java index 8cb8f4912..1a5f1f73d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java index 562c6412b..2ad1f7146 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java index 522d9a015..a0bef3c45 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java index 786fe5e8c..18ad20092 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java index fcbe0fc87..423272c8d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java index a1fbd26a1..e63b03943 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java index b282b97e3..1d719dde9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java index 0582fce93..e99e7c556 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java index abbde7041..b75a45c5e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java index e457de456..b7473529c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java index 91e8fad21..c8b82bfc4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java index 2b51a3e49..926c754ee 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java index 2163ebb99..fa7d3d381 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Collection; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java index 888a8d92d..ada3ce6a4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java index 65c670e74..3807b8eeb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java index 709b33366..0a00df13a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java index e6a8a1a24..2c8bf589a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java index 92b98de95..3a8b92b79 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java index e35dd4713..3f61e8c70 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java index f5431e275..c8a61b2ca 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java index d8e31365d..e8a4bc251 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java index 41addbd18..dc1842ec1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java @@ -22,8 +22,8 @@ import java.util.Properties; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java index 7f1660317..ecb3028b0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java @@ -22,8 +22,8 @@ import java.util.List; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java index d0dd94d5b..6d5f8b334 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java index 29c6cedd4..a6c96a498 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java index c06fbb756..7f3c8d891 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java index acc095d98..233025208 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java index d0760828e..61f1af87f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java index beb0b29cd..e249ee294 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java index 0da02efda..3ab31ae3e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java index 6f9f3c0fd..7d98978e0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java index 840baf251..c79514fcc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java index c56a882d2..7d2c694bc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java index 9332e2718..a6b9c899a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java index 2f120fe5b..85683fedc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java index 176d8b172..3b4481173 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java index 7c170e0a2..0f7d89074 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java index be3fff25b..8e3dfa7ad 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java index 09f8e1e46..b770fc50d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java index 7a9c65637..7bd25be9e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java index f88b05823..62062c880 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java index d82c34af1..61fa85807 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index ef5029669..974993b94 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java index a7431714e..b9e2680c5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java index 2a97e34fe..fddb44e63 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java index 4e6c91f22..004fad5e7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java index 9dde813e6..01ce64b8f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java index db82bec8b..3861b9dd6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java index e5a5b522c..8e9bcabe7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java index cc077be04..797d14808 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java index 3ade494f2..e16f9bd76 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.NetworkConnector; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java index ae5c30b3e..45421a6a7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java index 62bbe96a5..198e31eb1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java index fd95d1748..7c42d1c63 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java index cfa240138..0d1b4a1ac 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java @@ -21,8 +21,8 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java index 5667b2b93..5e9baa09c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java index fb7bc464b..12f5cdeb2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java @@ -22,8 +22,8 @@ import java.net.InetAddress; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java index 78594937e..590629fcf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java index 6fba8a255..fd182cab7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java index 9775616b5..bbc648ab4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java @@ -23,8 +23,8 @@ import java.util.Date; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java index 4b0426996..9a0dcf862 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java index 1fddb9fb7..7bfa21441 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java index 1e6966f7a..26c0fe9bb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java index c9a410451..93dc1b6a9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java index 55ecd507a..fe1d650a2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java index 25c3cddd1..64f833139 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java @@ -23,9 +23,9 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java index 4835a865c..ff677eb3c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java index cf863cf73..1aea8f456 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java index 8d85adfec..cf1f74eea 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java index 9eb1af17e..578596773 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java index efc037949..13c691f7f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java index a82bbe031..8d052d4b6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java index c5b752f70..664a95e41 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java index 6daf9fa87..f61f3a4cb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java index e55cec9e3..4406da886 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java index 48b389518..2cc1fa24b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java @@ -24,8 +24,8 @@ import java.util.TimeZone; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java index 6475affe9..f57996c8b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java @@ -21,8 +21,8 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java index 241dada72..f7261d683 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java index b2b00a439..d4f85f824 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java index 55d71e680..4df3f8269 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java index 11c0a1abb..7f435da55 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java index 32fe41788..087ccc670 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java index 23104d49c..d2b243944 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java index fcfae013e..32cffc480 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java index 5b84e4699..60c85b40e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Collection; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java index 95f7f8f7f..6c3867fcf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java index 48eacb0f1..3720c2166 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java index 9ee5c8f3f..0027e9ced 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java index f5822f579..9d3aa0dea 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java index 2f806e048..84994834d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java index 7f3cc4488..684211544 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java index ea2cf9fc2..9fb1cf616 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java index d3a098798..c7127120f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java index 629056848..d2fadfe47 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java index ebbf0d5c4..4f0243045 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java index 2bc267646..d0e131073 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java index af2bce344..1dae63182 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java index 095c4e736..2393b856b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java index 6db357035..339f6e6a5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java index 79230298b..d7a00f28e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Collections; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java index f90ba8ebb..81b8150a2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java @@ -23,8 +23,8 @@ import java.util.Iterator; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java index 0d72c6906..e7d5e51fb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java index 82854602e..78ea088ef 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java index ea7876650..b2e33ae72 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java index b465e406d..dd9bb5de6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java index 0367992fd..47f78e681 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java index d3c9d6be8..e9fb66541 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java index 8c3baa1bd..97703639b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java index d44c979d7..bb1ff797f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java index e56473463..f89342192 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java index 753b736a3..818989a61 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java index 2c56bad48..1f796c1ce 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java index 8e02604d5..b88f2faff 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java index c62c8f300..af4df7eba 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java index 88ca44089..ce3a91f6b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java index f9d461dd1..c1e91740d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java index 6f7795915..742738421 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java index 9e34f8d59..9d3e424c7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java index 225c2d9ea..e080224b1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java index 432c1e2c2..9c889bb98 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java @@ -28,8 +28,8 @@ import java.util.concurrent.ConcurrentLinkedDeque; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java index 062f13d0e..c511b62fb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java index 5a976b97d..c0c4d14b8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java @@ -23,8 +23,8 @@ import java.io.IOException; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java index 90b8ec6a3..6af1ffd1a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java @@ -25,8 +25,8 @@ import java.io.IOException; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java index 6d0c8e75d..0ba51b976 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java index d74e7c6ad..87e6e38f4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java index 746e3311e..4c3fa115a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java @@ -23,9 +23,9 @@ import java.util.List; import java.util.Map; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java index 1cd06f2a2..57aa16990 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java index ec9873a8e..8ce82b9c3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java index a2013af9d..a132ef5f1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java index 62f4ac0a9..af265f42e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java @@ -21,8 +21,8 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java index ada97222a..360761715 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java index 18be2b43c..bb2b66ba1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java index c9109879d..c45082aa9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java index ea2807b6c..ee8d3bd68 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java index bd5d7bfee..0f17ba919 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java index d385946bf..b68c3f82a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java index 7ff9047b3..2ccd3ea92 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java index 463f876f5..5e7b44ec6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java index 617ac2ba4..3146f8c7a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java @@ -26,8 +26,8 @@ import org.apache.maven.shared.utils.StringUtils; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java index 3203f3923..84d41cab5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java index f7dea97aa..b2b441d3e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java @@ -22,8 +22,8 @@ import java.net.URI; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java index f4b34dff7..ba1c0eaa3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java index b4fd7d787..bf73c2804 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java index 4ee7b841d..570cac62e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java index 24e7a44a2..46ee8bd98 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java index d25b6fc9a..ff2d543f7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java @@ -25,8 +25,8 @@ import java.io.IOException; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java index 485063b15..4c6e42d72 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java index 7df5e2d5c..9d382dfac 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java index bdeed493f..607a2fd36 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java index 1fe7007bc..e6ceb9218 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java index 6eac610d0..92b44383f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java index d65a6edd2..25af94b1c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java @@ -21,8 +21,8 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java index 92308df21..a0167795d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java index bfb5beb66..52f8d8569 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java index 67d4cd926..dd772f253 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java index 490bd9384..9a3d75ff5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java index 1b8299e5c..aac5c23a5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java index 25eeb4094..47bd0d4e5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java index 775bc360e..fc0e20fc3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java @@ -23,8 +23,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java index 0183c9f4c..8dd96f99f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java index a66eda022..4e9ac5eb1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java index 4f1ac7932..da084bcd5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java index 8a4e511a7..33b816ff2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java index 8e5410237..ac546778c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java index eae8ae400..ef268299d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java index 6d0445ceb..7b731ebbd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java index bf1ffec36..33ac8d11d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java index 0c3deae87..0815d3afd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java index 64c4d38ca..3814a1536 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java @@ -22,8 +22,8 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java index bfc174d34..b64fd20c6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java index eb9737899..dcbf26b88 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java index 4021fdba0..0a946326f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java index 082f54088..f7e59fed4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java index 255b4a5cb..e37b9409f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java index 9bc8dae31..7d0221d14 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java index 0b22d85a8..e92689e5d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java index 6a7b64f48..4b95d298e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java index d39cbe18c..97a764d2f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java index 668793703..41422c05d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java index d8e7ee3b1..7f31422e1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java index 7224b4316..2052d4082 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java index 5c03a62c9..97f937eee 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java index 1e88f4a0f..0cf4b6d79 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java index af8c9f4b9..754cc33e5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java index 4f5848727..70c86dfac 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java index d22db371d..ed7447ed3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java index cc581117b..3c0ae038c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java @@ -23,8 +23,8 @@ import java.util.Properties; import java.util.TreeSet; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java index eaf8cb962..c14754cb5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java index 835dce4d9..47b830a9b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java index ad9393d16..05b812adc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java index ce8e525ea..3557922e4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java index 39184a443..ebc9d4d0f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java index 527799407..91f5cc74a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java index ef8e2dbfb..176f2eb78 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java index fc054957e..e809b9382 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java index d3d6f6dbf..e4b6fe218 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java index a05603576..ef4c31973 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java index ec568d70a..cbdd11c56 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java index 5e4dca64c..1d3de2cf3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java index 9ad5bb332..0444409c8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java index f2bc3767b..6b9696e7a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java @@ -22,8 +22,8 @@ import java.util.Locale; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java index 23a421261..90a5db8f3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java index f7b06eead..8f8db3a6d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java index 135f1ed6d..537e00d32 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java index 5ce9b4438..fcb2c5fe0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java index 99f0d9013..67c3a7260 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java index d3194efde..c0084b8f8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java index 67321063f..d849da107 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java index 22c80a4ff..8ee166b2b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java index 80db3543b..6622ca3a1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java index b81b3e363..8ad5cfbad 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java index f96704f78..8086a4cc0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java @@ -22,8 +22,8 @@ import java.util.Properties; import org.apache.maven.shared.utils.Os; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java index 1930d8b6f..b4d775095 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java index 00a761d08..bcaa60073 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java index e8ce918c4..73ab10e9d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java index 4e2ba32fd..41d11ab28 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java index e8c6bec71..274201fc9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java index 058dd59c4..fb24d202f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java index bb53d856c..a7f78f915 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java @@ -23,8 +23,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java index 79b6f2a29..eb8425da3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java index 491fa5901..6076f9a72 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java index f2d0a23bc..bb8f71f38 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java index e95281139..a4017d9fc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java index 8410fcdcb..4c059e9cc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java index 87fcb3732..018db6960 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java index 7cec97435..856a24965 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java index 9c742df4b..908a349b8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java index ebff7e8f8..67f05a98e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java index b4347761d..bcbe60665 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java index 74d371bbc..6888d89dd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java index d2e48e4da..66eddb9bb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java index 108427c54..74a699736 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java index 6d80de8c6..1e9633c79 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java index 70bd23f82..3d22701aa 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java index 55c9edcef..5b12b00f6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java index e83adbc1a..c8cd02519 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java index 89071fbf3..371af8349 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java index 61452e89c..42dc2affc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java index ba4a0932a..043b1df1c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java index 69fa365d2..97f777b17 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java index 885c084d9..91b0ecc77 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java index 5ffa82b31..dfc40399e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java index 4811de54f..eb6a5b8d2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java @@ -22,8 +22,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java index fe495ea9c..2375ee91e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java @@ -22,8 +22,8 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java index d72e4746f..e3252e8f2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java index 429769629..a809ce6e5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java index 4a1c21bf9..ced057f09 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java index 0d0525ecc..c9a851515 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java index 61998ee37..1ea74b211 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java index 0faa06f34..312cf3bb1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java index 9c0aa1f62..8def9b272 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng4112MavenVersionPropertyTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java index 3ac362648..0c76eb81f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java index daaec472e..5f47aaaa6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java index 69e7f9221..f92e78dba 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Collection; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java index db55f250a..e25b448ed 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java index fd27b1c23..ca3bd112d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java index 98766b407..b83c01a06 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java index db708216d..02233ef5f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java index 3efa29ade..67a6c7803 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java index c20c4af71..be52b8549 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java index 1105a2767..7f98ed20b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java index 17f892761..cc3ea1e55 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java index 365f61a67..90f3a0d41 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java index 494e8f21b..99eff917d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java index 0ba2ee009..3b16cff26 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java index 0e01d707a..77f1087f3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java index 8816f951b..90063b6a5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java index b5323a2af..e0a1ba48d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java index cc7fddfa9..2e62961e9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java index 2cc2e4f31..5a533373b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java @@ -31,8 +31,8 @@ import java.util.concurrent.ConcurrentLinkedDeque; import org.apache.maven.it.utils.DeployedResource; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.StringUtils; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java index c91c43047..f7eba2fd7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java index a6550b2dd..f56d22ef4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java index e6448d949..f2fdca9c2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java index 6d884d64d..6bcd6f0c0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java index 7af19e1c5..5b6da73da 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java index f2632bab1..5fe0d155c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java index 24336f7c6..b83901831 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java index 185ca523d..54b426122 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java index 9f8abe45d..6aa472b43 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java index d9864f045..5c8351777 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java index d1a4a2b0c..72cdbc8fe 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java index 775105d2e..8f619233e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java index a4c8f56b4..540ee9dff 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java index 00b98b49f..016e0b325 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java index 120b775a6..c0423d4f5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java index 64e08c942..1be17ab98 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java index ef62c11d5..179f48fc0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java @@ -21,9 +21,9 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java index cdc0c7c41..eb8d56658 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java index 51d598912..a7e7771d7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java index 1cee67248..f30ad88bf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java index d74a86a30..2230fd950 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java index 18fd0ff10..ee0380848 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java index 31f53fad7..a07a3ee35 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java index 55093aa0b..e4971fb29 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java index cf69f32b0..056f1eaaa 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java @@ -30,8 +30,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java index 560f124f2..9a49316e2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java index 17b98af6d..abe5328d5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java index 1e43cf3ea..d709c6f04 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java index 54be0b604..f97377f44 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java index 7dae138fb..99c96f922 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java index 4696572f5..db343c738 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java index d943d4597..acb851655 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java index 7b6658ee3..cbb9e0c92 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java index b1cb5c3fb..b325aad0b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java @@ -28,9 +28,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java index aeefb9758..9c45fa1a2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java index c7ad9a183..b22f54509 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java index 849ed20e1..ef91182dc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java index e3e655a93..1cf65016c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java index d3ebea5c5..dd675463d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java index 5c59ed546..866693fe9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java index 2957da278..6eb02067d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java index 965ff38f8..d9aeeb180 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java index 8db8694de..384b33456 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java index 1375f4be6..06d39e48d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java index a7be6cc96..e019038df 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java index 4f2e43a00..38ae8e311 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java index 3915c26a4..7ca3becd8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java index 6243cf991..f8916067f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java index c142568c0..b326255ae 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java index eb15cc870..4e54a9340 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java index e622eef5c..9f27a3a96 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java @@ -21,8 +21,8 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java index 2fc3ccc92..a4b8e42cb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java index 31144f85d..30eecc260 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java index b697ad3fd..a100aa5bd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java index 1089773e5..7e952c246 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java index acdde6da2..3cf0f8b9a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java index dcedb6180..806b2b4ef 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java @@ -23,8 +23,8 @@ import java.util.Iterator; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java index d68acfef8..b7a7e1a8e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java index 4e8ee0661..c5d8f4032 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java index 4b7d26dd8..7351aa93d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java index 751fc3d8e..63aaeee43 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java index c24130de0..dfc459d86 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java index bafcb7440..2ea6faa38 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java @@ -23,8 +23,8 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java index 246e21744..3e6212934 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java index 7470977e7..d4a67a7ac 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java index 450ae9cde..19eb1f8b2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java index a583088f0..5105b72fd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java index 202605539..028930648 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java index ba09fe6eb..aca4745ff 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java index 00e36f68e..5fd02567f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java index 626c1f3cf..36412adca 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java index 32f1b0df7..6791bb7f5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java index 9248b3cb1..d90a17c6a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java index 805e6b6b7..effb8fc75 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java index c2f018fc7..fbbf350e0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java index a35703f24..439daf5e8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java index 09a94107c..2f31eeea0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java index 29efcd5df..9fe648f71 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java index 6d64a57e6..2b108e84d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java index c0fc80c97..29f8d5602 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java index 60aa1db9c..de8d1ae5c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java index f37242ff3..28edfa9b8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java index 1358df786..cdf24c9ad 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java index 20cbe8eec..73835fa20 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java index d44b9daba..ab93086ee 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java index 0cfc5a379..0f2a6e690 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java index e79cf46e0..9218d07c3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java index 7b50fadf8..943d35196 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Collections; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java index 183049df4..16f81c778 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java @@ -23,8 +23,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java index c56d06536..4f98c07a6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java @@ -29,8 +29,8 @@ import java.util.concurrent.ConcurrentLinkedDeque; import org.apache.maven.it.utils.DeployedResource; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.StringUtils; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java index a95451abd..030e8f5a2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java index a537750a0..f33aa2d84 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java index f69052fbb..29547da8d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java index 1931e45d2..aeb899a76 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java index 9289c3209..fe1b9edbe 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java index ab0ad0cc5..c2ce8aeca 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java index a46f800a3..820d32e7f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java index 8642583c9..4a580be3e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java index a68b9b86a..8b4e8ee01 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java index 321f45dd1..217247143 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java index 81fa5879f..dc0c03354 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java index bf7822730..c30c02b9d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java index fefed4676..84c803ebb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java @@ -29,8 +29,8 @@ import java.util.Map; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java index cf850acaf..2e0a7b932 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java @@ -26,9 +26,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java index d9e9dcc4a..74b15b834 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java index faaf8559e..acbd51134 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java index 4f80fb15f..070c13590 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java index 3321705c9..2f40e4c66 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java index 2d2ed4f2f..d9f952128 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java index 629b32843..4ecd986d0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java index d8da02c1d..ed8b864d1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java index 90b96cdef..d3333cfdf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java index a9b7ac999..6597d3f96 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java index 9c9422768..13cf094a1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.Os; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java index 501fb6b7c..d09733c1f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java index cf840937a..7704fd45c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java index 0e6f1b73c..0cdf52918 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java index 5d0c06a36..0d46c9544 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java index b7f592b1e..2dd3790d7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java index 3b5f237a7..883e0fc25 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java index 6ed35c03e..62c977d77 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java index e41e9b0dd..ed5d975a2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java index f4ca2e088..ac25c23e6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java index bf3b08d38..eeb0f54bd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java @@ -22,8 +22,8 @@ import java.util.HashSet; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java index 34810b4b3..9b6b2ff1d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java index eb2f2e984..24439ef81 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java index 370fde08e..2b99d9943 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java index 70ca53e14..5dc02c084 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java @@ -23,8 +23,8 @@ import java.util.Properties; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java index b5eb4cd93..4c3a4b897 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java index 105437f1a..be52d0554 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java index 513b016a9..140c931f4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java index 9b282653f..1dea625bd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java index 9295741a2..7b21459cb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java index 07a17c46d..4977874bb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java index 1de286411..48cc3aa7a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java @@ -26,9 +26,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java index aea30bd82..8c8069cb9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java @@ -27,9 +27,9 @@ import java.util.List; import java.util.Map; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java index 956b66012..9cce2928b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java index 4224a30fd..0c32848d2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java index 2c93aa7f7..bdf1fb230 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java @@ -25,8 +25,8 @@ import java.util.Deque; import java.util.concurrent.ConcurrentLinkedDeque; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java index 144504a93..fd0a7685f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java index ae39710ca..4157be6b0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java index f69f1be2f..6ba2d124e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java index b1124331f..488be44b3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java index c27ec6971..3e1ea2e77 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java index 7c08213ca..3d63139f6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java index fae02a1af..381a9f3c3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java index 8d238034d..02d971539 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java index e70267c28..b87bf6caa 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java index 6954018de..4970421f4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java index 2bdefe27b..1725f673d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java index 802548298..aa5d20075 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java index f4bf7c337..d1761e33f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java index dc56b6244..5991d2334 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java index 7f5b3aa9c..db9aa4a2e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java @@ -21,8 +21,8 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java index bc993f957..cec46237d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java index 38a1055f1..43f0d8116 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java index b97ed2d8e..167bfe32d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java index 83fb0dba3..4bcc09671 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java index 10989807a..0c8a0199c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java index e16f90d15..43a597e86 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java index ecf9df1f0..4691b3501 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java index 191e13544..faf1cc9df 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java index b9b597de9..0c036d3d8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java index 77b84dc1c..7b2584cb2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java @@ -22,8 +22,8 @@ import java.util.Map; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java index a119b465c..84fa4636c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java index 5b57225b8..21aeef07d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java index b3a839de3..6898d82c3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java index e225bebd3..7838099bc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java index 193187577..f02506f25 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java index 415862763..45b934cfc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java index 0bd58022b..70e1cf558 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java index c5c1a33f7..5bfd8b13f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java index 606feeaf8..b930d58e7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java index 36a2e4463..010d4b267 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java index 117f7ebfb..3df317bc0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java index 893ca3bb0..968e2f6f4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java index 353d1c5ad..28e95593d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java index 449bc96ca..296968f1c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java index 64366ec94..aad8530fd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java index 41bf37198..7fe707299 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java index 697cee2dd..b16e4baad 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java index ee0a02818..72bb67ff0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java index b08ccd3bc..62a13fd99 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java index 57b3c2380..659581ea0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java index 60a93dd8d..2d349381c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java @@ -27,8 +27,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java index 52cacec1d..ed56684b5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java index 5e2017a5e..89529e1f8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java index 0d7dc6cc6..a138cbc70 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5214DontMapWsdlToJar extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java index 62fe81c32..fb4da50c0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java @@ -24,8 +24,8 @@ import java.util.Properties; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java index 26c1b171f..c3ec9d69a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java index 6f1d987e1..fe76c03f2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java index bd4ab1cc3..7972c2c3a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java @@ -29,8 +29,8 @@ import java.io.PrintWriter; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java index e9ce69d16..d5aa6c3b6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java index 86d96cf4c..3d7277296 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java index 91da281d6..673ab85cd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java @@ -21,8 +21,8 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java index 627fab9d1..8e42edecb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5389LifecycleParticipantAfterSessionEnd extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java index a3e0aeb4b..543e11d28 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java index e6fbc70ed..8513591ac 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java index b9140a979..69d48a8f4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java index 1daa1ada6..bbdf10d55 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java @@ -23,9 +23,9 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java index ade247ee6..9b13a4b20 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java index a800fbea9..b4d7e926e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5530MojoExecutionScopeTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java index b04bdf479..ac5c64d6c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java index 92df7b693..d31abaec3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5561PluginRelocationLosesConfigurationTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java index 30068d69b..5f2d24f6e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java index 61c1bf483..b87ac72b3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java index eaa2521c8..dbe12d63e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5578SessionScopeTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java index fab800017..e4d89075c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5581LifecycleMappingDelegate extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java index dc6331323..e7efba8a6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5591WorkspaceReader extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java index 0681c6df4..76d825816 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java index 48c0713a1..d7320f157 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java index e607ba60c..5197da144 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java index 533813a5e..e2791af65 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java index 5169e06e9..85f3dce2c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java @@ -26,8 +26,8 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java index 6a327582a..b242a6561 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java index 76926908b..9958d76aa 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java @@ -21,8 +21,8 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5742BuildExtensionClassloaderTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java index 7a1505a06..b21b26130 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java @@ -21,8 +21,8 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5753CustomMojoExecutionConfiguratorTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java index 1110c5f41..655712994 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5768CliExecutionIdTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java index c9f72eeb9..ce33418a5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java index 97c1165d2..b625d573f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5774ConfigurationProcessorsTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java index 7180196d5..f6ff52101 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5783PluginDependencyFiltering extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java index 264349401..17a1769b8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5805PkgTypeMojoConfiguration2 extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java index f95e44720..b2eaf9789 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5840ParentVersionRanges extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java index 444f872db..f2ce6f798 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5840RelativePathReactorMatching extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java index 46d1cd642..6cae626e7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java @@ -25,8 +25,8 @@ import java.nio.file.Files; import java.nio.file.Path; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java index 8f0f99848..e42a29740 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java index 4b30fcb11..692d0da7f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java index d77639c47..5634fe401 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java index f8d4ed7bd..aa5ae269b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java index 4fe4d5a38..fdfc62c23 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5958LifecyclePhaseBinaryCompat extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java index 08334206c..0d95c3a6e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java @@ -24,9 +24,9 @@ import java.util.List; import java.util.Set; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java index 56e69d25e..110af39ab 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java @@ -22,8 +22,8 @@ import java.util.LinkedList; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java index e930edfff..37b069b42 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java index 07d788685..23b16eab9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java index 72bd50eeb..2d43723bf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java index c1d7ce867..9d038fd20 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java @@ -21,8 +21,8 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java index 0b804e357..d55151850 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java @@ -21,8 +21,8 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng6127PluginExecutionConfigurationInterferenceTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java index 474129f09..d887e7ba5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java index c338b6d00..10068bd64 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java index a25cc6c85..8ebd7d99b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java index 075ba649e..c07dc0ca8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java index 2a43a3b4b..6c4c1d5ee 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java index 39dcffa9e..443bcda8c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java index 02f3f882c..41d127f5d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java @@ -24,8 +24,8 @@ import com.google.common.base.Charsets; import com.google.common.base.Joiner; import com.google.common.io.Files; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java index 94f037578..c6e950d45 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java index b686a285f..c065e8f68 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java @@ -24,9 +24,9 @@ import java.nio.file.Files; import java.nio.file.Paths; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java index bbbe2a0cc..65f833c0a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java index 4c2eb1b01..827fa4c93 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java @@ -22,8 +22,8 @@ import java.util.Properties; import org.apache.maven.shared.utils.Os; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java index cd56d7b7a..ce5768fe9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java @@ -22,8 +22,8 @@ import java.util.LinkedList; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java index 0b8f883ec..86f2d5deb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng6506PackageAnnotationTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java index e7b6b6ee7..0406fea52 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java index 19dc466f3..0fbca2cb0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java index 62b8fed14..c66c06d4a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java index 111f4a011..0f1a78e50 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java index 78776e7e9..86fd03233 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java index 4d0f4e804..17f472506 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java @@ -28,8 +28,8 @@ import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java index 0369f6494..f59d702e6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.net.URI; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java index e26d9da55..0d506f25c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java index 2fd8da0e5..9ce50c7a7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng6981ProjectListShouldIncludeChildrenTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java index 312366b2c..99f7c078c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java @@ -22,9 +22,9 @@ import java.io.IOException; import java.util.Properties; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7038RootdirTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java index 6f64a2215..73796ae01 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7045DropUselessAndOutdatedCdiApiTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java index 974d33e94..da4d1acc0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java @@ -24,9 +24,9 @@ import java.io.Reader; import java.util.Properties; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7110ExtensionClassloader extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java index 077a77511..65adfb665 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7112ProjectsWithNonRecursiveTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java index 449c30a68..d967d2c60 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java @@ -20,9 +20,9 @@ import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7128BlockExternalHttpReactorTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java index 5310228d1..c3f4d5e7a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java @@ -21,9 +21,9 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7160ExtensionClassloader extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java index 1868f57c1..a1e592b27 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java @@ -22,8 +22,8 @@ import org.apache.commons.io.FileUtils; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java index 9764edbd9..f050553b5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java @@ -22,9 +22,9 @@ import java.io.IOException; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7244IgnorePomPrefixInExpressions extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java index 1a689281e..1946a3f7f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; /** * An integration test which proves that the bug of MNG-7310 is fixed. diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java index 3c275472d..655eb98c3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java @@ -21,9 +21,9 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7335MissingJarInParallelBuild extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java index fb8bbc6eb..15a1b9976 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7349RelocationWarningTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java index 8aec3e069..fd8ea45f8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java index 0ebd09398..9710a2f17 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java @@ -22,9 +22,9 @@ import java.io.IOException; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7404IgnorePrefixlessExpressionsTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java index 94b0b4e8d..4ff1e4510 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java index d1a320fc0..c4e710538 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java index f86a36277..2d6cf4b68 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java @@ -22,8 +22,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java index 0e3179453..f17a4e321 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java index 4971f6ce4..870fa0e31 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java @@ -21,9 +21,9 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7487DeadlockTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java index 76d046d74..7ad19145e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java @@ -22,9 +22,9 @@ import java.io.IOException; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java index 2e6973f57..177b79210 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java index 1fcb8674a..8877506ec 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java index 779982730..122e48c37 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java index 930697cb7..1cb29d30d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java index 6f6d30c34..ff8b2e652 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java index 8d3c12667..a786d4045 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java index 2483df65f..17e0c8649 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.concurrent.TimeUnit; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java index ac4c0f3bb..54240a0fc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java @@ -20,8 +20,8 @@ import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.Os; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java index e55201e31..8560dd43a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java @@ -23,8 +23,8 @@ import java.util.Map; import org.apache.commons.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7939PluginsValidationExcludesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7939PluginsValidationExcludesTest.java index 69cccbd57..9da956477 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7939PluginsValidationExcludesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7939PluginsValidationExcludesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java index 80e38b072..a69812ecf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.io.FileReader; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java index 14da52359..52146dc65 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java @@ -46,7 +46,7 @@ import java.util.List; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.it.Verifier; import org.junit.jupiter.api.ClassDescriptor; import org.junit.jupiter.api.ClassOrderer; import org.junit.jupiter.api.ClassOrdererContext; diff --git a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/pom.xml b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/pom.xml index 32a6a516d..bfa3c299a 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/pom.xml +++ b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/pom.xml @@ -59,8 +59,8 @@ under the License. maven-artifact - org.apache.maven.shared - maven-verifier + org.apache.maven.executor + maven-executor junit diff --git a/core-it-support/maven-it-helper/pom.xml b/core-it-support/maven-it-helper/pom.xml index 0e090bd49..f05085d50 100644 --- a/core-it-support/maven-it-helper/pom.xml +++ b/core-it-support/maven-it-helper/pom.xml @@ -44,8 +44,8 @@ under the License. - org.apache.maven.shared - maven-verifier + org.apache.maven.executor + maven-executor org.apache.maven.shared @@ -57,4 +57,19 @@ under the License. junit-jupiter + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + ${maven.home} + + + + + diff --git a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java index 28a725866..402f9252b 100644 --- a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java +++ b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java @@ -30,8 +30,6 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.artifact.versioning.VersionRange; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInfo; diff --git a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/ResourceExtractor.java b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/ResourceExtractor.java new file mode 100644 index 000000000..b0eadab90 --- /dev/null +++ b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/ResourceExtractor.java @@ -0,0 +1,145 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.it; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.Enumeration; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; + +import org.apache.maven.shared.utils.io.FileUtils; +import org.apache.maven.shared.utils.io.IOUtil; + +/** + * Utility for extracting test resources, ported from {@code org.apache.maven.shared.verifier.util.ResourceExtractor} + * (maven-verifier) since it is used by the same test classes as {@link Verifier}. + */ +public class ResourceExtractor { + + public static File simpleExtractResources(Class cl, String resourcePath) throws IOException { + String tempDirPath = System.getProperty("maven.test.tmpdir", System.getProperty("java.io.tmpdir")); + File tempDir = new File(tempDirPath); + + File testDir = new File(tempDir, resourcePath); + + FileUtils.deleteDirectory(testDir); + + testDir = ResourceExtractor.extractResourcePath(cl, resourcePath, tempDir, false); + return testDir; + } + + public static File extractResourcePath(String resourcePath, File dest) throws IOException { + return extractResourcePath(ResourceExtractor.class, resourcePath, dest); + } + + public static File extractResourcePath(Class cl, String resourcePath, File dest) throws IOException { + return extractResourcePath(cl, resourcePath, dest, false); + } + + public static File extractResourcePath(Class cl, String resourcePath, File tempDir, boolean alwaysExtract) + throws IOException { + File dest = new File(tempDir, resourcePath); + return extractResourceToDestination(cl, resourcePath, dest, alwaysExtract); + } + + public static File extractResourceToDestination( + Class cl, String resourcePath, File destination, boolean alwaysExtract) throws IOException { + URL url = cl.getResource(resourcePath); + if (url == null) { + throw new IllegalArgumentException("Resource not found: " + resourcePath); + } + if ("jar".equalsIgnoreCase(url.getProtocol())) { + File jarFile = getJarFileFromUrl(url); + extractResourcePathFromJar(cl, jarFile, resourcePath, destination); + } else { + try { + File resourceFile = new File(new URI(url.toExternalForm())); + if (!alwaysExtract) { + return resourceFile; + } + if (resourceFile.isDirectory()) { + FileUtils.copyDirectoryStructure(resourceFile, destination); + } else { + FileUtils.copyFile(resourceFile, destination); + } + } catch (URISyntaxException e) { + throw new RuntimeException("Couldn't convert URL to File:" + url, e); + } + } + return destination; + } + + private static void extractResourcePathFromJar(Class cl, File jarFile, String resourcePath, File dest) + throws IOException { + ZipFile z = new ZipFile(jarFile, ZipFile.OPEN_READ); + String zipStyleResourcePath = resourcePath.substring(1) + "/"; + ZipEntry ze = z.getEntry(zipStyleResourcePath); + if (ze != null) { + // DGF If it's a directory, then we need to look at all the entries + for (Enumeration entries = z.entries(); entries.hasMoreElements(); ) { + ze = entries.nextElement(); + if (ze.getName().startsWith(zipStyleResourcePath)) { + String relativePath = ze.getName().substring(zipStyleResourcePath.length()); + File destFile = new File(dest, relativePath); + if (ze.isDirectory()) { + destFile.mkdirs(); + } else { + FileOutputStream fos = new FileOutputStream(destFile); + try { + IOUtil.copy(z.getInputStream(ze), fos); + } finally { + IOUtil.close(fos); + z.close(); + } + } + } + } + } else { + FileOutputStream fos = new FileOutputStream(dest); + try { + IOUtil.copy(cl.getResourceAsStream(resourcePath), fos); + } finally { + IOUtil.close(fos); + z.close(); + } + } + } + + private static File getJarFileFromUrl(URL url) { + if (!"jar".equalsIgnoreCase(url.getProtocol())) { + throw new IllegalArgumentException("This is not a Jar URL:" + url.toString()); + } + String resourceFilePath = url.getFile(); + int index = resourceFilePath.indexOf("!"); + if (index == -1) { + throw new RuntimeException("Bug! " + url.toExternalForm() + " does not have a '!'"); + } + String jarFileURI = resourceFilePath.substring(0, index); + try { + return new File(new URI(jarFileURI)); + } catch (URISyntaxException e) { + throw new RuntimeException("Bug! URI failed to parse: " + jarFileURI, e); + } + } +} diff --git a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/VerificationException.java b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/VerificationException.java new file mode 100644 index 000000000..b179a3c26 --- /dev/null +++ b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/VerificationException.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.it; + +/** + * Exception thrown when Maven verification fails. + * + * @author Jason van Zyl + */ +public class VerificationException extends Exception { + private static final long serialVersionUID = 1L; + + public VerificationException() {} + + public VerificationException(String message) { + super(message); + } + + public VerificationException(Throwable cause) { + super(cause); + } + + public VerificationException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java new file mode 100644 index 000000000..e9d908abb --- /dev/null +++ b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java @@ -0,0 +1,1006 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.it; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.StringTokenizer; + +import org.apache.maven.executor.ExecutorException; +import org.apache.maven.executor.ExecutorHelper; +import org.apache.maven.executor.ExecutorRequest; +import org.apache.maven.executor.ExecutorResult; +import org.apache.maven.executor.embedded.EmbeddedMavenExecutor; +import org.apache.maven.executor.forked.ForkedMavenExecutor; +import org.apache.maven.shared.utils.StringUtils; +import org.apache.maven.shared.utils.io.FileUtils; + +/** + * Maven test harness for integration tests. + * + *

This is the in-repo successor of {@code org.apache.maven.shared.verifier.Verifier} + * (maven-verifier), which is deprecated (see + * apache/maven-verifier#186). + * It keeps the API surface the 3.x core ITs actually use, but drives Maven through + * {@code org.apache.maven.executor:maven-executor} instead of the bespoke launchers + * maven-verifier used, the same way {@code apache/maven}'s {@code core-it-support/maven-it-helper} + * does on master.

+ * + *

Unlike the master copy, this class does not rely on a plugin execution to resolve local-repository + * or artifact/metadata paths: it computes them locally (default repository layout only), the way + * maven-verifier did it, so running the ITs does not require downloading a third-party plugin + * (see apache/maven-executor#44).

+ * + * @author Jason van Zyl + * @author Brett Porter + */ +public class Verifier { + private static final String LOG_FILENAME = "log.txt"; + + private static final List DEFAULT_CLI_ARGUMENTS = Collections.unmodifiableList(newDefaultCliArguments()); + + /** + * Command used to clean the project before execution. Neither test lifecycle binding nor prefix + * resolution here, the goal is called directly. + */ + private static final String CLEAN_CLI_ARGUMENT = "org.apache.maven.plugins:maven-clean-plugin:clean"; + + /** + * The Maven home/installation directory we are testing/executing with, honoring the same + * {@code maven.home} system property the core-it-suite (and run-its.sh) has always set. + */ + private static final java.nio.file.Path MAVEN_HOME = Paths.get(requireMavenHome()); + + /** + * Keep the executors alive as long as this class is loaded: the embedded executor keeps the + * classworld of the Maven under test alive instead of re-creating it per invocation, which + * makes embedded execution (the "embedded" profile) fast(er). + */ + private static final EmbeddedMavenExecutor EMBEDDED_MAVEN_EXECUTOR = new EmbeddedMavenExecutor(MAVEN_HOME); + + private static final ForkedMavenExecutor FORKED_MAVEN_EXECUTOR = new ForkedMavenExecutor(MAVEN_HOME); + + /** + * The preferred fork mode. Honors the same {@code verifier.forkMode} system property the + * "embedded" profile has always set (to "auto"); absent that property (the default, non-embedded + * run) executions are forked, matching maven-verifier's historical default of forking whenever + * a real {@code maven.home} is configured. + * + * @see ExecutorHelper.Mode + */ + private static final ExecutorHelper.Mode VERIFIER_FORK_MODE = resolveForkMode(); + + public static final String USER_HOME = System.getProperty("user.home"); + + public static final File USER_MAVEN_CONFIGURATION_HOME = new File(USER_HOME, ".m2"); + + private final ExecutorHelper executorHelper; + + private final String basedir; + + private String localRepoOverride; + + private String resolvedLocalRepo; + + private List defaultCliArguments; + + private List cliArguments = new ArrayList<>(); + + private Properties systemProperties = new Properties(); + + private Map environmentVariables = new HashMap<>(); + + private boolean autoclean = true; + + private boolean forkJvm = false; + + private String logFileName = LOG_FILENAME; + + private String executable = ExecutorRequest.MVN; + + public Verifier(String basedir) throws VerificationException { + this.basedir = basedir; + this.executorHelper = ExecutorHelper.forExecutors(VERIFIER_FORK_MODE, EMBEDDED_MAVEN_EXECUTOR, FORKED_MAVEN_EXECUTOR); + this.defaultCliArguments = newDefaultCliArguments(); + } + + /** + * @deprecated the {@code debug} flag has not had any effect since maven-verifier 2.0; kept only + * for source compatibility with call sites written against maven-verifier. + */ + @Deprecated + public Verifier(String basedir, boolean debug) throws VerificationException { + this(basedir); + } + + private static List newDefaultCliArguments() { + List args = new ArrayList<>(); + args.add("-e"); + args.add("--batch-mode"); + return args; + } + + private static String requireMavenHome() { + String mavenHome = System.getProperty("maven.home"); + if (mavenHome == null || mavenHome.isEmpty()) { + throw new IllegalStateException("The maven.home system property must be set to run the Maven ITs; " + + "the core-it-suite POM and run-its.sh always set it, and the module POM propagates it to " + + "the module's own unit tests as well."); + } + return mavenHome; + } + + private static ExecutorHelper.Mode resolveForkMode() { + String forkMode = System.getProperty("verifier.forkMode"); + if (forkMode == null || forkMode.isEmpty()) { + return ExecutorHelper.Mode.FORKED; + } + return ExecutorHelper.Mode.valueOf(forkMode.toUpperCase(Locale.ROOT)); + } + + public void setLocalRepo(String localRepo) { + this.localRepoOverride = localRepo; + this.resolvedLocalRepo = null; + } + + /** + * @deprecated will be removed without replacement + */ + @Deprecated + public void displayStreamBuffers() {} + + // ---------------------------------------------------------------------- + // + // ---------------------------------------------------------------------- + + public void verifyErrorFreeLog() throws VerificationException { + List lines = loadFile(getLogFile(), false); + + for (String line : lines) { + // A hack to keep stupid velocity resource loader errors from triggering failure + if (stripAnsi(line).contains("[ERROR]") && !isVelocityError(line)) { + throw new VerificationException("Error in execution: " + line); + } + } + } + + /** + * Checks whether the specified line is just an error message from Velocity. Especially old versions of Doxia + * employ a very noisy Velocity instance. + * + * @param line The log line to check, must not be null. + * @return true if the line appears to be a Velocity error, false otherwise. + */ + private static boolean isVelocityError(String line) { + return line.contains("VM_global_library.vm") || line.contains("VM #") && line.contains("macro"); + } + + /** + * Throws an exception if the text is not present in the log. + * + * @param text the text to assert present + * @throws VerificationException if text is not found in log + */ + public void verifyTextInLog(String text) throws VerificationException { + List lines = loadFile(getLogFile(), false); + + boolean result = false; + for (String line : lines) { + if (stripAnsi(line).contains(text)) { + result = true; + break; + } + } + if (!result) { + throw new VerificationException("Text not found in log: " + text); + } + } + + public static String stripAnsi(String msg) { + return msg.replaceAll("\u001B\\[[;\\d]*[ -/]*[@-~]", ""); + } + + public Properties loadProperties(String filename) throws VerificationException { + Properties properties = new Properties(); + + File propertiesFile = new File(getBasedir(), filename); + try (FileInputStream fis = new FileInputStream(propertiesFile)) { + properties.load(fis); + } catch (IOException e) { + throw new VerificationException("Error reading properties file", e); + } + + return properties; + } + + /** + * Loads the (non-empty) lines of the specified text file. + * + * @param filename The path to the text file to load, relative to the base directory, must not be null. + * @param encoding The character encoding of the file, may be null or empty to use the platform default + * encoding. + * @return The list of (non-empty) lines from the text file, can be empty but never null. + * @throws IOException If the file could not be loaded. + * @since 1.2 + */ + public List loadLines(String filename, String encoding) throws IOException { + List lines = new ArrayList<>(); + + try (java.io.BufferedReader reader = getReader(filename, encoding)) { + String line; + while ((line = reader.readLine()) != null) { + if (line.length() > 0) { + lines.add(line); + } + } + } + + return lines; + } + + public List loadLines(String filename) throws IOException { + return loadLines(filename, null); + } + + private java.io.BufferedReader getReader(String filename, String encoding) throws IOException { + File file = new File(getBasedir(), filename); + + if (encoding != null && !encoding.isEmpty()) { + return Files.newBufferedReader(file.toPath(), Charset.forName(encoding)); + } else { + return Files.newBufferedReader(file.toPath()); + } + } + + public List loadFile(String basedir, String filename, boolean hasCommand) throws VerificationException { + return loadFile(new File(basedir, filename), hasCommand); + } + + public List loadFile(File file, boolean hasCommand) throws VerificationException { + List lines = new ArrayList<>(); + + if (file.exists()) { + try (java.io.BufferedReader reader = new java.io.BufferedReader(new FileReader(file))) { + String line = reader.readLine(); + + while (line != null) { + line = line.trim(); + + if (!line.startsWith("#") && line.length() != 0) { + lines.addAll(replaceArtifacts(line, hasCommand)); + } + line = reader.readLine(); + } + } catch (IOException e) { + throw new VerificationException(e); + } + } + + return lines; + } + + private static final String MARKER = "${artifact:"; + + private List replaceArtifacts(String line, boolean hasCommand) { + int index = line.indexOf(MARKER); + if (index >= 0) { + String newLine = line.substring(0, index); + index = line.indexOf("}", index); + if (index < 0) { + throw new IllegalArgumentException("line does not contain ending artifact marker: '" + line + "'"); + } + String artifact = line.substring(newLine.length() + MARKER.length(), index); + + newLine += getArtifactPath(artifact); + newLine += line.substring(index + 1); + + List l = new ArrayList<>(); + l.add(newLine); + + int endIndex = newLine.lastIndexOf('/'); + + String command = null; + String filespec; + if (hasCommand) { + int startIndex = newLine.indexOf(' '); + + command = newLine.substring(0, startIndex); + + filespec = newLine.substring(startIndex + 1, endIndex); + } else { + filespec = newLine; + } + + File dir = new File(filespec); + addMetadataToList(dir, hasCommand, l, command); + addMetadataToList(dir.getParentFile(), hasCommand, l, command); + + return l; + } else { + return Collections.singletonList(line); + } + } + + private static void addMetadataToList(File dir, boolean hasCommand, List l, String command) { + if (dir != null && dir.exists() && dir.isDirectory()) { + String[] files = dir.list(new FilenameFilter() { + public boolean accept(File dir, String name) { + return name.startsWith("maven-metadata") && name.endsWith(".xml"); + } + }); + + if (files != null) { + for (String file : files) { + if (hasCommand) { + l.add(command + " " + new File(dir, file).getPath()); + } else { + l.add(new File(dir, file).getPath()); + } + } + } + } + } + + private String getArtifactPath(String artifact) { + StringTokenizer tok = new StringTokenizer(artifact, ":"); + if (tok.countTokens() != 4) { + throw new IllegalArgumentException("Artifact must have 4 tokens: '" + artifact + "'"); + } + + String[] a = new String[4]; + for (int i = 0; i < 4; i++) { + a[i] = tok.nextToken(); + } + + String groupId = a[0]; + String artifactId = a[1]; + String version = a[2]; + String ext = a[3]; + return getArtifactPath(groupId, artifactId, version, ext); + } + + public String getArtifactPath(String groupId, String artifactId, String version, String ext) { + return getArtifactPath(groupId, artifactId, version, ext, null); + } + + /** + * Returns the absolute path to the artifact denoted by groupId, artifactId, version, extension and classifier, + * computed locally against the default repository layout (no plugin execution involved, see + * apache/maven-executor#44). + * + * @param gid The groupId, must not be null. + * @param aid The artifactId, must not be null. + * @param version The version, must not be null. + * @param ext The extension, must not be null. + * @param classifier The classifier, may be null to be omitted. + * @return the absolute path to the artifact denoted by groupId, artifactId, version, extension and classifier, + * never null. + */ + public String getArtifactPath(String gid, String aid, String version, String ext, String classifier) { + if (classifier != null && classifier.length() == 0) { + classifier = null; + } + if ("maven-plugin".equals(ext)) { + ext = "jar"; + } + if ("coreit-artifact".equals(ext)) { + ext = "jar"; + classifier = "it"; + } + if ("test-jar".equals(ext)) { + ext = "jar"; + classifier = "tests"; + } + + String repositoryPath = gid.replace('.', '/'); + repositoryPath = repositoryPath + "/" + aid + "/" + version; + repositoryPath = repositoryPath + "/" + aid + "-" + version; + if (classifier != null) { + repositoryPath = repositoryPath + "-" + classifier; + } + repositoryPath = repositoryPath + "." + ext; + + return getLocalRepository() + "/" + repositoryPath; + } + + public List getArtifactFileNameList(String org, String name, String version, String ext) { + List files = new ArrayList<>(); + String artifactPath = getArtifactPath(org, name, version, ext); + File dir = new File(artifactPath); + files.add(artifactPath); + addMetadataToList(dir, false, files, null); + addMetadataToList(dir.getParentFile(), false, files, null); + return files; + } + + /** + * Gets the path to the local artifact metadata. Note that the method does not check whether the returned path + * actually points to existing metadata. + * + * @param gid The group id, must not be null. + * @param aid The artifact id, must not be null. + * @param version The artifact version, may be null. + * @return The (absolute) path to the local artifact metadata, never null. + */ + public String getArtifactMetadataPath(String gid, String aid, String version) { + return getArtifactMetadataPath(gid, aid, version, "maven-metadata-local.xml"); + } + + /** + * Gets the path to a file in the local artifact directory. Note that the method does not check whether the returned + * path actually points to an existing file. + * + * @param gid The group id, must not be null. + * @param aid The artifact id, may be null. + * @param version The artifact version, may be null. + * @param filename The filename to use, must not be null. + * @return The (absolute) path to the local artifact metadata, never null. + */ + public String getArtifactMetadataPath(String gid, String aid, String version, String filename) { + StringBuilder buffer = new StringBuilder(256); + + buffer.append(getLocalRepository()); + buffer.append('/'); + + buffer.append(gid.replace('.', '/')); + buffer.append('/'); + + if (aid != null) { + buffer.append(aid); + buffer.append('/'); + + if (version != null) { + buffer.append(version); + buffer.append('/'); + } + } + + buffer.append(filename); + + return buffer.toString(); + } + + /** + * Gets the path to the local artifact metadata. Note that the method does not check whether the returned path + * actually points to existing metadata. + * + * @param gid The group id, must not be null. + * @param aid The artifact id, must not be null. + * @return The (absolute) path to the local artifact metadata, never null. + */ + public String getArtifactMetadataPath(String gid, String aid) { + return getArtifactMetadataPath(gid, aid, null); + } + + public void deleteArtifact(String org, String name, String version, String ext) throws IOException { + List files = getArtifactFileNameList(org, name, version, ext); + for (String fileName : files) { + FileUtils.forceDelete(new File(fileName)); + } + } + + /** + * Deletes all artifacts in the specified group id from the local repository. + * + * @param gid The group id whose artifacts should be deleted, must not be null. + * @throws IOException If the artifacts could not be deleted. + * @since 1.2 + */ + public void deleteArtifacts(String gid) throws IOException { + String path = gid.replace('.', '/'); + FileUtils.deleteDirectory(new File(getLocalRepository(), path)); + } + + /** + * Deletes all artifacts in the specified g:a:v from the local repository. + * + * @param gid The group id whose artifacts should be deleted, must not be null. + * @param aid The artifact id whose artifacts should be deleted, must not be null. + * @param version The (base) version whose artifacts should be deleted, must not be null. + * @throws IOException If the artifacts could not be deleted. + * @since 1.3 + */ + public void deleteArtifacts(String gid, String aid, String version) throws IOException { + String path = gid.replace('.', '/') + '/' + aid + '/' + version; + FileUtils.deleteDirectory(new File(getLocalRepository(), path)); + } + + /** + * Deletes the specified directory. + * + * @param path The path to the directory to delete, relative to the base directory, must not be null. + * @throws IOException If the directory could not be deleted. + * @since 1.2 + */ + public void deleteDirectory(String path) throws IOException { + FileUtils.deleteDirectory(new File(getBasedir(), path)); + } + + /** + * Filters a text file by replacing some user-defined tokens. + * This method is equivalent to: + * + * 
+     *     filterFile( srcPath, dstPath, fileEncoding, verifier.newDefaultFilterMap() )
+     *
+ * + * @param srcPath The path to the input file, relative to the base directory, must not be + * null. + * @param dstPath The path to the output file, relative to the base directory and possibly equal to the + * input file, must not be null. + * @param fileEncoding The file encoding to use, may be null or empty to use the platform's default + * encoding. + * @return The path to the filtered output file, never null. + * @throws IOException If the file could not be filtered. + * @since 2.0 + */ + public File filterFile(String srcPath, String dstPath, String fileEncoding) throws IOException { + return filterFile(srcPath, dstPath, fileEncoding, newDefaultFilterMap()); + } + + /** + * Filters a text file by replacing some user-defined tokens. + * + * @param srcPath The path to the input file, relative to the base directory, must not be + * null. + * @param dstPath The path to the output file, relative to the base directory and possibly equal to the + * input file, must not be null. + * @param fileEncoding The file encoding to use, may be null or empty to use the platform's default + * encoding. + * @param filterMap The mapping from tokens to replacement values, must not be null. + * @return The path to the filtered output file, never null. + * @throws IOException If the file could not be filtered. + * @since 1.2 + */ + public File filterFile(String srcPath, String dstPath, String fileEncoding, Map filterMap) + throws IOException { + File srcFile = new File(getBasedir(), srcPath); + String data = FileUtils.fileRead(srcFile, fileEncoding); + + for (Map.Entry entry : filterMap.entrySet()) { + data = StringUtils.replace(data, entry.getKey(), entry.getValue()); + } + + File dstFile = new File(getBasedir(), dstPath); + //noinspection ResultOfMethodCallIgnored + dstFile.getParentFile().mkdirs(); + FileUtils.fileWrite(dstFile.getPath(), fileEncoding, data); + + return dstFile; + } + + /** + * Gets a new copy of the default filter map. These default filter map, contains the tokens "@basedir@" and + * "@baseurl@" to the test's base directory and its base file: URL, respectively. + * + * @return The (modifiable) map with the default filter map, never null. + * @since 2.0 + */ + public Map newDefaultFilterMap() { + Map filterMap = new HashMap<>(); + + java.nio.file.Path basedir = Paths.get(getBasedir()).toAbsolutePath(); + filterMap.put("@basedir@", basedir.toString()); + filterMap.put("@baseurl@", basedir.toUri().toASCIIString()); + + return filterMap; + } + + /** + * Verifies that the given file exists. + * + * @param file the path of the file to check + * @throws VerificationException in case the given file does not exist + */ + public void verifyFilePresent(String file) throws VerificationException { + verifyFilePresence(file, true); + } + + /** + * Verifies that the given file does not exist. + * + * @param file the path of the file to check + * @throws VerificationException if the given file exists + */ + public void verifyFileNotPresent(String file) throws VerificationException { + verifyFilePresence(file, false); + } + + private void verifyArtifactPresence(boolean wanted, String groupId, String artifactId, String version, String ext) + throws VerificationException { + List files = getArtifactFileNameList(groupId, artifactId, version, ext); + for (String fileName : files) { + verifyFilePresence(fileName, wanted); + } + } + + /** + * Verifies that the artifact given through its Maven coordinates exists. + * + * @param groupId the groupId of the artifact (must not be null) + * @param artifactId the artifactId of the artifact (must not be null) + * @param version the version of the artifact (must not be null) + * @param ext the extension of the artifact (must not be null) + * @throws VerificationException if the given artifact does not exist + */ + public void verifyArtifactPresent(String groupId, String artifactId, String version, String ext) + throws VerificationException { + verifyArtifactPresence(true, groupId, artifactId, version, ext); + } + + /** + * Verifies that the artifact given through its Maven coordinates does not exist. + * + * @param groupId the groupId of the artifact (must not be null) + * @param artifactId the artifactId of the artifact (must not be null) + * @param version the version of the artifact (must not be null) + * @param ext the extension of the artifact (must not be null) + * @throws VerificationException if the given artifact exists + */ + public void verifyArtifactNotPresent(String groupId, String artifactId, String version, String ext) + throws VerificationException { + verifyArtifactPresence(false, groupId, artifactId, version, ext); + } + + private void verifyFilePresence(String filePath, boolean wanted) throws VerificationException { + if (filePath.contains("!/")) { + Path basedir = Paths.get(getBasedir()).toAbsolutePath(); + String urlString = "jar:" + basedir.toUri().toASCIIString() + "/" + filePath; + + InputStream is = null; + try { + URL url = new URL(urlString); + + is = url.openStream(); + + if (is == null) { + if (wanted) { + throw new VerificationException("Expected JAR resource was not found: " + filePath); + } + } else { + if (!wanted) { + throw new VerificationException("Unwanted JAR resource was found: " + filePath); + } + } + } catch (MalformedURLException e) { + throw new VerificationException("Error looking for JAR resource", e); + } catch (IOException e) { + if (wanted) { + throw new VerificationException("Error looking for JAR resource: " + filePath); + } + } finally { + if (is != null) { + try { + is.close(); + } catch (IOException e) { + // ignore + } + } + } + } else { + File expectedFile = new File(filePath); + + // NOTE: On Windows, a path with a leading (back-)slash is relative to the current drive + if (!expectedFile.isAbsolute() && !expectedFile.getPath().startsWith(File.separator)) { + expectedFile = new File(getBasedir(), filePath); + } + + if (filePath.indexOf('*') > -1) { + File parent = expectedFile.getParentFile(); + + if (!parent.exists()) { + if (wanted) { + throw new VerificationException( + "Expected file pattern was not found: " + expectedFile.getPath()); + } + } else { + String shortNamePattern = expectedFile.getName().replaceAll("\\*", ".*"); + + String[] candidates = parent.list(); + + boolean found = false; + + if (candidates != null) { + for (String candidate : candidates) { + if (candidate.matches(shortNamePattern)) { + found = true; + break; + } + } + } + + if (!found && wanted) { + throw new VerificationException( + "Expected file pattern was not found: " + expectedFile.getPath()); + } else if (found && !wanted) { + throw new VerificationException("Unwanted file pattern was found: " + expectedFile.getPath()); + } + } + } else { + if (!expectedFile.exists()) { + if (wanted) { + throw new VerificationException("Expected file was not found: " + expectedFile.getPath()); + } + } else { + if (!wanted) { + throw new VerificationException("Unwanted file was found: " + expectedFile.getPath()); + } + } + } + } + } + + /** + * Verifies that the artifact given by its Maven coordinates exists and contains the given content. + * + * @param groupId the groupId of the artifact (must not be null) + * @param artifactId the artifactId of the artifact (must not be null) + * @param version the version of the artifact (must not be null) + * @param ext the extension of the artifact (must not be null) + * @param content the expected content + * @throws IOException if reading from the artifact fails + * @throws VerificationException if the content of the artifact differs + */ + public void verifyArtifactContent(String groupId, String artifactId, String version, String ext, String content) + throws IOException, VerificationException { + String fileName = getArtifactPath(groupId, artifactId, version, ext); + if (!content.equals(FileUtils.fileRead(fileName))) { + throw new VerificationException("Content of " + fileName + " does not equal " + content); + } + } + + // ---------------------------------------------------------------------- + // + // ---------------------------------------------------------------------- + + /** + * Execute Maven. + */ + public void execute() throws VerificationException { + List args = new ArrayList<>(defaultCliArguments); + + args.add("-Dmaven.repo.local=" + getLocalRepository()); + + if (autoclean) { + args.add(CLEAN_CLI_ARGUMENT); + } + + for (Map.Entry entry : systemProperties.entrySet()) { + args.add("-D" + entry.getKey() + "=" + entry.getValue()); + } + + for (String cliArgument : cliArguments) { + args.add(cliArgument.replace("${basedir}", getBasedir())); + } + + if (logFileName != null) { + args.add(0, logFileName); + args.add(0, "-l"); + } + + File logFile = getLogFile(); + + try { + ExecutorRequest.Builder builder = ExecutorRequest.mavenBuilder() + .command(executable) + .cwd(Paths.get(basedir)) + .arguments(args) + .skipMavenRc(true); + if (!environmentVariables.isEmpty()) { + builder.environmentVariables(environmentVariables); + } + + ExecutorHelper.Mode mode = executorHelper.getDefaultMode(); + if (forkJvm) { + mode = ExecutorHelper.Mode.FORKED; + } + + ExecutorRequest request = builder.build(); + ExecutorResult result = executorHelper.execute(mode, request); + + if (!result.success()) { + throw new VerificationException("Exit code was non-zero: " + + result.exitCode().orElse(-1) + "; command line and log = \n" + getExecutable() + " " + + StringUtils.join(args.iterator(), " ") + "\n" + getLogContents(logFile)); + } + } catch (ExecutorException e) { + throw new VerificationException("Failed to execute Maven", e); + } + } + + public String getMavenVersion() throws VerificationException { + try { + return executorHelper.mavenVersion(); + } catch (ExecutorException e) { + throw new VerificationException("Failed to determine Maven version", e); + } + } + + private static String getLogContents(File logFile) { + try { + return FileUtils.fileRead(logFile); + } catch (IOException e) { + // ignore + return "(Error reading log contents: " + e.getMessage() + ")"; + } + } + + /** + * Resolves the effective local repository, in order: an explicit {@link #setLocalRepo(String)} override, + * a {@code -Dmaven.repo.local=} CLI argument already added to this verifier, the {@code maven.repo.local} + * system property (set by the run-its.sh/POM invocation), or else {@code ~/.m2/repository}. + */ + public String getLocalRepository() { + if (localRepoOverride != null) { + return localRepoOverride; + } + if (resolvedLocalRepo == null) { + resolvedLocalRepo = resolveLocalRepository(); + } + return resolvedLocalRepo; + } + + private String resolveLocalRepository() { + String prefix = "-Dmaven.repo.local="; + for (String cliArgument : cliArguments) { + if (cliArgument.startsWith(prefix)) { + return cliArgument.substring(prefix.length()); + } + } + + String repo = System.getProperty("maven.repo.local"); + if (repo != null && !repo.isEmpty()) { + return repo; + } + + return USER_HOME + File.separator + ".m2" + File.separator + "repository"; + } + + /** + * @deprecated will be removed without replacement, + * for arguments adding please use {@link #addCliArgument(String)}, {@link #addCliArguments(String...)} + */ + @Deprecated + public void setCliOptions(List cliOptions) { + this.cliArguments = cliOptions; + } + + /** + * Add a command line argument, each argument must be set separately one by one. + *

+ * ${basedir} in argument will be replaced by value of {@link #getBasedir()} during execution. + * + * @param cliArgument an argument to add + */ + public void addCliArgument(String cliArgument) { + cliArguments.add(cliArgument); + } + + /** + * Add a command line arguments, each argument must be set separately one by one. + *

+ * ${basedir} in argument will be replaced by value of {@link #getBasedir()} during execution. + * + * @param cliArguments an arguments list to add + */ + public void addCliArguments(String... cliArguments) { + Collections.addAll(this.cliArguments, cliArguments); + } + + public Properties getSystemProperties() { + return systemProperties; + } + + public void setSystemProperty(String key, String value) { + if (value != null) { + systemProperties.setProperty(key, value); + } else { + systemProperties.remove(key); + } + } + + public void setEnvironmentVariable(String key, String value) { + if (value != null) { + environmentVariables.put(key, value); + } else { + environmentVariables.remove(key); + } + } + + public boolean isAutoclean() { + return autoclean; + } + + /** + * Clean project before execution by adding {@link #CLEAN_CLI_ARGUMENT} to command line. + *

+ * By default, options is enabled. + * + * @param autoclean indicate if option is enabled + */ + public void setAutoclean(boolean autoclean) { + this.autoclean = autoclean; + } + + public String getBasedir() { + return basedir; + } + + /** + * Gets the name of the file used to log build output. + * + * @return The name of the log file, relative to the base directory, never null. + * @since 1.2 + */ + public String getLogFileName() { + return this.logFileName; + } + + /** + * Sets the name of the file used to log build output. + * + * @param logFileName The name of the log file, relative to the base directory, must not be empty or + * null. + * @since 1.2 + */ + public void setLogFileName(String logFileName) { + if (logFileName == null || logFileName.isEmpty()) { + throw new IllegalArgumentException("log file name unspecified"); + } + this.logFileName = logFileName; + } + + private File getLogFile() { + return new File(getBasedir(), logFileName); + } + + public void setForkJvm(boolean forkJvm) { + this.forkJvm = forkJvm; + } + + public String getLocalRepoLayout() { + return "default"; + } + + public String getExecutable() { + return executable; + } + + public void setExecutable(String executable) { + this.executable = executable; + } +} diff --git a/pom.xml b/pom.xml index 59a6d928a..32ce5cf2a 100644 --- a/pom.xml +++ b/pom.xml @@ -116,9 +116,9 @@ under the License. ${maven-version} - org.apache.maven.shared - maven-verifier - 2.0.0-M1 + org.apache.maven.executor + maven-executor + 1.0.0 org.junit.jupiter From 84a07d8e78f58707738c2662d1f918104df193dc Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Mon, 21 Sep 2026 12:44:26 +0200 Subject: [PATCH 2/5] Fix up maven-verifier imports in tests added since maven-3.9.x These three IT classes landed on maven-3.10.x after the maven-3.9.x branch point and still imported org.apache.maven.shared.verifier.*, so the cherry-picked migration commit did not touch them. --- .../org/apache/maven/it/MavenITgh11969ColorAlwaysTest.java | 4 ++-- .../MavenITgh12288SettingsProfileAetherPropertiesTest.java | 4 ++-- .../apache/maven/it/MavenITgh12668ExtensionDebugLevel.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11969ColorAlwaysTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11969ColorAlwaysTest.java index 34cb6c74a..12d2d8beb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11969ColorAlwaysTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11969ColorAlwaysTest.java @@ -21,8 +21,8 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12288SettingsProfileAetherPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12288SettingsProfileAetherPropertiesTest.java index 39eec8b5b..ef0ae4540 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12288SettingsProfileAetherPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12288SettingsProfileAetherPropertiesTest.java @@ -24,8 +24,8 @@ import java.nio.file.Path; import java.util.Comparator; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12668ExtensionDebugLevel.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12668ExtensionDebugLevel.java index 4c4d00eff..bcdee7de8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12668ExtensionDebugLevel.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12668ExtensionDebugLevel.java @@ -21,9 +21,9 @@ import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; From 5f9d0187d175154098aab1df48ebca3dd38de230 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Mon, 21 Sep 2026 12:45:29 +0200 Subject: [PATCH 3/5] Restore the deprecated filterFile(..., Properties) overload Same fix as the maven-3.9.x branch: maven-verifier kept this overload alongside the Map one and MavenITmng0768OfflineModeTest still calls it with a Properties instance. --- .../src/main/java/org/apache/maven/it/Verifier.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java index e9d908abb..0af801b5b 100644 --- a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java +++ b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java @@ -586,6 +586,16 @@ public File filterFile(String srcPath, String dstPath, String fileEncoding) thro * @throws IOException If the file could not be filtered. * @since 1.2 */ + /** + * @deprecated use {@link #filterFile(String, String, String, Map)} + */ + @Deprecated + @SuppressWarnings({"rawtypes", "unchecked"}) + public File filterFile(String srcPath, String dstPath, String fileEncoding, Properties filterProperties) + throws IOException { + return filterFile(srcPath, dstPath, fileEncoding, (Map) filterProperties); + } + public File filterFile(String srcPath, String dstPath, String fileEncoding, Map filterMap) throws IOException { File srcFile = new File(getBasedir(), srcPath); From 4d2bf7626eea1930b11a2089d72505dc9145892e Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Mon, 21 Sep 2026 12:54:23 +0200 Subject: [PATCH 4/5] Apply spotless formatting spotless:apply removed the now-redundant org.apache.maven.it.Verifier / ResourceExtractor imports the sed-based migration left behind (Verifier, VerificationException and ResourceExtractor all live in the tests' own org.apache.maven.it package) and reflowed one line in Verifier.java. --- .../java/org/apache/maven/it/MavenIT0008SimplePluginTest.java | 2 -- .../org/apache/maven/it/MavenIT0009GoalConfigurationTest.java | 2 -- .../maven/it/MavenIT0010DependencyClosureResolutionTest.java | 2 -- .../MavenIT0011DefaultVersionByDependencyManagementTest.java | 2 -- .../org/apache/maven/it/MavenIT0012PomInterpolationTest.java | 2 -- .../apache/maven/it/MavenIT0018DependencyManagementTest.java | 2 -- .../maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java | 2 -- .../java/org/apache/maven/it/MavenIT0021PomProfileTest.java | 2 -- .../org/apache/maven/it/MavenIT0023SettingsProfileTest.java | 2 -- .../maven/it/MavenIT0024MultipleGoalExecutionsTest.java | 2 -- .../it/MavenIT0025MultipleExecutionLevelConfigsTest.java | 2 -- .../maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java | 2 -- .../org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java | 2 -- .../maven/it/MavenIT0037AlternatePomFileSameDirTest.java | 2 -- .../maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java | 2 -- .../maven/it/MavenIT0040PackagingFromPluginExtensionTest.java | 2 -- .../it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java | 2 -- .../maven/it/MavenIT0056MultipleGoalExecutionsTest.java | 2 -- .../apache/maven/it/MavenIT0063SystemScopeDependencyTest.java | 2 -- .../apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java | 2 -- .../it/MavenIT0071PluginConfigWithDottedPropertyTest.java | 2 -- .../it/MavenIT0072InterpolationWithDottedPropertyTest.java | 2 -- .../apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java | 3 --- .../java/org/apache/maven/it/MavenIT0086PluginRealmTest.java | 2 -- .../it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java | 2 -- .../apache/maven/it/MavenIT0090EnvVarInterpolationTest.java | 2 -- .../org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java | 3 --- ...MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java | 2 -- .../org/apache/maven/it/MavenIT0130CleanLifecycleTest.java | 2 -- .../org/apache/maven/it/MavenIT0131SiteLifecycleTest.java | 2 -- .../java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java | 2 -- .../java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java | 2 -- .../java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java | 2 -- .../java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java | 2 -- .../java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java | 2 -- .../java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java | 2 -- .../org/apache/maven/it/MavenIT0138PluginLifecycleTest.java | 2 -- .../it/MavenIT0139InterpolationWithProjectPrefixTest.java | 2 -- .../maven/it/MavenIT0140InterpolationWithPomPrefixTest.java | 2 -- .../maven/it/MavenIT0142DirectDependencyScopesTest.java | 2 -- .../maven/it/MavenIT0143TransitiveDependencyScopesTest.java | 2 -- .../maven/it/MavenIT0144LifecycleExecutionOrderTest.java | 2 -- .../apache/maven/it/MavenIT0146InstallerSnapshotNaming.java | 2 -- .../org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java | 2 -- .../test/java/org/apache/maven/it/MavenITBootstrapTest.java | 2 -- .../MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java | 2 -- .../maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java | 2 -- .../org/apache/maven/it/MavenITgh11969ColorAlwaysTest.java | 2 -- .../it/MavenITgh12288SettingsProfileAetherPropertiesTest.java | 2 -- .../apache/maven/it/MavenITgh12668ExtensionDebugLevel.java | 3 --- .../maven/it/MavenITmng0095ReactorFailureBehaviorTest.java | 3 --- .../apache/maven/it/MavenITmng0187CollectedProjectsTest.java | 2 -- .../maven/it/MavenITmng0249ResolveDepsFromReactorTest.java | 2 -- ...avenITmng0282NonReactorExecWhenProjectIndependentTest.java | 2 -- .../it/MavenITmng0294MergeGlobalAndUserSettingsTest.java | 2 -- .../maven/it/MavenITmng0377PluginLookupFromPrefixTest.java | 2 -- .../maven/it/MavenITmng0449PluginVersionResolutionTest.java | 2 -- .../it/MavenITmng0461TolerateMissingDependencyPomTest.java | 2 -- .../org/apache/maven/it/MavenITmng0469ReportConfigTest.java | 2 -- .../apache/maven/it/MavenITmng0471CustomLifecycleTest.java | 2 -- .../maven/it/MavenITmng0479OverrideCentralRepoTest.java | 3 --- .../it/MavenITmng0496IgnoreUnknownPluginParametersTest.java | 2 -- .../org/apache/maven/it/MavenITmng0505VersionRangeTest.java | 2 -- .../apache/maven/it/MavenITmng0507ArtifactRelocationTest.java | 2 -- .../maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java | 2 -- .../maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java | 2 -- .../maven/it/MavenITmng0557UserSettingsCliOptionTest.java | 2 -- .../maven/it/MavenITmng0612NewestConflictResolverTest.java | 2 -- .../apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java | 2 -- .../maven/it/MavenITmng0674PluginParameterAliasTest.java | 2 -- .../org/apache/maven/it/MavenITmng0680ParentBasedirTest.java | 2 -- .../maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java | 2 -- .../org/apache/maven/it/MavenITmng0768OfflineModeTest.java | 3 --- .../it/MavenITmng0773SettingsProfileReactorPollutionTest.java | 2 -- .../maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java | 2 -- .../maven/it/MavenITmng0786ProfileAwareReactorTest.java | 2 -- .../maven/it/MavenITmng0814ExplicitProfileActivationTest.java | 2 -- .../maven/it/MavenITmng0818WarDepsNotTransitiveTest.java | 2 -- .../apache/maven/it/MavenITmng0820ConflictResolutionTest.java | 2 -- .../apache/maven/it/MavenITmng0823MojoContextPassingTest.java | 2 -- .../maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java | 2 -- .../maven/it/MavenITmng0836PluginParentResolutionTest.java | 3 --- .../MavenITmng0848UserPropertyOverridesDefaultValueTest.java | 2 -- .../maven/it/MavenITmng0866EvaluateDefaultValueTest.java | 2 -- .../it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java | 2 -- .../apache/maven/it/MavenITmng0947OptionalDependencyTest.java | 2 -- ...mng0956ComponentInjectionViaProjectLevelPluginDepTest.java | 2 -- .../it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java | 2 -- .../it/MavenITmng1021EqualAttachmentBuildNumberTest.java | 2 -- .../apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java | 2 -- .../maven/it/MavenITmng1073AggregatorForksReactorTest.java | 2 -- .../maven/it/MavenITmng1088ReactorPluginResolutionTest.java | 2 -- .../maven/it/MavenITmng1142VersionRangeIntersectionTest.java | 2 -- .../maven/it/MavenITmng1144MultipleDefaultGoalsTest.java | 2 -- .../maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java | 2 -- .../apache/maven/it/MavenITmng1323AntrunDependenciesTest.java | 2 -- .../apache/maven/it/MavenITmng1349ChecksumFormatsTest.java | 2 -- .../apache/maven/it/MavenITmng1412DependenciesOrderTest.java | 2 -- .../maven/it/MavenITmng1415QuotedSystemPropertiesTest.java | 2 -- .../it/MavenITmng1491ReactorArtifactIdCollisionTest.java | 3 --- .../maven/it/MavenITmng1493NonStandardModulePomNamesTest.java | 2 -- .../apache/maven/it/MavenITmng1701DuplicatePluginTest.java | 3 --- .../maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java | 2 -- ...avenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java | 2 -- ...avenITmng1803PomValidationErrorIncludesLineNumberTest.java | 2 -- .../maven/it/MavenITmng1895ScopeConflictResolutionTest.java | 2 -- .../it/MavenITmng1957JdkActivationWithVersionRangeTest.java | 2 -- .../it/MavenITmng1992SystemPropOverridesPomPropTest.java | 2 -- .../it/MavenITmng1995InterpolateBooleanModelElementsTest.java | 2 -- .../it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java | 2 -- .../MavenITmng2045testJarDependenciesBrokenInReactorTest.java | 2 -- ...ITmng2052InterpolateWithSettingsProfilePropertiesTest.java | 2 -- .../it/MavenITmng2054PluginExecutionInheritanceTest.java | 2 -- .../maven/it/MavenITmng2068ReactorRelativeParentsTest.java | 2 -- .../MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java | 2 -- .../it/MavenITmng2103PluginExecutionInheritanceTest.java | 2 -- .../maven/it/MavenITmng2123VersionRangeDependencyTest.java | 2 -- .../MavenITmng2124PomInterpolationWithParentValuesTest.java | 2 -- .../it/MavenITmng2130ParentLookupFromReactorCacheTest.java | 2 -- .../maven/it/MavenITmng2135PluginBuildInReactorTest.java | 2 -- .../maven/it/MavenITmng2136ActiveByDefaultProfileTest.java | 2 -- .../MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java | 2 -- .../MavenITmng2174PluginDepsManagedByParentProfileTest.java | 2 -- .../apache/maven/it/MavenITmng2196ParentResolutionTest.java | 3 --- .../apache/maven/it/MavenITmng2199ParentVersionRangeTest.java | 3 --- .../maven/it/MavenITmng2201PluginConfigInterpolationTest.java | 2 -- .../MavenITmng2222OutputDirectoryReactorResolutionTest.java | 2 -- .../apache/maven/it/MavenITmng2228ComponentInjectionTest.java | 2 -- .../it/MavenITmng2234ActiveProfilesFromSettingsTest.java | 2 -- .../org/apache/maven/it/MavenITmng2254PomEncodingTest.java | 2 -- ...MavenITmng2276ProfileActivationBySettingsPropertyTest.java | 2 -- .../it/MavenITmng2277AggregatorAndResolutionPluginsTest.java | 2 -- .../apache/maven/it/MavenITmng2305MultipleProxiesTest.java | 2 -- .../maven/it/MavenITmng2309ProfileInjectionOrderTest.java | 2 -- .../maven/it/MavenITmng2318LocalParentResolutionTest.java | 2 -- .../maven/it/MavenITmng2339BadProjectInterpolationTest.java | 2 -- .../maven/it/MavenITmng2362DeployedPomEncodingTest.java | 2 -- .../maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java | 2 -- .../org/apache/maven/it/MavenITmng2387InactiveProxyTest.java | 2 -- .../apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java | 2 -- ...Tmng2486TimestampedDependencyVersionInterpolationTest.java | 2 -- .../org/apache/maven/it/MavenITmng2562Timestamp322Test.java | 2 -- .../apache/maven/it/MavenITmng2576MakeLikeReactorTest.java | 2 -- .../maven/it/MavenITmng2577SettingsXmlInterpolationTest.java | 2 -- .../it/MavenITmng2591MergeInheritedPluginConfigTest.java | 2 -- .../maven/it/MavenITmng2605BogusProfileActivationTest.java | 2 -- .../it/MavenITmng2668UsePluginDependenciesForSortingTest.java | 2 -- .../apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java | 3 --- .../apache/maven/it/MavenITmng2693SitePluginRealmTest.java | 2 -- .../maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java | 2 -- .../maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java | 2 -- .../it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java | 2 -- .../it/MavenITmng2739RequiredRepositoryElementsTest.java | 3 --- ...avenITmng2741PluginMetadataResolutionErrorMessageTest.java | 3 --- .../maven/it/MavenITmng2744checksumVerificationTest.java | 2 -- .../it/MavenITmng2749ExtensionAvailableToPluginTest.java | 2 -- .../it/MavenITmng2771PomExtensionComponentOverrideTest.java | 2 -- .../maven/it/MavenITmng2790LastUpdatedMetadataTest.java | 2 -- .../org/apache/maven/it/MavenITmng2820PomCommentsTest.java | 2 -- ...nITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java | 2 -- .../it/MavenITmng2843PluginConfigPropertiesInjectionTest.java | 2 -- ...enITmng2848ProfileActivationByEnvironmentVariableTest.java | 2 -- .../maven/it/MavenITmng2861RelocationsAndRangesTest.java | 2 -- .../org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java | 2 -- .../it/MavenITmng2871PrePackageSubartifactResolutionTest.java | 2 -- .../maven/it/MavenITmng2892HideCorePlexusUtilsTest.java | 2 -- .../maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java | 2 -- .../apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java | 2 -- .../maven/it/MavenITmng2972OverridePluginDependencyTest.java | 2 -- .../maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java | 2 -- ...MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java | 3 --- .../apache/maven/it/MavenITmng3012CoreClassImportTest.java | 2 -- .../it/MavenITmng3023ReactorDependencyResolutionTest.java | 3 --- .../maven/it/MavenITmng3038TransitiveDepManVersionTest.java | 3 --- .../it/MavenITmng3043BestEffortReactorResolutionTest.java | 2 -- .../apache/maven/it/MavenITmng3052DepRepoAggregationTest.java | 2 -- .../MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java | 2 -- .../maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java | 2 -- .../apache/maven/it/MavenITmng3118TestClassPathOrderTest.java | 2 -- .../it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java | 2 -- ...enITmng3133UrlNormalizationNotBeforeInterpolationTest.java | 2 -- .../MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java | 2 -- .../org/apache/maven/it/MavenITmng3183LoggingToFileTest.java | 2 -- .../maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java | 2 -- .../it/MavenITmng3208ProfileAwareReactorSortingTest.java | 2 -- .../maven/it/MavenITmng3217InterPluginDependencyTest.java | 2 -- .../org/apache/maven/it/MavenITmng3220ImportScopeTest.java | 3 --- .../it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java | 2 -- .../it/MavenITmng3268MultipleHyphenPCommandLineTest.java | 2 -- .../apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java | 2 -- .../org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java | 3 --- .../it/MavenITmng3297DependenciesNotLeakedToMojoTest.java | 2 -- .../apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java | 2 -- .../maven/it/MavenITmng3331ModulePathNormalizationTest.java | 2 -- .../it/MavenITmng3355TranslatedPathInterpolationTest.java | 2 -- .../maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java | 2 -- .../maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java | 2 -- .../maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java | 2 -- .../maven/it/MavenITmng3394POMPluginVersionDominanceTest.java | 2 -- ...g3396DependencyManagementForOverConstrainedRangesTest.java | 2 -- .../apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java | 2 -- .../maven/it/MavenITmng3415JunkRepositoryMetadataTest.java | 2 -- .../maven/it/MavenITmng3422ActiveComponentCollectionTest.java | 2 -- ...nITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java | 2 -- .../org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java | 2 -- ...Tmng3470StrictChecksumVerificationOfDependencyPomTest.java | 3 --- .../org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java | 2 -- .../MavenITmng3477DependencyResolutionErrorMessageTest.java | 3 --- .../it/MavenITmng3482DependencyPomInterpolationTest.java | 2 -- .../maven/it/MavenITmng3485OverrideWagonExtensionTest.java | 2 -- .../apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java | 2 -- .../org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java | 2 -- .../it/MavenITmng3506ArtifactHandlersFromPluginsTest.java | 3 --- .../org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java | 2 -- .../maven/it/MavenITmng3535SelfReferentialPropertiesTest.java | 2 -- .../maven/it/MavenITmng3536AppendedAbsolutePathsTest.java | 2 -- .../maven/it/MavenITmng3545ProfileDeactivationTest.java | 2 -- ...venITmng3575HexadecimalOctalPluginParameterConfigTest.java | 2 -- .../maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java | 2 -- .../it/MavenITmng3586SystemScopePluginDependencyTest.java | 3 --- .../maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java | 2 -- .../maven/it/MavenITmng3600DeploymentModeDefaultsTest.java | 2 -- .../maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java | 2 -- .../apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java | 2 -- .../maven/it/MavenITmng3641ProfileActivationWarningTest.java | 2 -- .../apache/maven/it/MavenITmng3642DynamicResourcesTest.java | 2 -- .../org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java | 3 --- .../apache/maven/it/MavenITmng3652UserAgentHeaderTest.java | 2 -- .../it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java | 2 -- .../it/MavenITmng3671PluginLevelDepInterpolationTest.java | 2 -- .../maven/it/MavenITmng3679PluginExecIdInterpolationTest.java | 2 -- .../maven/it/MavenITmng3680InvalidDependencyPOMTest.java | 2 -- .../maven/it/MavenITmng3684BuildPluginParameterTest.java | 2 -- .../maven/it/MavenITmng3693PomFileBasedirChangeTest.java | 2 -- .../maven/it/MavenITmng3694ReactorProjectsDynamismTest.java | 2 -- .../apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java | 2 -- .../MavenITmng3703ExecutionProjectWithRelativePathsTest.java | 2 -- .../maven/it/MavenITmng3710PollutedClonedPluginsTest.java | 2 -- .../maven/it/MavenITmng3714ToolchainsCliOptionTest.java | 2 -- .../apache/maven/it/MavenITmng3716AggregatorForkingTest.java | 2 -- .../maven/it/MavenITmng3719PomExecutionOrderingTest.java | 2 -- .../maven/it/MavenITmng3723ConcreteParentProjectTest.java | 2 -- .../maven/it/MavenITmng3724ExecutionProjectSyncTest.java | 2 -- .../maven/it/MavenITmng3729MultiForkAggregatorsTest.java | 2 -- .../org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java | 2 -- .../it/MavenITmng3740SelfReferentialReactorProjectsTest.java | 2 -- .../maven/it/MavenITmng3746POMPropertyOverrideTest.java | 2 -- .../maven/it/MavenITmng3747PrefixedPathExpressionTest.java | 2 -- .../org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java | 3 --- .../maven/it/MavenITmng3766ToolchainsFromExtensionTest.java | 2 -- .../it/MavenITmng3769ExclusionRelocatedTransdepsTest.java | 2 -- .../it/MavenITmng3775ConflictResolutionBacktrackingTest.java | 2 -- .../maven/it/MavenITmng3796ClassImportInconsistencyTest.java | 2 -- .../it/MavenITmng3805ExtensionClassPathOrderingTest.java | 2 -- .../MavenITmng3807PluginConfigExpressionEvaluationTest.java | 2 -- .../maven/it/MavenITmng3808ReportInheritanceOrderingTest.java | 2 -- .../maven/it/MavenITmng3810BadProfileActivationTest.java | 2 -- ...nITmng3811ReportingPluginConfigurationInheritanceTest.java | 2 -- .../maven/it/MavenITmng3813PluginClassPathOrderingTest.java | 2 -- .../apache/maven/it/MavenITmng3814BogusProjectCycleTest.java | 2 -- .../apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java | 2 -- .../it/MavenITmng3822BasedirAlignedInterpolationTest.java | 2 -- .../org/apache/maven/it/MavenITmng3827PluginConfigTest.java | 2 -- .../apache/maven/it/MavenITmng3831PomInterpolationTest.java | 2 -- .../it/MavenITmng3833PomInterpolationDataFlowChainTest.java | 2 -- .../maven/it/MavenITmng3836PluginConfigInheritanceTest.java | 2 -- .../apache/maven/it/MavenITmng3838EqualPluginDepsTest.java | 2 -- .../maven/it/MavenITmng3839PomParsingCoalesceTextTest.java | 2 -- .../org/apache/maven/it/MavenITmng3843PomInheritanceTest.java | 2 -- .../maven/it/MavenITmng3845LimitedPomInheritanceTest.java | 2 -- .../it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java | 2 -- .../MavenITmng3852PluginConfigWithHeterogeneousListTest.java | 2 -- .../maven/it/MavenITmng3853ProfileInjectedDistReposTest.java | 2 -- .../apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java | 3 --- .../maven/it/MavenITmng3864PerExecPluginConfigTest.java | 2 -- .../maven/it/MavenITmng3866PluginConfigInheritanceTest.java | 2 -- .../it/MavenITmng3872ProfileActivationInRelocatedPomTest.java | 2 -- .../maven/it/MavenITmng3873MultipleExecutionGoalsTest.java | 2 -- .../maven/it/MavenITmng3877BasedirAlignedModelTest.java | 2 -- .../maven/it/MavenITmng3886ExecutionGoalsOrderTest.java | 2 -- .../maven/it/MavenITmng3887PluginExecutionOrderTest.java | 2 -- .../it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java | 2 -- .../apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java | 2 -- .../maven/it/MavenITmng3899ExtensionInheritanceTest.java | 2 -- .../it/MavenITmng3900ProfilePropertiesInterpolationTest.java | 2 -- .../it/MavenITmng3904NestedBuildDirInterpolationTest.java | 2 -- .../it/MavenITmng3906MergedPluginClassPathOrderingTest.java | 2 -- .../it/MavenITmng3916PluginExecutionInheritanceTest.java | 2 -- .../maven/it/MavenITmng3924XmlMarkupInterpolationTest.java | 2 -- .../it/MavenITmng3925MergedPluginExecutionOrderTest.java | 2 -- .../it/MavenITmng3927PluginDefaultExecutionConfigTest.java | 2 -- .../it/MavenITmng3937MergedPluginExecutionGoalsTest.java | 2 -- .../maven/it/MavenITmng3938MergePluginExecutionsTest.java | 2 -- .../maven/it/MavenITmng3940EnvVarInterpolationTest.java | 2 -- ...nITmng3941ExecutionProjectRestrictedToForkingMojoTest.java | 2 -- .../it/MavenITmng3943PluginExecutionInheritanceTest.java | 2 -- .../maven/it/MavenITmng3944BasedirInterpolationTest.java | 2 -- .../it/MavenITmng3947PluginDefaultExecutionConfigTest.java | 2 -- .../MavenITmng3948ParentResolutionFromProfileReposTest.java | 2 -- .../org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java | 2 -- .../maven/it/MavenITmng3953AuthenticatedDeploymentTest.java | 2 -- .../apache/maven/it/MavenITmng3955EffectiveSettingsTest.java | 2 -- .../it/MavenITmng3970DepResolutionFromProfileReposTest.java | 2 -- .../org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java | 2 -- .../org/apache/maven/it/MavenITmng3979ElementJoinTest.java | 2 -- .../MavenITmng3983PluginResolutionFromProfileReposTest.java | 2 -- .../maven/it/MavenITmng3991ValidDependencyScopeTest.java | 2 -- .../maven/it/MavenITmng3998PluginExecutionConfigTest.java | 2 -- .../maven/it/MavenITmng4000MultiPluginExecutionsTest.java | 2 -- .../maven/it/MavenITmng4005UniqueDependencyKeyTest.java | 3 --- .../maven/it/MavenITmng4007PlatformFileSeparatorTest.java | 2 -- .../apache/maven/it/MavenITmng4008MergedFilterOrderTest.java | 2 -- .../maven/it/MavenITmng4009InheritProfileEffectsTest.java | 2 -- .../it/MavenITmng4016PrefixedPropertyInterpolationTest.java | 2 -- .../it/MavenITmng4022IdempotentPluginConfigMergingTest.java | 2 -- .../it/MavenITmng4023ParentProfileOneTimeInjectionTest.java | 2 -- .../maven/it/MavenITmng4026ReactorDependenciesOrderTest.java | 2 -- .../maven/it/MavenITmng4034ManagedProfileDependencyTest.java | 2 -- .../MavenITmng4036ParentResolutionFromSettingsRepoTest.java | 2 -- .../maven/it/MavenITmng4040ProfileInjectedModulesTest.java | 2 -- .../it/MavenITmng4048VersionRangeReactorResolutionTest.java | 2 -- .../maven/it/MavenITmng4052ReactorAwareImportScopeTest.java | 2 -- .../maven/it/MavenITmng4053PluginConfigAttributesTest.java | 2 -- ...nITmng4056ClassifierBasedDepResolutionFromReactorTest.java | 2 -- .../maven/it/MavenITmng4068AuthenticatedMirrorTest.java | 2 -- .../apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java | 2 -- .../maven/it/MavenITmng4072InactiveProfileReposTest.java | 2 -- .../maven/it/MavenITmng4087PercentEncodedFileUrlTest.java | 2 -- .../maven/it/MavenITmng4091BadPluginDescriptorTest.java | 3 --- .../it/MavenITmng4102InheritedPropertyInterpolationTest.java | 2 -- .../MavenITmng4106InterpolationUsesDominantProfileTest.java | 2 -- ...enITmng4107InterpolationUsesDominantProfileSourceTest.java | 2 -- .../maven/it/MavenITmng4112MavenVersionPropertyTest.java | 2 -- .../org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java | 2 -- .../it/MavenITmng4129PluginExecutionInheritanceTest.java | 2 -- .../org/apache/maven/it/MavenITmng4150VersionRangeTest.java | 2 -- .../apache/maven/it/MavenITmng4162ReportingMigrationTest.java | 2 -- .../apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java | 2 -- .../apache/maven/it/MavenITmng4172EmptyDependencySetTest.java | 2 -- .../maven/it/MavenITmng4180PerDependencyExclusionsTest.java | 2 -- .../maven/it/MavenITmng4189UniqueVersionSnapshotTest.java | 2 -- .../apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java | 2 -- .../org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java | 3 --- .../maven/it/MavenITmng4196ExclusionOnPluginDepTest.java | 2 -- .../maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java | 2 -- .../it/MavenITmng4203TransitiveDependencyExclusionTest.java | 2 -- .../apache/maven/it/MavenITmng4207PluginWithLog4JTest.java | 2 -- ...nITmng4208InterpolationPrefersCliOverProjectPropsTest.java | 2 -- .../maven/it/MavenITmng4214MirroredParentSearchReposTest.java | 2 -- .../maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java | 2 -- ...ng4233ReactorResolutionForManuallyCreatedArtifactTest.java | 2 -- .../it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java | 2 -- .../it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java | 3 --- .../it/MavenITmng4262MakeLikeReactorDottedPath370Test.java | 2 -- .../maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java | 2 -- .../it/MavenITmng4269BadReactorResolutionFromOutDirTest.java | 2 -- .../it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java | 3 --- .../MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java | 2 -- .../maven/it/MavenITmng4274PluginRealmArtifactsTest.java | 2 -- .../apache/maven/it/MavenITmng4275RelocationWarningTest.java | 2 -- .../it/MavenITmng4276WrongTransitivePlexusUtilsTest.java | 2 -- .../maven/it/MavenITmng4281PreferLocalSnapshotTest.java | 2 -- .../apache/maven/it/MavenITmng4283ParentPomPackagingTest.java | 3 --- .../maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java | 3 --- .../maven/it/MavenITmng4292EnumTypeMojoParametersTest.java | 2 -- .../it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java | 2 -- .../it/MavenITmng4304ProjectDependencyArtifactsTest.java | 2 -- .../apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java | 2 -- ...MavenITmng4309StrictChecksumValidationForMetadataTest.java | 3 --- ...ng4312TypeAwarePluginParameterExpressionInjectionTest.java | 2 -- .../it/MavenITmng4314DirectInvocationOfAggregatorTest.java | 2 -- ...venITmng4317PluginVersionResolutionFromMultiReposTest.java | 2 -- .../maven/it/MavenITmng4318ProjectExecutionRootTest.java | 2 -- .../MavenITmng4319PluginExecutionGoalInterpolationTest.java | 2 -- .../maven/it/MavenITmng4320AggregatorAndDependenciesTest.java | 2 -- .../maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java | 2 -- .../MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java | 2 -- ...venITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java | 2 -- ...MavenITmng4328PrimitiveMojoParameterConfigurationTest.java | 2 -- .../maven/it/MavenITmng4331DependencyCollectionTest.java | 2 -- .../it/MavenITmng4332DefaultPluginExecutionOrderTest.java | 2 -- .../maven/it/MavenITmng4335SettingsOfflineModeTest.java | 3 --- .../org/apache/maven/it/MavenITmng4338OptionalMojosTest.java | 2 -- .../maven/it/MavenITmng4341PluginExecutionOrderTest.java | 2 -- ...venITmng4342IndependentMojoParameterDefaultValuesTest.java | 2 -- .../it/MavenITmng4343MissingReleaseUpdatePolicyTest.java | 3 --- .../it/MavenITmng4344ManagedPluginExecutionOrderTest.java | 2 -- .../it/MavenITmng4345DefaultPluginExecutionOrderTest.java | 2 -- .../it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java | 2 -- .../it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java | 2 -- .../it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java | 2 -- .../it/MavenITmng4350LifecycleMappingExecutionOrderTest.java | 2 -- ...venITmng4353PluginDependencyResolutionFromPomRepoTest.java | 2 -- ...MavenITmng4355ExtensionAutomaticVersionResolutionTest.java | 2 -- ...enITmng4356NoNeedlessRelookupFromActiveCollectionTest.java | 2 -- .../MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java | 2 -- ...enITmng4359LocallyReachableParentOutsideOfReactorTest.java | 2 -- .../org/apache/maven/it/MavenITmng4360WebDavSupportTest.java | 2 -- .../it/MavenITmng4361ForceDependencySnapshotUpdateTest.java | 2 -- ...MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java | 2 -- .../maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java | 2 -- .../it/MavenITmng4367LayoutAwareMirrorSelectionTest.java | 2 -- .../it/MavenITmng4368TimestampAwareArtifactInstallerTest.java | 2 -- ...mng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java | 3 --- .../it/MavenITmng4381ExtensionSingletonComponentTest.java | 2 -- .../maven/it/MavenITmng4383ValidDependencyVersionTest.java | 3 --- ...enITmng4385LifecycleMappingFromExtensionInReactorTest.java | 3 --- .../org/apache/maven/it/MavenITmng4386DebugLoggingTest.java | 2 -- .../org/apache/maven/it/MavenITmng4387QuietLoggingTest.java | 2 -- .../it/MavenITmng4393ParseExternalParenPomLenientTest.java | 2 -- .../maven/it/MavenITmng4396AntBased20xMojoSupportTest.java | 2 -- .../apache/maven/it/MavenITmng4400RepositoryOrderTest.java | 2 -- .../it/MavenITmng4401RepositoryOrderForParentPomTest.java | 2 -- .../maven/it/MavenITmng4402DuplicateChildModuleTest.java | 3 --- .../it/MavenITmng4403LenientDependencyPomParsingTest.java | 2 -- .../apache/maven/it/MavenITmng4404UniqueProfileIdTest.java | 3 --- .../apache/maven/it/MavenITmng4405ValidPluginVersionTest.java | 3 --- .../maven/it/MavenITmng4408NonExistentSettingsFileTest.java | 3 --- .../java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java | 2 -- .../org/apache/maven/it/MavenITmng4411VersionInfoTest.java | 2 -- .../maven/it/MavenITmng4412OfflineModeInPluginTest.java | 3 --- .../maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java | 2 -- .../maven/it/MavenITmng4415InheritedPluginOrderTest.java | 2 -- .../MavenITmng4416PluginOrderAfterProfileInjectionTest.java | 2 -- ...venITmng4421DeprecatedPomInterpolationExpressionsTest.java | 2 -- .../MavenITmng4422PluginExecutionPhaseInterpolationTest.java | 2 -- ...ITmng4423SessionDataFromPluginParameterExpressionTest.java | 2 -- .../apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java | 2 -- .../it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java | 2 -- .../it/MavenITmng4430DistributionManagementStatusTest.java | 3 --- .../maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java | 2 -- .../maven/it/MavenITmng4436SingletonComponentLookupTest.java | 2 -- .../MavenITmng4450StubModelForMissingDependencyPomTest.java | 2 -- .../MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java | 2 -- .../MavenITmng4453PluginVersionFromLifecycleMappingTest.java | 2 -- .../it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java | 2 -- .../maven/it/MavenITmng4461ArtifactUploadMonitorTest.java | 2 -- ...MavenITmng4463DependencyManagementImportVersionRanges.java | 3 --- .../MavenITmng4464PlatformIndependentFileSeparatorTest.java | 2 -- ...avenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java | 2 -- ...MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java | 2 -- .../it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java | 2 -- .../it/MavenITmng4474PerLookupWagonInstantiationTest.java | 2 -- .../maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java | 2 -- .../it/MavenITmng4488ValidateExternalParenPomLenientTest.java | 2 -- .../maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java | 2 -- .../maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java | 2 -- .../it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java | 2 -- .../MavenITmng4522FailUponMissingDependencyParentPomTest.java | 3 --- .../it/MavenITmng4526MavenProjectArtifactsScopeTest.java | 2 -- ...MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java | 2 -- .../it/MavenITmng4536RequiresNoProjectForkingMojoTest.java | 2 -- ...MavenITmng4544ActiveComponentCollectionThreadSafeTest.java | 2 -- .../MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java | 2 -- .../maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java | 2 -- .../it/MavenITmng4555MetaversionResolutionOfflineTest.java | 3 --- .../maven/it/MavenITmng4561MirroringOfPluginRepoTest.java | 2 -- .../it/MavenITmng4565MultiConditionProfileActivationTest.java | 2 -- .../MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java | 2 -- ...4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java | 2 -- ...86PluginPrefixResolutionFromVersionlessPluginMgmtTest.java | 2 -- ...enITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java | 3 --- .../MavenITmng4600DependencyOptionalFlagManagementTest.java | 2 -- .../it/MavenITmng4615ValidateRequiredPluginParameterTest.java | 3 --- .../it/MavenITmng4618AggregatorBuiltAfterModulesTest.java | 2 -- ...venITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java | 2 -- ...ITmng4629NoPomValidationErrorUponMissingSystemDepTest.java | 2 -- .../it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java | 2 -- ...avenITmng4644StrictPomParsingRejectsMisplacedTextTest.java | 3 --- .../it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java | 2 -- .../apache/maven/it/MavenITmng4666CoreRealmImportTest.java | 2 -- .../it/MavenITmng4677DisabledPluginConfigInheritanceTest.java | 2 -- .../maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java | 2 -- .../it/MavenITmng4684DistMgmtOverriddenByProfileTest.java | 2 -- .../MavenITmng4690InterdependentConflictResolutionTest.java | 2 -- .../it/MavenITmng4696MavenProjectDependencyArtifactsTest.java | 2 -- .../MavenITmng4720DependencyManagementExclusionMergeTest.java | 2 -- .../maven/it/MavenITmng4721OptionalPluginDependencyTest.java | 2 -- ...MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java | 2 -- .../maven/it/MavenITmng4745PluginVersionUpdateTest.java | 2 -- .../maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java | 2 -- ...nITmng4750ResolvedMavenProjectDependencyArtifactsTest.java | 2 -- .../MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java | 2 -- .../it/MavenITmng4761PluginLevelDependencyScopesTest.java | 2 -- .../maven/it/MavenITmng4765LocalPomProjectBuilderTest.java | 2 -- .../it/MavenITmng4768NearestMatchConflictResolutionTest.java | 2 -- ...4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java | 3 --- ...772PluginVersionResolutionDoesntTouchDisabledRepoTest.java | 3 --- ...avenITmng4776ForkedReactorPluginVersionResolutionTest.java | 2 -- ...Tmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java | 2 -- .../it/MavenITmng4781DeploymentToNexusStagingRepoTest.java | 2 -- .../MavenITmng4785TransitiveResolutionInForkedThreadTest.java | 2 -- .../maven/it/MavenITmng4786AntBased21xMojoSupportTest.java | 2 -- .../it/MavenITmng4788InstallationToCustomLocalRepoTest.java | 2 -- .../it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java | 2 -- ...nITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java | 2 -- ...795DepResolutionInReactorProjectForkedByLifecycleTest.java | 2 -- .../it/MavenITmng4800NearestWinsVsScopeWideningTest.java | 2 -- .../it/MavenITmng4811CustomComponentConfiguratorTest.java | 2 -- ...nITmng4814ReResolutionOfDependenciesDuringReactorTest.java | 2 -- .../maven/it/MavenITmng4829ChecksumFailureWarningTest.java | 2 -- ...avenITmng4834ParentProjectResolvedFromRemoteReposTest.java | 2 -- .../apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java | 2 -- .../it/MavenITmng4842ParentResolutionOfDependencyPomTest.java | 2 -- ...nITmng4872ReactorResolutionAttachedWithExclusionsTest.java | 2 -- .../maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java | 2 -- .../maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java | 2 -- ...avenITmng4883FailUponOverconstrainedVersionRangesTest.java | 2 -- .../MavenITmng4890MakeLikeReactorConsidersVersionsTest.java | 2 -- .../maven/it/MavenITmng4891RobustSnapshotResolutionTest.java | 2 -- .../MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java | 2 -- ...MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java | 2 -- .../MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java | 2 -- .../MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java | 2 -- .../java/org/apache/maven/it/MavenITmng4936EventSpyTest.java | 2 -- .../maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java | 2 -- .../it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java | 2 -- .../maven/it/MavenITmng4960MakeLikeReactorResumeTest.java | 2 -- .../it/MavenITmng4963ParentResolutionFromMirrorTest.java | 2 -- .../maven/it/MavenITmng4966AbnormalUrlPreservationTest.java | 2 -- .../MavenITmng4973ExtensionVisibleToPluginInReactorTest.java | 2 -- ...MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java | 2 -- .../it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java | 2 -- .../org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java | 2 -- .../it/MavenITmng4992MapStylePropertiesParamConfigTest.java | 2 -- .../it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java | 2 -- ...enITmng5006VersionRangeDependencyParentResolutionTest.java | 2 -- .../apache/maven/it/MavenITmng5009AggregationCycleTest.java | 2 -- ...mng5011ConfigureCollectionArrayFromUserPropertiesTest.java | 2 -- .../it/MavenITmng5012CollectionVsArrayParamCoercionTest.java | 2 -- .../MavenITmng5013ConfigureParamBeanFromScalarValueTest.java | 2 -- ...Tmng5019StringBasedCompLookupFromChildPluginRealmTest.java | 2 -- .../maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java | 2 -- ...mng5096ExclusionAtDependencyWithImpliedClassifierTest.java | 2 -- ...enITmng5135AggregatorDepResolutionModuleExtensionTest.java | 2 -- .../it/MavenITmng5137ReactorResolutionInForkedBuildTest.java | 2 -- .../java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java | 2 -- .../maven/it/MavenITmng5206PlexusLifecycleHonoured.java | 2 -- .../apache/maven/it/MavenITmng5208EventSpyParallelTest.java | 2 -- .../org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java | 2 -- .../org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java | 2 -- .../org/apache/maven/it/MavenITmng5224InjectedSettings.java | 2 -- .../maven/it/MavenITmng5230MakeReactorWithExcludesTest.java | 2 -- .../MavenITmng5280SettingsProfilesRepositoriesOrderTest.java | 2 -- .../apache/maven/it/MavenITmng5338FileOptionToDirectory.java | 2 -- .../java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java | 2 -- .../maven/it/MavenITmng5387ArtifactReplacementPlugin.java | 2 -- .../it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java | 2 -- .../it/MavenITmng5418FileProjectPropertiesActivatorTest.java | 2 -- ...MavenITmng5445LegacyStringSearchModelInterpolatorTest.java | 2 -- .../maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java | 2 -- .../org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java | 3 --- .../org/apache/maven/it/MavenITmng5503ZipInReactorTest.java | 2 -- .../apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java | 2 -- .../maven/it/MavenITmng5557ProperlyRestrictedReactor.java | 3 --- .../MavenITmng5561PluginRelocationLosesConfigurationTest.java | 2 -- .../maven/it/MavenITmng5572ReactorPluginExtensionsTest.java | 2 -- .../org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java | 2 -- .../org/apache/maven/it/MavenITmng5578SessionScopeTest.java | 2 -- .../maven/it/MavenITmng5581LifecycleMappingDelegate.java | 3 --- .../org/apache/maven/it/MavenITmng5591WorkspaceReader.java | 2 -- .../maven/it/MavenITmng5608ProfileActivationWarningTest.java | 2 -- .../maven/it/MavenITmng5639ImportScopePomResolutionTest.java | 2 -- .../it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java | 3 --- .../it/MavenITmng5663NestedImportScopePomResolutionTest.java | 2 -- .../java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java | 2 -- .../org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java | 2 -- .../maven/it/MavenITmng5742BuildExtensionClassloaderTest.java | 2 -- .../it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java | 2 -- .../org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java | 2 -- .../org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java | 2 -- .../maven/it/MavenITmng5774ConfigurationProcessorsTest.java | 3 --- .../maven/it/MavenITmng5783PluginDependencyFiltering.java | 2 -- .../maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java | 2 -- .../apache/maven/it/MavenITmng5840ParentVersionRanges.java | 2 -- .../maven/it/MavenITmng5840RelativePathReactorMatching.java | 2 -- .../maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java | 2 -- .../java/org/apache/maven/it/MavenITmng5889FindBasedir.java | 2 -- .../it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java | 2 -- ...ITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java | 2 -- ...mng5935OptionalLostInTranstiveManagedDependenciesTest.java | 2 -- .../maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java | 3 --- .../it/MavenITmng5965ParallelBuildMultipliesWorkTest.java | 3 --- .../apache/maven/it/MavenITmng6057CheckReactorOrderTest.java | 2 -- .../maven/it/MavenITmng6071GetResourceWithCustomPom.java | 2 -- .../org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java | 2 -- .../org/apache/maven/it/MavenITmng6090CIFriendlyTest.java | 2 -- .../apache/maven/it/MavenITmng6118SubmoduleInvocation.java | 2 -- ...ITmng6127PluginExecutionConfigurationInterferenceTest.java | 2 -- .../maven/it/MavenITmng6173GetAllProjectsInReactorTest.java | 2 -- .../it/MavenITmng6173GetProjectsAndDependencyGraphTest.java | 2 -- .../maven/it/MavenITmng6189SiteReportPluginsWarningTest.java | 2 -- .../it/MavenITmng6210CoreExtensionsCustomScopesTest.java | 2 -- .../java/org/apache/maven/it/MavenITmng6223FindBasedir.java | 2 -- .../maven/it/MavenITmng6240PluginExtensionAetherProvider.java | 2 -- .../org/apache/maven/it/MavenITmng6255FixConcatLines.java | 2 -- .../it/MavenITmng6256SpecialCharsAlternatePOMLocation.java | 2 -- .../maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java | 3 --- .../java/org/apache/maven/it/MavenITmng6330RelativePath.java | 3 --- .../apache/maven/it/MavenITmng6386BaseUriPropertyTest.java | 2 -- .../org/apache/maven/it/MavenITmng6391PrintVersionTest.java | 2 -- .../apache/maven/it/MavenITmng6506PackageAnnotationTest.java | 2 -- .../maven/it/MavenITmng6511OptionalProjectSelectionTest.java | 3 --- .../maven/it/MavenITmng6558ToolchainsBuildingEventTest.java | 2 -- ...ITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java | 3 --- .../it/MavenITmng6609ProfileActivationForPackagingTest.java | 2 -- .../java/org/apache/maven/it/MavenITmng6720FailFastTest.java | 3 --- .../maven/it/MavenITmng6754TimestampInMultimoduleProject.java | 2 -- .../MavenITmng6759TransitiveDependencyRepositoriesTest.java | 2 -- .../maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java | 2 -- .../MavenITmng6981ProjectListShouldIncludeChildrenTest.java | 3 --- .../java/org/apache/maven/it/MavenITmng7038RootdirTest.java | 3 --- .../it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java | 3 --- .../apache/maven/it/MavenITmng7110ExtensionClassloader.java | 3 --- .../maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java | 3 --- .../maven/it/MavenITmng7128BlockExternalHttpReactorTest.java | 3 --- .../apache/maven/it/MavenITmng7160ExtensionClassloader.java | 3 --- .../org/apache/maven/it/MavenITmng7228LeakyModelTest.java | 2 -- .../maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java | 3 --- ...MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java | 3 --- .../maven/it/MavenITmng7335MissingJarInParallelBuild.java | 3 --- .../apache/maven/it/MavenITmng7349RelocationWarningTest.java | 2 -- .../apache/maven/it/MavenITmng7353CliGoalInvocationTest.java | 2 -- .../it/MavenITmng7404IgnorePrefixlessExpressionsTest.java | 3 --- .../it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java | 2 -- .../it/MavenITmng7468UnsupportedPluginsParametersTest.java | 2 -- .../apache/maven/it/MavenITmng7470ResolverTransportTest.java | 2 -- .../org/apache/maven/it/MavenITmng7474SessionScopeTest.java | 2 -- .../java/org/apache/maven/it/MavenITmng7487DeadlockTest.java | 3 --- .../it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java | 3 --- .../it/MavenITmng7529VersionRangeRepositorySelection.java | 2 -- .../apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java | 2 -- .../test/java/org/apache/maven/it/MavenITmng7587Jsr330.java | 2 -- .../maven/it/MavenITmng7606DependencyImportScopeTest.java | 2 -- .../apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java | 2 -- .../org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java | 2 -- .../java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java | 2 -- .../apache/maven/it/MavenITmng7737ProfileActivationTest.java | 2 -- .../maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java | 2 -- .../maven/it/MavenITmng7939PluginsValidationExcludesTest.java | 2 -- .../maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java | 2 -- .../src/test/java/org/apache/maven/it/TestSuiteOrdering.java | 1 - .../src/main/java/org/apache/maven/it/Verifier.java | 4 ++-- 643 files changed, 2 insertions(+), 1363 deletions(-) diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java index 149180bf1..234a76c2f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0008SimplePluginTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java index d5a37c84a..a417f19f2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIf; import org.junit.jupiter.api.condition.JRE; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java index 9830de61a..46a6fa5c0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0010DependencyClosureResolutionTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java index b2c58b9c5..3c2e1d430 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0011DefaultVersionByDependencyManagementTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java index 10b25c8b4..0bb77eced 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0012PomInterpolationTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java index 7feecbafd..54ee7f09d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0018DependencyManagementTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java index a545f3c90..32ec98e56 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0019PluginVersionMgmtBySuperPomTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0019PluginVersionMgmtBySuperPomTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java index fc29ae5ac..a594dfce7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0021PomProfileTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java index 4c6651537..03535bb8e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0023SettingsProfileTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java index bb887a740..2f4568489 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java index 6ba8ce8c3..e15777a45 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java index 3db453dbb..1b0c8f387 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0030DepPomDepMgmtInheritanceTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java index 161fcb555..b7b1a242b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0032MavenPrerequisiteTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java index 1285d00de..2003913ad 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java index 131d26921..dc6ad5d6f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java index 0c0496547..c2ecd3c0d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java index a9ef5fb5b..59e1437e7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java index 8841c11a2..daf176506 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0056MultipleGoalExecutionsTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java index 670b870f8..8af37876b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0063SystemScopeDependencyTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java index 7a331a738..a8e52d94c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0064MojoConfigViaSettersTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java index e3c7d9fb1..1c4525c11 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java index f33738ac3..f0bfe4988 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java index 881dc45ef..c3548b283 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.Collection; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0085TransitiveSystemScopeTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java index 785d0e389..dcaee8418 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java index f98bc2b74..3ad1b8b40 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java index 46ac82e23..1407d4071 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0090EnvVarInterpolationTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java index 4b5cba698..4a946e9a9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java @@ -26,9 +26,6 @@ import java.util.Locale; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java index fd4cf1850..a032539b0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java index e5808f058..fc59a1c4b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java index 1816ed066..abf7dcefe 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java index 4a62b394f..6b9f429b2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java index 6768acb20..edb94e2c5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java index fee7c8ad4..ce2d5aef1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java index 51fa4d002..df7459c7b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java index 6633fe946..adad8ae2a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java index cf42ad2dd..5e5462c7d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java index 622ea2c53..e3f9bddd3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java index 2f0da7d27..d93b26f31 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java index dda9c6ed0..a03042637 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java index 8cb7f8f2d..89284a109 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java index f6a5d35d2..758a39aec 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java index a29d3830c..9b944ad8b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java index 290b0b827..46b225f21 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0146InstallerSnapshotNaming.java @@ -23,8 +23,6 @@ import java.net.InetAddress; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java index 21d60af04..ec6ceb7de 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0199CyclicImportScopeTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0199CyclicImportScopeTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java index 8fff54b3e..b35ba01ff 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java index 80aff08a6..20494709b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java index bac9416c5..dc617d326 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh10937QuotedPipesInMavenOptsTest.java @@ -22,8 +22,6 @@ import java.util.Properties; import org.apache.maven.shared.utils.StringUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11969ColorAlwaysTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11969ColorAlwaysTest.java index 12d2d8beb..0af7f136c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11969ColorAlwaysTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11969ColorAlwaysTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12288SettingsProfileAetherPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12288SettingsProfileAetherPropertiesTest.java index ef0ae4540..d820faa02 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12288SettingsProfileAetherPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12288SettingsProfileAetherPropertiesTest.java @@ -24,8 +24,6 @@ import java.nio.file.Path; import java.util.Comparator; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12668ExtensionDebugLevel.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12668ExtensionDebugLevel.java index bcdee7de8..7c8a788f1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12668ExtensionDebugLevel.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12668ExtensionDebugLevel.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java index 035749e96..3c882cf54 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java index 132423d73..9e15ae905 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0187CollectedProjectsTest.java @@ -25,8 +25,6 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java index 8808e1a73..0e4ef605d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java index ee0a24fd1..a290ab79c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java index fb43a0a51..2573dcd5c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java index 13d9829b1..d2f78ee45 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java index a25e9467e..9caf7a7f0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java index 22473a38f..6c4a5b0a9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java index 44e2d5d2e..c6c73b88a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java index c79a5e4b1..64dda56f8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java index 01714b7f5..d2e3cc7e3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java index 79d709ae1..510dd04c9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java index 0c2012a95..21c58e9b8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Collection; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java index a6ee23a1e..da30f734d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java index e69d9641e..0b703f89a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java index ee6f95747..e3a05f437 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java index 8f0559a8d..89a164293 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java index 970fe44b9..c78ec2167 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java index 57126c5af..23489b1b7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java index 51fa11f41..dd0d8cb4b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java index 76681a677..9ccdc48c4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java index aec828368..7a3678a50 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java index 6fc89fb13..dbabe9a5b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java @@ -29,9 +29,6 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java index 8640cc8d3..450300135 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java index 061ea8ec2..d0fc0fbd8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java index e764ed731..7861f0925 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java index 4c302c448..1ea35ffb4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java index 2421da1eb..ebd35ba26 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java @@ -22,8 +22,6 @@ import java.util.Collection; import java.util.Collections; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java index cb342fd31..a52d2bd97 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Collection; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java index a10726604..5d60620ba 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java index e58135478..3d2d33ef3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0828PluginConfigValuesInDebugTest.java @@ -24,8 +24,6 @@ import java.util.Locale; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java index f4dc4c95a..9dcec742d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java index 1a5f1f73d..be4553b9e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848UserPropertyOverridesDefaultValueTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java index 2ad1f7146..c0430f5f6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java index a0bef3c45..87c55999b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java index 18ad20092..eb74d0bde 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java index 423272c8d..dc399f153 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java index e63b03943..d9f8b47df 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java index 1d719dde9..75191566a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java index e99e7c556..e339a2192 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMgmtConfigTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java index b75a45c5e..d3429405a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java index b7473529c..96e870faf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java index c8b82bfc4..c477c5613 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java index 926c754ee..e2a9cfd93 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java index fa7d3d381..88ab14b6a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Collection; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java index ada3ce6a4..66f6e868d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java index 3807b8eeb..6cf2110b1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java index 0a00df13a..7887ff980 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java index 2c8bf589a..fd45cfe48 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java index 3a8b92b79..7fa1f5bc3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java index 3f61e8c70..aa887c095 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java index c8a61b2ca..0d995358c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java index e8a4bc251..56018fe92 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java index dc1842ec1..05a77cba1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1751ForcedMetadataUpdateDuringDeploymentTest.java @@ -22,8 +22,6 @@ import java.util.Properties; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java index ecb3028b0..b07c3e0dc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1803PomValidationErrorIncludesLineNumberTest.java @@ -22,8 +22,6 @@ import java.util.List; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java index 6d5f8b334..ced52de2a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java index a6c96a498..878465d61 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java index 7f3c8d891..0db485180 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java index 233025208..b311fe069 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java index 61f1af87f..c9c4d14f7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java index e249ee294..a8378a412 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java index 3ab31ae3e..9bf86b62e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java index 7d98978e0..552e1848b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java index c79514fcc..eb9ab0842 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java index 7d2c694bc..0fc68f05c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java index a6b9c899a..a08c56f95 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java index 85683fedc..a1e0b16da 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java index 3b4481173..4d65f98d7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java index 0f7d89074..54e333f60 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java index 8e3dfa7ad..ed303a1bc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java index b770fc50d..7ec80cb17 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java index 7bd25be9e..37ab02116 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java index 62062c880..bf00fb1b9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java index 61fa85807..0921cb1c5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java index 974993b94..a5b1848eb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2199ParentVersionRangeTest.java @@ -22,9 +22,6 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng2199ParentVersionRangeTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java index b9e2680c5..3a08b7c17 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java index fddb44e63..5996e46e0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java index 004fad5e7..ceb9451d8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java index 01ce64b8f..e27b372d0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java index 3861b9dd6..cbe454263 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java index 8e9bcabe7..2142ff423 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java index 797d14808..01cec8036 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java index e16f9bd76..9a48d82a7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.NetworkConnector; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java index 45421a6a7..375ce8b1d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java index 198e31eb1..04fe9cee2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java index 7c42d1c63..66641605e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java index 0d1b4a1ac..c9fa0ae0c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2362DeployedPomEncodingTest.java @@ -21,8 +21,6 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java index 5e9baa09c..eb241bd4e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java index 12f5cdeb2..e86f706b0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java @@ -22,8 +22,6 @@ import java.net.InetAddress; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java index 590629fcf..062d8aea0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java index fd182cab7..50befc6a9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java index bbc648ab4..5b7c3a628 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java @@ -23,8 +23,6 @@ import java.util.Date; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java index 9a0dcf862..f37394564 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java index 7bfa21441..628806f3d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java index 26c0fe9bb..7f5e4d7c5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java index 93dc1b6a9..0b92d461e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java index fe1d650a2..beef87243 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java index 64f833139..78860b0ab 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java @@ -23,9 +23,6 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java index ff677eb3c..9d8bbf4d0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java index 1aea8f456..f8c6ac1a8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java index cf1f74eea..a58f7ce5a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java index 578596773..1d941cf38 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java index 13c691f7f..a0d0c8d91 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2739RequiredRepositoryElementsTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java index 8d052d4b6..99eacade5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java index 664a95e41..b5118621b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java index f61f3a4cb..feb931a90 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java index 4406da886..8b7c97c14 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java index 2cc1fa24b..fb952d557 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java @@ -24,8 +24,6 @@ import java.util.TimeZone; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java index f57996c8b..73fca1a9a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2820PomCommentsTest.java @@ -21,8 +21,6 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java index f7261d683..c304e3661 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java index d4f85f824..1cdac810e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java index 4df3f8269..7e122f32a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java index 7f435da55..aa6d4bbb2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java index 087ccc670..0305d3896 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java index d2b243944..b5e258913 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java index 32cffc480..72cea72b9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java index 60c85b40e..2537313e6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Collection; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java index 6c3867fcf..1a7d0d431 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java index 3720c2166..3cd619dff 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java index 0027e9ced..f42545323 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java index 9d3aa0dea..1b1a3fcd9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java index 84994834d..5256b6ed1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java index 684211544..3fa8eabc2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java index 9fb1cf616..b9b4bb8bf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java index c7127120f..3dd477519 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java index d2fadfe47..bd472270b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java index 4f0243045..6d75cd905 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java index d0e131073..24fcff39d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java index 1dae63182..c2ff1fe60 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java index 2393b856b..c21895d22 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java index 339f6e6a5..c327a89be 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java index d7a00f28e..627f32587 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Collections; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java index 81b8150a2..a1dc923f6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java @@ -23,8 +23,6 @@ import java.util.Iterator; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java index e7d5e51fb..7f8796beb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java index 78ea088ef..1809ef245 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java index b2e33ae72..9d2935578 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java index dd9bb5de6..ccf87a700 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java index 47f78e681..6c8db88a7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java index e9fb66541..b42bfe904 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java index 97703639b..0bfb22a04 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java index bb1ff797f..8c5e739d4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java index f89342192..019ad87a7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java index 818989a61..a64fe3a21 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java index 1f796c1ce..4e14fbb07 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java index b88f2faff..9b64a4c81 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java index af4df7eba..27ec1af35 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java index ce3a91f6b..cef901520 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java index c1e91740d..3ad788b58 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java index 742738421..3771ebbb2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java index 9d3e424c7..d4b705ffe 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java index e080224b1..511046deb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java index 9c889bb98..49885378a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java @@ -28,8 +28,6 @@ import java.util.concurrent.ConcurrentLinkedDeque; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java index c511b62fb..45723da43 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java index c0c4d14b8..6703bc12e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java @@ -23,8 +23,6 @@ import java.io.IOException; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java index 6af1ffd1a..9e6567586 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java @@ -25,8 +25,6 @@ import java.io.IOException; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java index 0ba51b976..15808bf67 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictChecksumVerificationOfDependencyPomTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java index 87e6e38f4..70fb3e78e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java @@ -22,8 +22,6 @@ import java.io.IOException; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java index 4c3fa115a..88a275055 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java @@ -23,9 +23,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java index 57aa16990..bc4279057 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java index 8ce82b9c3..315460b9a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java index a132ef5f1..a5009e61c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java index af265f42e..d68910e74 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java @@ -21,8 +21,6 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java index 360761715..c6e6e099f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java index bb2b66ba1..1651ebde1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java index c45082aa9..cd841a53c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java index ee8d3bd68..320a4ebf9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java index 0f17ba919..4284b7b7e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java index b68c3f82a..9f92eb556 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java index 2ccd3ea92..53ef1616b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java index 5e7b44ec6..ce63cad56 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java index 3146f8c7a..526e1581c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java @@ -26,8 +26,6 @@ import org.apache.maven.shared.utils.StringUtils; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java index 84d41cab5..f37edcbe3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java index b2b441d3e..dfbdfc796 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java @@ -22,8 +22,6 @@ import java.net.URI; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java index ba1c0eaa3..dd58c2291 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java index bf73c2804..38579aa64 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java index 570cac62e..6ae7690cb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java index 46ee8bd98..250c8feda 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java index ff2d543f7..a5e181850 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java @@ -25,8 +25,6 @@ import java.io.IOException; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java index 4c6e42d72..6a788f67f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java index 9d382dfac..3ef21a0c0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java index 607a2fd36..81e55b1b8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java index e6ceb9218..da3bc7f45 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java index 92b44383f..3527651ae 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java index 25af94b1c..390ce81fc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java @@ -21,8 +21,6 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java index a0167795d..6e9f93b17 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java index 52f8d8569..78ff8560a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java index dd772f253..a4c4dcd32 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java index 9a3d75ff5..653859f51 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3710PollutedClonedPluginsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java index aac5c23a5..0db6cbb9e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java index 47bd0d4e5..f0fd574bc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java index fc0e20fc3..6c3c7eec4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java @@ -23,8 +23,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java index 8dd96f99f..4ff34ab70 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java index 4e9ac5eb1..0ee1f52d8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java index da084bcd5..e743a2d7a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java index 33b816ff2..e21eedd89 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java @@ -25,8 +25,6 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java index ac546778c..9c3aba942 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java index ef268299d..804fe7107 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java index 7b731ebbd..87245954a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java index 33ac8d11d..8509d1961 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java index 0815d3afd..55e1df1a8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java index 3814a1536..a64f86e49 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java @@ -22,8 +22,6 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java index b64fd20c6..cfd33812d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java index dcbf26b88..eb6802cf7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java index 0a946326f..8818e50e0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java index f7e59fed4..de336fcbb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java index e37b9409f..205006e81 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritanceOrderingTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java index 7d0221d14..d37b83df7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java index e92689e5d..c20bca5f3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java index 4b95d298e..52be05385 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java index 97a764d2f..1f1052105 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java index 41422c05d..eda2310d3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java index 7f31422e1..0abbb7411 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java index 2052d4082..441cf6763 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java index 97f937eee..91d339a87 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java index 0cf4b6d79..da597b2e6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java index 754cc33e5..a7fbcb262 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java index 70c86dfac..a8bd3cbdd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java index ed7447ed3..6a47a7df1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java index 3c0ae038c..8a2c05ba9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java @@ -23,8 +23,6 @@ import java.util.Properties; import java.util.TreeSet; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java index c14754cb5..6378b8a9e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java index 47b830a9b..6d05affe5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java index 05b812adc..d11184335 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java index 3557922e4..a63ceea8d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java index ebc9d4d0f..384e8f32f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java index 91f5cc74a..36e8c13e8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java index 176f2eb78..5d832c0b0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java index e809b9382..41a5b4109 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java index e4b6fe218..878893617 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java index ef4c31973..ebb5f5cc8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java @@ -22,8 +22,6 @@ import java.io.IOException; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java index cbdd11c56..ad92ca4a7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java index 1d3de2cf3..b6bc00ec2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java index 0444409c8..73b11a12a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java index 6b9696e7a..41973a7fb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java @@ -22,8 +22,6 @@ import java.util.Locale; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java index 90a5db8f3..710438650 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java index 8f8db3a6d..5182d0050 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java index 537e00d32..b3aae3b63 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java index fcb2c5fe0..dd1fb2573 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java index 67c3a7260..b302c0297 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java @@ -23,8 +23,6 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java index c0084b8f8..7337fa720 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java index d849da107..e7c89d838 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java index 8ee166b2b..0faec11a8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java index 6622ca3a1..ae3411e45 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java index 8ad5cfbad..cc561e546 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java index 8086a4cc0..1c9b2de95 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java @@ -22,8 +22,6 @@ import java.util.Properties; import org.apache.maven.shared.utils.Os; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java index b4d775095..c0cf43eaf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java index bcaa60073..fb3615b22 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java @@ -23,8 +23,6 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java index 73ab10e9d..a01816898 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java index 41d11ab28..01cfc372f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java index 274201fc9..3b2af88a0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java index fb24d202f..b81f20fc3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java index a7f78f915..15c29f8ae 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java @@ -23,8 +23,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java index eb8425da3..0156ef78d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java index 6076f9a72..f0de09672 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java index bb8f71f38..2ab988c3f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java index a4017d9fc..a5e691b51 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java index 4c059e9cc..20a751d73 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java index 018db6960..2afed600d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java index 856a24965..9af244100 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java @@ -23,8 +23,6 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java index 908a349b8..a77d0288f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java index 67f05a98e..bcd052ec8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java index bcbe60665..13ccfb058 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java index 6888d89dd..7d06702bb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java index 66eddb9bb..46c1d8552 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java index 74a699736..7ea1d319c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java index 1e9633c79..0855d6d45 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java index 3d22701aa..f905746a7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java index 5b12b00f6..30705402a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java index c8cd02519..4dceb1edd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java @@ -23,8 +23,6 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java index 371af8349..edccbedf4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java index 42dc2affc..6f2bfecf4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java index 043b1df1c..1d352a5a1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java index 97f777b17..348ab9ec3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java index 91b0ecc77..8fd0ff496 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java index dfc40399e..c48a5b588 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java index eb6a5b8d2..d2a669d7e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java @@ -22,8 +22,6 @@ import java.util.HashMap; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java index 2375ee91e..e3d91cade 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java @@ -22,8 +22,6 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java index e3252e8f2..37838efda 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java index a809ce6e5..523b9cac4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java index ced057f09..6e368f79f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4091BadPluginDescriptorTest.java @@ -22,9 +22,6 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java index c9a851515..38a0f168d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java index 1ea74b211..bd8993858 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java index 312cf3bb1..cb05b134e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java index 8def9b272..8dd5271fd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng4112MavenVersionPropertyTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java index 0c76eb81f..352f8b869 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java index 5f47aaaa6..22506a7e1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java @@ -23,8 +23,6 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java index f92e78dba..b42ced349 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Collection; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java index e25b448ed..e9631a3cb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java index ca3bd112d..a65e90cc4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java index b83c01a06..163da47ae 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java index 02233ef5f..203e49573 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4180PerDependencyExclusionsTest.java @@ -23,8 +23,6 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java index 67a6c7803..ca7aa23c0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java index be52b8549..e2a9030d4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4190MirrorRepoMergingTest.java @@ -24,8 +24,6 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java index 7f98ed20b..cb49b2ad3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java index cc3ea1e55..79de95bc1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java index 90f3a0d41..492eb4da9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java index 99eff917d..5c9321a10 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4203TransitiveDependencyExclusionTest.java @@ -23,8 +23,6 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java index 3b16cff26..a8741a03b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java index 77f1087f3..8fd940ece 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java index 90063b6a5..3c553013a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java index e0a1ba48d..e85851f0b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java index 2e62961e9..2a4098d5d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4233ReactorResolutionForManuallyCreatedArtifactTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java index 5a533373b..16231f267 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java @@ -31,8 +31,6 @@ import java.util.concurrent.ConcurrentLinkedDeque; import org.apache.maven.it.utils.DeployedResource; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.StringUtils; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java index f7eba2fd7..48299a693 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java index f56d22ef4..381868574 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java index f2fdca9c2..630ba7eb5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java index 6bcd6f0c0..18fff1a5f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java index 5b6da73da..3311ed95f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java index 5fe0d155c..4d5c56ec8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java index b83901831..bfe945658 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java index 54b426122..7500098c5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4275RelocationWarningTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java index 6aa472b43..0871af8a5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java index 5c8351777..e1ca86a75 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java index 72cdbc8fe..d08d54ed5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java index 8f619233e..910bc5c29 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java index 540ee9dff..a3c25baae 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java index 016e0b325..b0704656f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java index c0423d4f5..a29b6c180 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java index 1be17ab98..605daca08 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java index 179f48fc0..7397782c0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java @@ -21,9 +21,6 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java index eb8d56658..ca91b4199 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java index a7e7771d7..b9bffe989 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java index f30ad88bf..e4b511cef 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java index 2230fd950..df38703de 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java index ee0380848..63f0f4834 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java index a07a3ee35..eed844bd0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java index e4971fb29..ebcab8262 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java index 056f1eaaa..f824b1df9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4326LocalSnapshotSuppressesRemoteCheckTest.java @@ -30,8 +30,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java index 9a49316e2..7e23c21d5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java index abe5328d5..ab382fd47 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java index d709c6f04..98717a857 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java index f97377f44..fa44bf1e0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java index 99c96f922..10cf82238 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java index db343c738..e87798a01 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java index acb851655..da3de1ad6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java index cbb9e0c92..b2eafb11e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java index b325aad0b..6e6ea7d7a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java @@ -28,9 +28,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java index 9c45fa1a2..538949368 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java index b22f54509..59fdb0fa4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java index ef91182dc..ae2f27a69 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java index 1cf65016c..f07b8efc2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java index dd675463d..d7b249698 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java index 866693fe9..a3c08f290 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java index 6eb02067d..47e1b4cc1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4353PluginDependencyResolutionFromPomRepoTest.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java index d9aeeb180..19251797b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java index 384b33456..46549b906 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java index 06d39e48d..5c44b1461 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java index e019038df..6386c449a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java index 38ae8e311..27efa0c00 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java index 7ca3becd8..6ba668aac 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java index f8916067f..3f77558e2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java index b326255ae..bf0108f5b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java index 4e54a9340..21f82c2e0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java index 9f27a3a96..53a672b02 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4368TimestampAwareArtifactInstallerTest.java @@ -21,8 +21,6 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java index a4b8e42cb..1a0e1450d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java index 30eecc260..666e2fad6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java index a100aa5bd..93a4d2bbe 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java index 7e952c246..24222b429 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java index 3cf0f8b9a..03422cb31 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java index 806b2b4ef..c0f40c617 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java @@ -23,8 +23,6 @@ import java.util.Iterator; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java index b7a7e1a8e..0fd1eae71 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java index c5d8f4032..a2bd841d3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java index 7351aa93d..5d79803e6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java index 63aaeee43..49ff871ca 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java index dfc459d86..b905c8e3a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java index 2ea6faa38..c5e013e4c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4403LenientDependencyPomParsingTest.java @@ -23,8 +23,6 @@ import java.util.Collections; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java index 3e6212934..bc9c46821 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java index d4a67a7ac..31c21c571 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java index 19eb1f8b2..f5c16a8ec 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java index 5105b72fd..b187a0b1d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java index 028930648..4e3e72d42 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java index aca4745ff..1f5366678 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java index 5fd02567f..84f853d01 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java index 36412adca..66541203d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4415InheritedPluginOrderTest.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java index 6791bb7f5..fc1b6806e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4416PluginOrderAfterProfileInjectionTest.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java index d90a17c6a..beb67104e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4421DeprecatedPomInterpolationExpressionsTest.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java index effb8fc75..f52a6b01e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java index fbbf350e0..35c4483f8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java index 439daf5e8..75aaa93df 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java index 2f31eeea0..cc246e620 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java index 9fe648f71..2beb6d81c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java index 2b108e84d..2b883aba9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java index 29f8d5602..334a0e8c9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java index de8d1ae5c..f8b566cf3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java index 28edfa9b8..1fadba55f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java index cdf24c9ad..0d611a20e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java index 73835fa20..ec6564e23 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java index ab93086ee..056eb63b4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java index 0f2a6e690..4081cd65f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4463DependencyManagementImportVersionRanges.java @@ -22,9 +22,6 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java index 9218d07c3..bdebaf44f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java index 943d35196..09f1c8d5f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Collections; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java index 16f81c778..9e0075e55 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java @@ -23,8 +23,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java index 4f98c07a6..27e5c0807 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java @@ -29,8 +29,6 @@ import java.util.concurrent.ConcurrentLinkedDeque; import org.apache.maven.it.utils.DeployedResource; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.StringUtils; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java index 030e8f5a2..fd220ad7a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java index f33aa2d84..56f9a77c2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java index 29547da8d..4c9c6d255 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java index aeb899a76..ad2710d56 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java index fe1b9edbe..2d8339817 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java index c2ce8aeca..ba2e0b651 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java index 820d32e7f..cda4b0566 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java index 4a580be3e..7dbc1b3e7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java index 8b4e8ee01..412d3c587 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java index 217247143..b2352426a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java index dc0c03354..61e5072d7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java index c30c02b9d..ae438608d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java index 84c803ebb..5c638b8cd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java @@ -29,8 +29,6 @@ import java.util.Map; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java index 2e0a7b932..f0343422b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4555MetaversionResolutionOfflineTest.java @@ -26,9 +26,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java index 74b15b834..892c01449 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java index acbd51134..de4059028 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java index 070c13590..44fc14002 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java index 2f40e4c66..e18326521 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java index d9f952128..028576445 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMgmtTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java index 4ecd986d0..fd9cc1069 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemAndUserPropertiesTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java index ed8b864d1..b48a7b20f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java index d3333cfdf..84295f7e4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java index 6597d3f96..ca03a1b20 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java index 13cf094a1..1c94a6d3e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.Os; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java index d09733c1f..ae293656f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java index 7704fd45c..1b1932c47 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java index 0cdf52918..5cf9480a7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java index 0d46c9544..0d23743ee 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java index 2dd3790d7..593b2ca7d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4666CoreRealmImportTest.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java index 883e0fc25..e862652c4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java index 62c977d77..889147b43 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java index ed5d975a2..7a60b5d00 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMgmtOverriddenByProfileTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java index ac25c23e6..40107651c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java index eeb0f54bd..a104ea53f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4696MavenProjectDependencyArtifactsTest.java @@ -22,8 +22,6 @@ import java.util.HashSet; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java index 9b6b2ff1d..413fb1b10 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java index 24439ef81..680c49777 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java index 2b99d9943..ce3b9c57a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.security.ConstraintMapping; import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.HashLoginService; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java index 5dc02c084..9bc2e9e79 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4745PluginVersionUpdateTest.java @@ -23,8 +23,6 @@ import java.util.Properties; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java index 4c3a4b897..c956784a6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java index be52d0554..6f9d37053 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java index 140c931f4..a3c795c2d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java index 1dea625bd..eae50edfa 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java index 7b21459cb..8de3def57 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java index 4977874bb..f4745c8f3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java index 48cc3aa7a..d0dffb943 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java @@ -26,9 +26,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentLinkedDeque; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java index 8c8069cb9..617c54cd8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java @@ -27,9 +27,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java index 9cce2928b..30d90dcb8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java index 0c32848d2..83a484fe9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java index bdf1fb230..5864a430c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java @@ -25,8 +25,6 @@ import java.util.Deque; import java.util.concurrent.ConcurrentLinkedDeque; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java index fd0a7685f..e77686730 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java index 4157be6b0..78e561dcd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java index 6ba2d124e..0baecd6a4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java index 488be44b3..0aff06a80 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java index 3e1ea2e77..bae80505d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java index 3d63139f6..e378799e8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java index 381a9f3c3..3c446ef19 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java index 02d971539..9bca6fcd5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4811CustomComponentConfiguratorTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java index b87bf6caa..ceb719cbb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4814ReResolutionOfDependenciesDuringReactorTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java index 4970421f4..d434022c0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java index 1725f673d..0fece39eb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java index aa5d20075..ccf205b48 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java index d1761e33f..346e04690 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java index 5991d2334..8df2350d1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java index db9aa4a2e..d8bd90383 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java @@ -21,8 +21,6 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java index cec46237d..03d8f9026 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java index 43f0d8116..ca025d419 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java index 167bfe32d..1055d4a55 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java index 4bcc09671..5ab75dd9c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java index 0c8a0199c..09c5a5e12 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java index 43a597e86..be75c8173 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java index 4691b3501..e86b0e35c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java index faf1cc9df..9fbe15921 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java index 0c036d3d8..94243ca7e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java index 7b2584cb2..363ebd7d9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java @@ -22,8 +22,6 @@ import java.util.Map; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java index 84fa4636c..39ad85e95 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java index 21aeef07d..8976a64e7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java index 6898d82c3..bb22861cd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java index 7838099bc..df8df2745 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java index f02506f25..bda02fbcf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java index 45b934cfc..03ba31c69 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java @@ -22,8 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java index 70e1cf558..e5dac3883 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java index 5bfd8b13f..c669e42f0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java index b930d58e7..476b72383 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4992MapStylePropertiesParamConfigTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java index 010d4b267..ddf56c150 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java index 3df317bc0..dd04325e3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java index 968e2f6f4..58a3e0f3a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5009AggregationCycleTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java index 28e95593d..51a55cc54 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromUserPropertiesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java index 296968f1c..8971cfa1a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5012CollectionVsArrayParamCoercionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java index aad8530fd..af7d15ec3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5013ConfigureParamBeanFromScalarValueTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java index 7fe707299..ca51d4508 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java index b16e4baad..8ed9833a6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java index 72bb67ff0..807599c67 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java index 62a13fd99..c4ae70818 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java index 659581ea0..9c3ca1f44 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java index 2d349381c..fc71c3310 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java @@ -27,8 +27,6 @@ import java.util.HashMap; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java index ed56684b5..260e85eef 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5206PlexusLifecycleHonoured.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java index 89529e1f8..3f14adeb3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java index a138cbc70..fc3233355 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5214DontMapWsdlToJar.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5214DontMapWsdlToJar extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java index fb4da50c0..38fb19eb1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5222MojoDeprecatedTest.java @@ -24,8 +24,6 @@ import java.util.Properties; import java.util.regex.Pattern; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java index c3ec9d69a..2174dc1c0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java @@ -23,8 +23,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java index fe76c03f2..ab4c5e766 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java index 7972c2c3a..da80d1811 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java @@ -29,8 +29,6 @@ import java.io.PrintWriter; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java index d5aa6c3b6..72ae290b5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5338FileOptionToDirectory.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java index 3d7277296..03d27782c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java index 673ab85cd..d93699b86 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5387ArtifactReplacementPlugin.java @@ -21,8 +21,6 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java index 8e42edecb..ffea20cbb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5389LifecycleParticipantAfterSessionEnd.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5389LifecycleParticipantAfterSessionEnd extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java index 543e11d28..0d04befd7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java index 8513591ac..12e5226cc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java index 69d48a8f4..b3e745e05 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java index bbdf10d55..0d07ec7a8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java @@ -23,9 +23,6 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java index 9b13a4b20..495016a9f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java index b4d7e926e..94eda6078 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5530MojoExecutionScopeTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java index ac5c64d6c..cd98225ad 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java index d31abaec3..ab67321fd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5561PluginRelocationLosesConfigurationTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java index 5f2d24f6e..c1ad2e48d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java index b87ac72b3..3f1a9fe67 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java index dbe12d63e..72faa6f61 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5578SessionScopeTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5578SessionScopeTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java index e4d89075c..56ed8d9a0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5581LifecycleMappingDelegate extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java index e7efba8a6..4d55cf297 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5591WorkspaceReader.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5591WorkspaceReader extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java index 76d825816..fd159827a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java index d7320f157..5420ed75d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5639ImportScopePomResolutionTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java index 5197da144..13f067fe5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5640LifecycleParticipantAfterSessionEnd.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java index e2791af65..22787249a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5663NestedImportScopePomResolutionTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java index 85f3dce2c..9c17843f6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java @@ -26,8 +26,6 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java index b242a6561..641671b35 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java index 9958d76aa..fa83405f7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5742BuildExtensionClassloaderTest.java @@ -21,8 +21,6 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5742BuildExtensionClassloaderTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java index b21b26130..eab3c19ff 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java @@ -21,8 +21,6 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5753CustomMojoExecutionConfiguratorTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java index 655712994..0c7f6867d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5768CliExecutionIdTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java index ce33418a5..43379a3c3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java index b625d573f..f06c04da6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5774ConfigurationProcessorsTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java index f6ff52101..89533266a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5783PluginDependencyFiltering.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5783PluginDependencyFiltering extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java index 17a1769b8..f60d38b25 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5805PkgTypeMojoConfiguration2 extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java index b2eaf9789..da5e12638 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5840ParentVersionRanges extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java index f2ce6f798..8d83542d1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5840RelativePathReactorMatching extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java index 6cae626e7..324ac1bbf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5868NoDuplicateAttachedArtifacts.java @@ -25,8 +25,6 @@ import java.nio.file.Files; import java.nio.file.Path; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Request; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java index e42a29740..1362aed96 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5889FindBasedir.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java index 692d0da7f..160029c97 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java index 5634fe401..c6ed07d34 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java index aa5ae269b..18dd3020a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5935OptionalLostInTranstiveManagedDependenciesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java index fdfc62c23..5f7a84e23 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5958LifecyclePhaseBinaryCompat extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java index 0d95c3a6e..cea39bdee 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5965ParallelBuildMultipliesWorkTest.java @@ -24,9 +24,6 @@ import java.util.List; import java.util.Set; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java index 110af39ab..8206cc785 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java @@ -22,8 +22,6 @@ import java.util.LinkedList; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java index 37b069b42..ec55347cb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6071GetResourceWithCustomPom.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java index 23b16eab9..08406a74d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6084Jsr250PluginTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java index 2d43723bf..0d7d787da 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java index 9d038fd20..83a653505 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java @@ -21,8 +21,6 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java index d55151850..db60643b5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6127PluginExecutionConfigurationInterferenceTest.java @@ -21,8 +21,6 @@ import java.io.File; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng6127PluginExecutionConfigurationInterferenceTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java index d887e7ba5..a56002a51 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetAllProjectsInReactorTest.java @@ -25,8 +25,6 @@ import java.util.List; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java index 10068bd64..fe93a3d7d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6173GetProjectsAndDependencyGraphTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java index 8ebd7d99b..03e5dc632 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java index c07dc0ca8..fda53261d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6210CoreExtensionsCustomScopesTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java index 6c4c1d5ee..23f6ed819 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6223FindBasedir.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java index 443bcda8c..e4d09efb5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6240PluginExtensionAetherProvider.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java index 41d127f5d..3e94dadb9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6255FixConcatLines.java @@ -24,8 +24,6 @@ import com.google.common.base.Charsets; import com.google.common.base.Joiner; import com.google.common.io.Files; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java index c6e950d45..1d85df454 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java index c065e8f68..047fb8a0e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java @@ -24,9 +24,6 @@ import java.nio.file.Files; import java.nio.file.Paths; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java index 65f833c0a..85651df45 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java index 827fa4c93..7124d69b9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java @@ -22,8 +22,6 @@ import java.util.Properties; import org.apache.maven.shared.utils.Os; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java index ce5768fe9..2ea2975b1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java @@ -22,8 +22,6 @@ import java.util.LinkedList; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java index 86f2d5deb..571f33a73 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6506PackageAnnotationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng6506PackageAnnotationTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java index 0406fea52..74a4dd5a1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6511OptionalProjectSelectionTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java index 0fbca2cb0..fa244a982 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java index c66c06d4a..5c5600df3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java index 0f1a78e50..68086c05c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6609ProfileActivationForPackagingTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.Properties; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java index 86fd03233..089f2839a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6720FailFastTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java index 17f472506..d0bc9ca85 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6754TimestampInMultimoduleProject.java @@ -28,8 +28,6 @@ import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java index f59d702e6..16aea2af8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6759TransitiveDependencyRepositoriesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.net.URI; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java index 0d506f25c..066a8d76a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java index 9ce50c7a7..0de73ae89 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6981ProjectListShouldIncludeChildrenTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng6981ProjectListShouldIncludeChildrenTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java index 99f7c078c..3841d5dd3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7038RootdirTest.java @@ -22,9 +22,6 @@ import java.io.IOException; import java.util.Properties; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7038RootdirTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java index 73796ae01..45150b1b1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7045DropUselessAndOutdatedCdiApiTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java index da4d1acc0..25a330fcf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7110ExtensionClassloader.java @@ -24,9 +24,6 @@ import java.io.Reader; import java.util.Properties; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7110ExtensionClassloader extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java index 65adfb665..e905f8ab0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7112ProjectsWithNonRecursiveTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java index d967d2c60..f88dc41c4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7128BlockExternalHttpReactorTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7128BlockExternalHttpReactorTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java index c3f4d5e7a..89856fd2e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7160ExtensionClassloader.java @@ -21,9 +21,6 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7160ExtensionClassloader extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java index a1e592b27..a5e1db47b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java @@ -22,8 +22,6 @@ import org.apache.commons.io.FileUtils; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java index f050553b5..4df4d574c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7244IgnorePomPrefixInExpressions.java @@ -22,9 +22,6 @@ import java.io.IOException; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7244IgnorePomPrefixInExpressions extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java index 1946a3f7f..8538d794b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7310LifecycleActivatedInSpecifiedModuleTest.java @@ -20,9 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; - /** * An integration test which proves that the bug of MNG-7310 is fixed. * The bug is about loading an extension in a sibling submodule, which ends up failing the build. diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java index 655eb98c3..e5b5c18f4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7335MissingJarInParallelBuild.java @@ -21,9 +21,6 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7335MissingJarInParallelBuild extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java index 15a1b9976..bf39be210 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7349RelocationWarningTest.java @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7349RelocationWarningTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java index fd8ea45f8..312491aec 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7353CliGoalInvocationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java index 9710a2f17..762ceecdf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java @@ -22,9 +22,6 @@ import java.io.IOException; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7404IgnorePrefixlessExpressionsTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java index 4ff1e4510..3723c3ceb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7464ReadOnlyMojoParametersWarningTest.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java index c4e710538..f709dca9e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7468UnsupportedPluginsParametersTest.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java index 2d6cf4b68..99465a71d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java @@ -22,8 +22,6 @@ import java.util.HashMap; import java.util.Map; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java index f17a4e321..e9c6e055f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7474SessionScopeTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java index 870fa0e31..7d0322a2c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7487DeadlockTest.java @@ -21,9 +21,6 @@ import java.io.File; import java.io.IOException; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7487DeadlockTest extends AbstractMavenIntegrationTestCase { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java index 7ad19145e..21d488487 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7504NotWarnUnsupportedReportPluginsTest.java @@ -22,9 +22,6 @@ import java.io.IOException; import java.util.List; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java index 177b79210..6f29f1468 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7529VersionRangeRepositorySelection.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java index 8877506ec..3de1d8b91 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7566JavaPrerequisiteTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java index 122e48c37..92d8f1bd6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7587Jsr330.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java index 1cb29d30d..e7b9362bc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7606DependencyImportScopeTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java index ff8b2e652..721dfe831 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7679SingleMojoNoPomTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java index a786d4045..545d42462 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7697PomWithEmojiTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java index 17e0c8649..7a0fc1422 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7716BuildDeadlock.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.concurrent.TimeUnit; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java index 54240a0fc..1828a95e4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7737ProfileActivationTest.java @@ -20,8 +20,6 @@ import java.io.File; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.Os; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java index 8560dd43a..3cc6a30af 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7819FileLockingWithSnapshotsTest.java @@ -23,8 +23,6 @@ import java.util.Map; import org.apache.commons.io.FileUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7939PluginsValidationExcludesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7939PluginsValidationExcludesTest.java index 9da956477..b134eaa66 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7939PluginsValidationExcludesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7939PluginsValidationExcludesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java index a69812ecf..f7c1a5274 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8106OverlappingDirectoryRolesTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.io.FileReader; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.ResourceExtractor; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.junit.jupiter.api.Test; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java index 52146dc65..1ba979e8c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java @@ -46,7 +46,6 @@ import java.util.List; import java.util.Map; -import org.apache.maven.it.Verifier; import org.junit.jupiter.api.ClassDescriptor; import org.junit.jupiter.api.ClassOrderer; import org.junit.jupiter.api.ClassOrdererContext; diff --git a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java index 0af801b5b..f8339e865 100644 --- a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java +++ b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java @@ -27,7 +27,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -134,7 +133,8 @@ public class Verifier { public Verifier(String basedir) throws VerificationException { this.basedir = basedir; - this.executorHelper = ExecutorHelper.forExecutors(VERIFIER_FORK_MODE, EMBEDDED_MAVEN_EXECUTOR, FORKED_MAVEN_EXECUTOR); + this.executorHelper = + ExecutorHelper.forExecutors(VERIFIER_FORK_MODE, EMBEDDED_MAVEN_EXECUTOR, FORKED_MAVEN_EXECUTOR); this.defaultCliArguments = newDefaultCliArguments(); } From e1b0fa5e21961c13579b459eed34b3008e3410ed Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Mon, 21 Sep 2026 13:08:28 +0200 Subject: [PATCH 5/5] Capture real process stdout/stderr for the log file instead of a -l argument The prior execute() prepended "-l " to the CLI arguments to get Maven's own log-file flag to populate the log. maven-verifier's ForkedLauncher/Embedded3xLauncher never did that: they redirected the actual process stdout/stderr into the log file directly, which is what lets MavenITmng3183LoggingToFileTest (which adds its own "-l maven.log" argument) still see an empty captured stdout. Restored that behavior via ExecutorRequest's stdOut/stdErr, buffered per-stream to avoid the maven-executor pump threads closing a shared stream out from under each other, then written into the log file after execution. Caught by upstream CI on this PR (run 35591231728): 876/877 core-it-suite tests passed, this one failed. --- .../java/org/apache/maven/it/Verifier.java | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java index f8339e865..21d845f6d 100644 --- a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java +++ b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java @@ -18,8 +18,10 @@ */ package org.apache.maven.it; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.FileReader; import java.io.FilenameFilter; import java.io.IOException; @@ -817,19 +819,27 @@ public void execute() throws VerificationException { args.add(cliArgument.replace("${basedir}", getBasedir())); } - if (logFileName != null) { - args.add(0, logFileName); - args.add(0, "-l"); - } - File logFile = getLogFile(); + // Capture the real stdout/stderr of the Maven-under-test and write both into the log file, + // exactly as maven-verifier's ForkedLauncher/Embedded3xLauncher did (both streams into the + // same writer). Unlike a "-l " CLI argument, this does not fight with a CLI argument + // list that (rarely) adds its own "-l" (e.g. MavenITmng3183LoggingToFileTest), since it + // captures whatever actually reaches the process' own stdout/stderr rather than competing + // with it for the same log destination. Each pump thread in maven-executor closes whatever + // stream it is given, so two private ByteArrayOutputStreams are used (close() on those is a + // harmless no-op) and copied into the real log file afterward, under our own control. + ByteArrayOutputStream stdOut = new ByteArrayOutputStream(); + ByteArrayOutputStream stdErr = new ByteArrayOutputStream(); + try { ExecutorRequest.Builder builder = ExecutorRequest.mavenBuilder() .command(executable) .cwd(Paths.get(basedir)) .arguments(args) - .skipMavenRc(true); + .skipMavenRc(true) + .stdOut(stdOut) + .stdErr(stdErr); if (!environmentVariables.isEmpty()) { builder.environmentVariables(environmentVariables); } @@ -842,16 +852,29 @@ public void execute() throws VerificationException { ExecutorRequest request = builder.build(); ExecutorResult result = executorHelper.execute(mode, request); + writeLogFile(logFile, stdOut, stdErr); + if (!result.success()) { throw new VerificationException("Exit code was non-zero: " + result.exitCode().orElse(-1) + "; command line and log = \n" + getExecutable() + " " + StringUtils.join(args.iterator(), " ") + "\n" + getLogContents(logFile)); } } catch (ExecutorException e) { + writeLogFile(logFile, stdOut, stdErr); throw new VerificationException("Failed to execute Maven", e); } } + private static void writeLogFile(File logFile, ByteArrayOutputStream stdOut, ByteArrayOutputStream stdErr) + throws VerificationException { + try (FileOutputStream fos = new FileOutputStream(logFile)) { + stdOut.writeTo(fos); + stdErr.writeTo(fos); + } catch (IOException e) { + throw new VerificationException("Could not write log file: " + logFile, e); + } + } + public String getMavenVersion() throws VerificationException { try { return executorHelper.mavenVersion();