From f432a7b0cf3b46c73efe22a852dfb43202a30082 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 7 Jul 2022 22:45:20 +0200 Subject: [PATCH 1/6] Move ITs to JDK 8 / JUnit 5 --- core-it-suite/pom.xml | 19 +-- .../java/org/apache/maven/it/ItUtils.java | 1 + .../maven/it/MavenIT0008SimplePluginTest.java | 7 +- .../it/MavenIT0009GoalConfigurationTest.java | 7 +- ...IT0010DependencyClosureResolutionTest.java | 7 +- ...aultVersionByDependencyManagementTest.java | 7 +- .../it/MavenIT0012PomInterpolationTest.java | 7 +- .../MavenIT0018DependencyManagementTest.java | 7 +- ...IT0019PluginVersionMgmtBySuperPomTest.java | 7 +- .../maven/it/MavenIT0021PomProfileTest.java | 7 +- .../it/MavenIT0023SettingsProfileTest.java | 7 +- ...MavenIT0024MultipleGoalExecutionsTest.java | 7 +- ...0025MultipleExecutionLevelConfigsTest.java | 7 +- ...venIT0030DepPomDepMgmtInheritanceTest.java | 7 +- .../it/MavenIT0032MavenPrerequisiteTest.java | 7 +- ...avenIT0037AlternatePomFileSameDirTest.java | 7 +- ...T0038AlternatePomFileDifferentDirTest.java | 7 +- ...T0040PackagingFromPluginExtensionTest.java | 7 +- ...41ArtifactTypeFromPluginExtensionTest.java | 7 +- .../it/MavenIT0051ReleaseProfileTest.java | 7 +- .../it/MavenIT0052ReleaseProfileTest.java | 7 +- ...MavenIT0056MultipleGoalExecutionsTest.java | 7 +- .../MavenIT0063SystemScopeDependencyTest.java | 7 +- .../MavenIT0064MojoConfigViaSettersTest.java | 7 +- ...071PluginConfigWithDottedPropertyTest.java | 7 +- ...72InterpolationWithDottedPropertyTest.java | 7 +- .../MavenIT0085TransitiveSystemScopeTest.java | 7 +- .../maven/it/MavenIT0086PluginRealmTest.java | 7 +- ...87PluginRealmWithProjectLevelDepsTest.java | 7 +- .../MavenIT0090EnvVarInterpolationTest.java | 7 +- .../it/MavenIT0108SnapshotUpdateTest.java | 17 ++- ...rAuthzAvailableToWagonMgrInPluginTest.java | 7 +- .../it/MavenIT0130CleanLifecycleTest.java | 7 +- .../it/MavenIT0131SiteLifecycleTest.java | 7 +- .../maven/it/MavenIT0132PomLifecycleTest.java | 7 +- .../maven/it/MavenIT0133JarLifecycleTest.java | 7 +- .../maven/it/MavenIT0134WarLifecycleTest.java | 7 +- .../maven/it/MavenIT0135EjbLifecycleTest.java | 7 +- .../maven/it/MavenIT0136RarLifecycleTest.java | 7 +- .../maven/it/MavenIT0137EarLifecycleTest.java | 7 +- .../it/MavenIT0138PluginLifecycleTest.java | 7 +- ...139InterpolationWithProjectPrefixTest.java | 7 +- ...nIT0140InterpolationWithPomPrefixTest.java | 7 +- ...MavenIT0142DirectDependencyScopesTest.java | 7 +- ...nIT0143TransitiveDependencyScopesTest.java | 10 +- ...avenIT0144LifecycleExecutionOrderTest.java | 7 +- .../MavenIT0146InstallerSnapshotNaming.java | 22 +-- .../it/MavenIT0199CyclicImportScopeTest.java | 8 +- .../apache/maven/it/MavenITBootstrapTest.java | 7 +- ...enITmng0095ReactorFailureBehaviorTest.java | 10 +- .../MavenITmng0187CollectedProjectsTest.java | 7 +- ...enITmng0249ResolveDepsFromReactorTest.java | 7 +- ...ReactorExecWhenProjectIndependentTest.java | 7 +- ...mng0294MergeGlobalAndUserSettingsTest.java | 7 +- ...enITmng0377PluginLookupFromPrefixTest.java | 7 +- ...nITmng0449PluginVersionResolutionTest.java | 8 +- ...g0461TolerateMissingDependencyPomTest.java | 7 +- .../it/MavenITmng0469ReportConfigTest.java | 8 +- .../it/MavenITmng0471CustomLifecycleTest.java | 7 +- ...MavenITmng0479OverrideCentralRepoTest.java | 9 +- ...0496IgnoreUnknownPluginParametersTest.java | 7 +- .../it/MavenITmng0505VersionRangeTest.java | 7 +- .../MavenITmng0507ArtifactRelocationTest.java | 7 +- ...Tmng0522InheritedPluginMgmtConfigTest.java | 7 +- ...nITmng0553SettingsAuthzEncryptionTest.java | 18 ++- ...venITmng0557UserSettingsCliOptionTest.java | 7 +- ...enITmng0612NewestConflictResolverTest.java | 9 +- .../it/MavenITmng0666IgnoreLegacyPomTest.java | 7 +- ...avenITmng0674PluginParameterAliasTest.java | 8 +- .../it/MavenITmng0680ParentBasedirTest.java | 7 +- ...nITmng0761MissingSnapshotDistRepoTest.java | 7 +- .../it/MavenITmng0768OfflineModeTest.java | 19 ++- ...73SettingsProfileReactorPollutionTest.java | 7 +- ...ITmng0781PluginConfigVsExecConfigTest.java | 7 +- ...MavenITmng0786ProfileAwareReactorTest.java | 7 +- ...Tmng0814ExplicitProfileActivationTest.java | 7 +- ...avenITmng0818WarDepsNotTransitiveTest.java | 7 +- .../MavenITmng0820ConflictResolutionTest.java | 7 +- .../MavenITmng0823MojoContextPassingTest.java | 7 +- ...Tmng0828PluginConfigValuesInDebugTest.java | 5 +- ...enITmng0836PluginParentResolutionTest.java | 8 +- ...48SystemPropOverridesDefaultValueTest.java | 7 +- ...avenITmng0866EvaluateDefaultValueTest.java | 7 +- ...ng0870ReactorAwarePluginDiscoveryTest.java | 5 +- .../MavenITmng0947OptionalDependencyTest.java | 7 +- ...InjectionViaProjectLevelPluginDepTest.java | 7 +- ...mng0985NonExecutedPluginMgmtGoalsTest.java | 7 +- ...mng1021EqualAttachmentBuildNumberTest.java | 7 +- .../MavenITmng1052PluginMgmtConfigTest.java | 7 +- ...enITmng1073AggregatorForksReactorTest.java | 8 +- ...nITmng1088ReactorPluginResolutionTest.java | 7 +- ...ITmng1142VersionRangeIntersectionTest.java | 8 +- ...avenITmng1144MultipleDefaultGoalsTest.java | 7 +- ...nITmng1233WarDepWithProvidedScopeTest.java | 7 +- .../MavenITmng1323AntrunDependenciesTest.java | 5 +- .../it/MavenITmng1349ChecksumFormatsTest.java | 5 +- .../MavenITmng1412DependenciesOrderTest.java | 7 +- ...enITmng1415QuotedSystemPropertiesTest.java | 9 +- ...mng1491ReactorArtifactIdCollisionTest.java | 8 +- ...Tmng1493NonStandardModulePomNamesTest.java | 3 +- .../it/MavenITmng1701DuplicatePluginTest.java | 8 +- ...ITmng1703PluginMgmtDepInheritanceTest.java | 7 +- ...cedMetadataUpdateDuringDeploymentTest.java | 7 +- ...ValidationErrorIncludesLineNumberTest.java | 7 +- ...nITmng1895ScopeConflictResolutionTest.java | 13 +- ...1957JdkActivationWithVersionRangeTest.java | 7 +- ...mng1992SystemPropOverridesPomPropTest.java | 7 +- ...95InterpolateBooleanModelElementsTest.java | 7 +- ...g2006ChildPathAwareUrlInheritanceTest.java | 7 +- ...estJarDependenciesBrokenInReactorTest.java | 5 +- ...lateWithSettingsProfilePropertiesTest.java | 7 +- ...mng2054PluginExecutionInheritanceTest.java | 9 +- ...enITmng2068ReactorRelativeParentsTest.java | 7 +- ...ersionRangeSatisfiedFromWrongRepoTest.java | 7 +- ...mng2103PluginExecutionInheritanceTest.java | 7 +- ...enITmng2123VersionRangeDependencyTest.java | 5 +- ...4PomInterpolationWithParentValuesTest.java | 7 +- ...g2130ParentLookupFromReactorCacheTest.java | 7 +- ...avenITmng2135PluginBuildInReactorTest.java | 7 +- ...enITmng2136ActiveByDefaultProfileTest.java | 7 +- ...ReactorAwareDepResolutionWhenForkTest.java | 7 +- ...4PluginDepsManagedByParentProfileTest.java | 7 +- .../MavenITmng2196ParentResolutionTest.java | 8 +- .../MavenITmng2199ParentVersionRangeTest.java | 16 ++- ...Tmng2201PluginConfigInterpolationTest.java | 7 +- ...2OutputDirectoryReactorResolutionTest.java | 7 +- .../MavenITmng2228ComponentInjectionTest.java | 7 +- ...mng2234ActiveProfilesFromSettingsTest.java | 7 +- .../it/MavenITmng2254PomEncodingTest.java | 3 +- ...ofileActivationBySettingsPropertyTest.java | 8 +- ...277AggregatorAndResolutionPluginsTest.java | 5 +- ...venITmng2293CustomPluginParamImplTest.java | 7 +- .../it/MavenITmng2305MultipleProxiesTest.java | 10 +- ...venITmng2309ProfileInjectionOrderTest.java | 5 +- ...venITmng2318LocalParentResolutionTest.java | 7 +- ...nITmng2339BadProjectInterpolationTest.java | 8 +- ...MavenITmng2362DeployedPomEncodingTest.java | 9 +- ...Tmng2363BasedirAwareFileActivatorTest.java | 7 +- .../it/MavenITmng2387InactiveProxyTest.java | 19 ++- .../MavenITmng2432PluginPrefixOrderTest.java | 5 +- ...pedDependencyVersionInterpolationTest.java | 7 +- .../it/MavenITmng2562Timestamp322Test.java | 11 +- .../it/MavenITmng2576MakeLikeReactorTest.java | 13 +- ...ITmng2577SettingsXmlInterpolationTest.java | 8 +- ...mng2591MergeInheritedPluginConfigTest.java | 8 +- ...enITmng2605BogusProfileActivationTest.java | 5 +- ...68UsePluginDependenciesForSortingTest.java | 7 +- .../MavenITmng2690MojoLoadingErrorsTest.java | 15 +- .../it/MavenITmng2693SitePluginRealmTest.java | 7 +- ...enITmng2695OfflinePluginSnapshotsTest.java | 7 +- ...Tmng2720SiblingClasspathArtifactsTest.java | 7 +- ...738ProfileIdCollidesWithCliOptionTest.java | 7 +- ...mng2739RequiredRepositoryElementsTest.java | 9 +- ...ginMetadataResolutionErrorMessageTest.java | 9 +- ...avenITmng2744checksumVerificationTest.java | 5 +- ...mng2749ExtensionAvailableToPluginTest.java | 7 +- ...2771PomExtensionComponentOverrideTest.java | 9 +- ...MavenITmng2790LastUpdatedMetadataTest.java | 5 +- .../it/MavenITmng2820PomCommentsTest.java | 9 +- ...ArtifactHandlerAndCustomLifecycleTest.java | 7 +- ...43PluginConfigPropertiesInjectionTest.java | 7 +- ...leActivationByEnvironmentVariableTest.java | 7 +- ...avenITmng2861RelocationsAndRangesTest.java | 7 +- .../it/MavenITmng2865MirrorWildcardTest.java | 10 +- ...71PrePackageSubartifactResolutionTest.java | 7 +- ...MavenITmng2892HideCorePlexusUtilsTest.java | 7 +- ...nITmng2921ActiveAttachedArtifactsTest.java | 7 +- .../MavenITmng2926PluginPrefixOrderTest.java | 5 +- ...ITmng2972OverridePluginDependencyTest.java | 8 +- ...nITmng2994SnapshotRangeRepositoryTest.java | 7 +- ...actorFailureBehaviorMultithreadedTest.java | 12 +- .../it/MavenITmng3012CoreClassImportTest.java | 7 +- ...ng3023ReactorDependencyResolutionTest.java | 8 +- ...nITmng3038TransitiveDepManVersionTest.java | 8 +- ...ng3043BestEffortReactorResolutionTest.java | 8 +- .../MavenITmng3052DepRepoAggregationTest.java | 3 +- ...SnapshotsExcludedFromVersionRangeTest.java | 9 +- ...Tmng3099SettingsProfilesWithNoPomTest.java | 7 +- .../MavenITmng3118TestClassPathOrderTest.java | 7 +- ...mng3122ActiveProfilesNoDuplicatesTest.java | 7 +- ...rmalizationNotBeforeInterpolationTest.java | 7 +- ...seCachedMetadataOfBlacklistedRepoTest.java | 7 +- .../it/MavenITmng3183LoggingToFileTest.java | 7 +- ...enITmng3203DefaultLifecycleExecIdTest.java | 3 +- ...mng3208ProfileAwareReactorSortingTest.java | 7 +- ...venITmng3217InterPluginDependencyTest.java | 7 +- .../it/MavenITmng3220ImportScopeTest.java | 9 +- ...3259DepsDroppedInMultiModuleBuildTest.java | 5 +- ...mng3268MultipleHyphenPCommandLineTest.java | 7 +- .../MavenITmng3284UsingCachedPluginsTest.java | 5 +- .../it/MavenITmng3288SystemScopeDirTest.java | 6 +- ...ng3297DependenciesNotLeakedToMojoTest.java | 7 +- .../MavenITmng3314OfflineSnapshotsTest.java | 5 +- ...nITmng3331ModulePathNormalizationTest.java | 3 +- ...ng3355TranslatedPathInterpolationTest.java | 7 +- ...Tmng3372DirectInvocationOfPluginsTest.java | 8 +- ...Tmng3379ParallelArtifactDownloadsTest.java | 5 +- ...Tmng3380ManagedRelocatedTransdepsTest.java | 7 +- ...Tmng3394POMPluginVersionDominanceTest.java | 7 +- ...anagementForOverConstrainedRangesTest.java | 5 +- .../MavenITmng3401CLIDefaultExecIdTest.java | 6 +- ...enITmng3415JunkRepositoryMetadataTest.java | 21 +-- ...Tmng3422ActiveComponentCollectionTest.java | 7 +- ...taUpdatedFromDeploymentRepositoryTest.java | 13 +- .../it/MavenITmng3461MirrorMatchingTest.java | 20 ++- ...ecksumVerificationOfDependencyPomTest.java | 8 +- .../it/MavenITmng3475BaseAlignedDirTest.java | 7 +- ...7DependencyResolutionErrorMessageTest.java | 8 +- ...mng3482DependencyPomInterpolationTest.java | 7 +- ...enITmng3485OverrideWagonExtensionTest.java | 5 +- .../it/MavenITmng3498ForkToOtherMojoTest.java | 5 +- .../it/MavenITmng3503Xpp3ShadingTest.java | 6 +- ...ng3506ArtifactHandlersFromPluginsTest.java | 8 +- .../it/MavenITmng3529QuotedCliArgTest.java | 9 +- ...Tmng3535SelfReferentialPropertiesTest.java | 8 +- ...venITmng3536AppendedAbsolutePathsTest.java | 7 +- ...MavenITmng3545ProfileDeactivationTest.java | 10 +- ...decimalOctalPluginParameterConfigTest.java | 7 +- ...Tmng3581PluginUsesWagonDependencyTest.java | 8 +- ...ng3586SystemScopePluginDependencyTest.java | 8 +- ...ITmng3599useHttpProxyForWebDAVMk2Test.java | 22 ++- ...enITmng3600DeploymentModeDefaultsTest.java | 9 +- ...ITmng3607ClassLoadersUseValidUrlsTest.java | 7 +- .../MavenITmng3621UNCInheritedPathsTest.java | 7 +- ...ITmng3641ProfileActivationWarningTest.java | 5 +- .../MavenITmng3642DynamicResourcesTest.java | 3 +- .../it/MavenITmng3645POMSyntaxErrorTest.java | 8 +- .../it/MavenITmng3652UserAgentHeaderTest.java | 30 ++-- ...g3667ResolveDepsWithBadPomVersionTest.java | 5 +- ...ng3671PluginLevelDepInterpolationTest.java | 3 +- ...Tmng3679PluginExecIdInterpolationTest.java | 3 +- ...avenITmng3680InvalidDependencyPOMTest.java | 3 +- ...avenITmng3684BuildPluginParameterTest.java | 3 +- ...avenITmng3693PomFileBasedirChangeTest.java | 3 +- ...nITmng3694ReactorProjectsDynamismTest.java | 3 +- .../MavenITmng3701ImplicitProfileIdTest.java | 7 +- ...ExecutionProjectWithRelativePathsTest.java | 6 +- ...venITmng3710PollutedClonedPluginsTest.java | 8 +- ...MavenITmng3714ToolchainsCliOptionTest.java | 7 +- .../MavenITmng3716AggregatorForkingTest.java | 5 +- ...avenITmng3719PomExecutionOrderingTest.java | 7 +- ...venITmng3723ConcreteParentProjectTest.java | 3 +- ...avenITmng3724ExecutionProjectSyncTest.java | 3 +- ...avenITmng3729MultiForkAggregatorsTest.java | 3 +- .../it/MavenITmng3732ActiveProfilesTest.java | 7 +- ...740SelfReferentialReactorProjectsTest.java | 3 +- ...MavenITmng3746POMPropertyOverrideTest.java | 6 +- ...enITmng3747PrefixedPathExpressionTest.java | 3 +- .../it/MavenITmng3748BadSettingsXmlTest.java | 6 +- ...nITmng3766ToolchainsFromExtensionTest.java | 7 +- ...ng3769ExclusionRelocatedTransdepsTest.java | 7 +- ...775ConflictResolutionBacktrackingTest.java | 12 +- ...ITmng3796ClassImportInconsistencyTest.java | 7 +- ...mng3805ExtensionClassPathOrderingTest.java | 7 +- ...7PluginConfigExpressionEvaluationTest.java | 7 +- ...Tmng3808ReportInheritanceOrderingTest.java | 5 +- ...avenITmng3810BadProfileActivationTest.java | 5 +- ...ingPluginConfigurationInheritanceTest.java | 7 +- ...nITmng3813PluginClassPathOrderingTest.java | 7 +- .../MavenITmng3814BogusProjectCycleTest.java | 7 +- .../MavenITmng3821EqualPluginExecIdsTest.java | 7 +- ...ng3822BasedirAlignedInterpolationTest.java | 7 +- .../it/MavenITmng3827PluginConfigTest.java | 7 +- .../MavenITmng3831PomInterpolationTest.java | 7 +- ...3833PomInterpolationDataFlowChainTest.java | 7 +- ...nITmng3836PluginConfigInheritanceTest.java | 7 +- .../it/MavenITmng3838EqualPluginDepsTest.java | 7 +- ...enITmng3839PomParsingCoalesceTextTest.java | 7 +- .../it/MavenITmng3843PomInheritanceTest.java | 7 +- ...venITmng3845LimitedPomInheritanceTest.java | 7 +- ...ng3846PomInheritanceUrlAdjustmentTest.java | 8 +- ...PluginConfigWithHeterogeneousListTest.java | 7 +- ...ITmng3853ProfileInjectedDistReposTest.java | 7 +- .../MavenITmng3863AutoPluginGroupIdTest.java | 8 +- ...MavenITmng3864PerExecPluginConfigTest.java | 7 +- ...nITmng3866PluginConfigInheritanceTest.java | 7 +- ...72ProfileActivationInRelocatedPomTest.java | 7 +- ...enITmng3873MultipleExecutionGoalsTest.java | 8 +- ...MavenITmng3877BasedirAlignedModelTest.java | 7 +- ...MavenITmng3886ExecutionGoalsOrderTest.java | 8 +- ...avenITmng3887PluginExecutionOrderTest.java | 8 +- ...90TransitiveDependencyScopeUpdateTest.java | 9 +- .../MavenITmng3892ReleaseDeploymentTest.java | 5 +- ...avenITmng3899ExtensionInheritanceTest.java | 7 +- ...900ProfilePropertiesInterpolationTest.java | 7 +- ...ng3904NestedBuildDirInterpolationTest.java | 7 +- ...3906MergedPluginClassPathOrderingTest.java | 7 +- ...mng3916PluginExecutionInheritanceTest.java | 7 +- ...enITmng3924XmlMarkupInterpolationTest.java | 7 +- ...mng3925MergedPluginExecutionOrderTest.java | 8 +- ...g3927PluginDefaultExecutionConfigTest.java | 7 +- ...mng3937MergedPluginExecutionGoalsTest.java | 8 +- ...venITmng3938MergePluginExecutionsTest.java | 8 +- ...MavenITmng3940EnvVarInterpolationTest.java | 9 +- ...ionProjectRestrictedToForkingMojoTest.java | 5 +- ...mng3943PluginExecutionInheritanceTest.java | 7 +- ...avenITmng3944BasedirInterpolationTest.java | 7 +- ...g3947PluginDefaultExecutionConfigTest.java | 7 +- ...8ParentResolutionFromProfileReposTest.java | 7 +- .../it/MavenITmng3951AbsolutePathsTest.java | 7 +- ...nITmng3953AuthenticatedDeploymentTest.java | 21 ++- .../MavenITmng3955EffectiveSettingsTest.java | 5 +- ...3970DepResolutionFromProfileReposTest.java | 8 +- .../it/MavenITmng3974MirrorOrderingTest.java | 7 +- .../it/MavenITmng3979ElementJoinTest.java | 5 +- ...3PluginResolutionFromProfileReposTest.java | 8 +- ...avenITmng3991ValidDependencyScopeTest.java | 8 +- ...venITmng3998PluginExecutionConfigTest.java | 7 +- ...venITmng4000MultiPluginExecutionsTest.java | 8 +- ...MavenITmng4005UniqueDependencyKeyTest.java | 11 +- ...venITmng4007PlatformFileSeparatorTest.java | 7 +- .../MavenITmng4008MergedFilterOrderTest.java | 7 +- ...venITmng4009InheritProfileEffectsTest.java | 7 +- ...4016PrefixedPropertyInterpolationTest.java | 7 +- ...4022IdempotentPluginConfigMergingTest.java | 7 +- ...4023ParentProfileOneTimeInjectionTest.java | 7 +- ...ITmng4026ReactorDependenciesOrderTest.java | 7 +- ...ITmng4034ManagedProfileDependencyTest.java | 7 +- ...6ParentResolutionFromSettingsRepoTest.java | 7 +- ...enITmng4040ProfileInjectedModulesTest.java | 7 +- ...4048VersionRangeReactorResolutionTest.java | 7 +- ...nITmng4052ReactorAwareImportScopeTest.java | 7 +- ...enITmng4053PluginConfigAttributesTest.java | 9 +- ...fierBasedDepResolutionFromReactorTest.java | 7 +- ...MavenITmng4068AuthenticatedMirrorTest.java | 17 ++- .../MavenITmng4070WhitespaceTrimmingTest.java | 7 +- ...avenITmng4072InactiveProfileReposTest.java | 7 +- ...venITmng4087PercentEncodedFileUrlTest.java | 7 +- ...MavenITmng4091BadPluginDescriptorTest.java | 9 +- ...102InheritedPropertyInterpolationTest.java | 8 +- ...6InterpolationUsesDominantProfileTest.java | 5 +- ...polationUsesDominantProfileSourceTest.java | 5 +- ...avenITmng4112MavenVersionPropertyTest.java | 7 +- .../it/MavenITmng4116UndecodedUrlsTest.java | 5 +- ...mng4129PluginExecutionInheritanceTest.java | 5 +- .../it/MavenITmng4150VersionRangeTest.java | 7 +- .../MavenITmng4162ReportingMigrationTest.java | 7 +- .../MavenITmng4166HideCoreCommonsCliTest.java | 7 +- .../MavenITmng4172EmptyDependencySetTest.java | 7 +- ...nITmng4180PerDependencyExclusionsTest.java | 7 +- ...venITmng4189UniqueVersionSnapshotTest.java | 5 +- .../MavenITmng4190MirrorRepoMergingTest.java | 7 +- .../it/MavenITmng4193UniqueRepoIdTest.java | 8 +- ...avenITmng4196ExclusionOnPluginDepTest.java | 7 +- ...ITmng4199CompileMeetsRuntimeScopeTest.java | 7 +- ...4203TransitiveDependencyExclusionTest.java | 7 +- .../it/MavenITmng4207PluginWithLog4JTest.java | 7 +- ...olationPrefersCliOverProjectPropsTest.java | 7 +- ...Tmng4214MirroredParentSearchReposTest.java | 7 +- ...avenITmng4231SnapshotUpdatePolicyTest.java | 8 +- ...olutionForManuallyCreatedArtifactTest.java | 7 +- ...ng4235HttpAuthDeploymentChecksumsTest.java | 32 +++-- ...4238ArtifactHandlerExtensionUsageTest.java | 8 +- ...g4262MakeLikeReactorDottedPath370Test.java | 8 +- ...Tmng4262MakeLikeReactorDottedPathTest.java | 6 +- ...269BadReactorResolutionFromOutDirTest.java | 7 +- ...270ArtifactHandlersFromPluginDepsTest.java | 8 +- ...estrictedCoreRealmAccessForPluginTest.java | 7 +- ...avenITmng4274PluginRealmArtifactsTest.java | 7 +- .../MavenITmng4275RelocationWarningTest.java | 7 +- ...mng4276WrongTransitivePlexusUtilsTest.java | 7 +- ...MavenITmng4281PreferLocalSnapshotTest.java | 7 +- .../MavenITmng4283ParentPomPackagingTest.java | 8 +- ...enITmng4291MojoRequiresOnlineModeTest.java | 9 +- ...enITmng4292EnumTypeMojoParametersTest.java | 7 +- ...93RequiresCompilePlusRuntimeScopeTest.java | 7 +- ...mng4304ProjectDependencyArtifactsTest.java | 7 +- .../MavenITmng4305LocalRepoBasedirTest.java | 7 +- ...rictChecksumValidationForMetadataTest.java | 6 +- ...luginParameterExpressionInjectionTest.java | 7 +- ...g4314DirectInvocationOfAggregatorTest.java | 7 +- ...inVersionResolutionFromMultiReposTest.java | 7 +- ...avenITmng4318ProjectExecutionRootTest.java | 7 +- ...9PluginExecutionGoalInterpolationTest.java | 7 +- ...Tmng4320AggregatorAndDependenciesTest.java | 7 +- ...nITmng4321CliUsesPluginMgmtConfigTest.java | 7 +- ...ocalSnapshotSuppressesRemoteCheckTest.java | 18 ++- ...udeForkingMojoFromForkedLifecycleTest.java | 7 +- ...imitiveMojoParameterConfigurationTest.java | 7 +- ...avenITmng4331DependencyCollectionTest.java | 8 +- ...ng4332DefaultPluginExecutionOrderTest.java | 7 +- ...MavenITmng4335SettingsOfflineModeTest.java | 8 +- .../it/MavenITmng4338OptionalMojosTest.java | 7 +- ...avenITmng4341PluginExecutionOrderTest.java | 7 +- ...pendentMojoParameterDefaultValuesTest.java | 7 +- ...mng4343MissingReleaseUpdatePolicyTest.java | 30 ++-- ...ng4344ManagedPluginExecutionOrderTest.java | 7 +- ...ng4345DefaultPluginExecutionOrderTest.java | 7 +- ...47ImportScopeWithSettingsProfilesTest.java | 7 +- ...4348NoUnnecessaryRepositoryAccessTest.java | 18 ++- ...49RelocatedArtifactWithInvalidPomTest.java | 7 +- ...350LifecycleMappingExecutionOrderTest.java | 7 +- ...inDependencyResolutionFromPomRepoTest.java | 7 +- ...tensionAutomaticVersionResolutionTest.java | 7 +- ...dlessRelookupFromActiveCollectionTest.java | 9 +- ...ifecycleMappingDiscoveryInReactorTest.java | 7 +- ...lyReachableParentOutsideOfReactorTest.java | 7 +- .../it/MavenITmng4360WebDavSupportTest.java | 19 ++- ...4361ForceDependencySnapshotUpdateTest.java | 7 +- ...namicAdditionOfDependencyArtifactTest.java | 7 +- ...Tmng4365XmlMarkupInAttributeValueTest.java | 7 +- ...mng4367LayoutAwareMirrorSelectionTest.java | 9 +- ...68TimestampAwareArtifactInstallerTest.java | 10 +- ...eSystemPathInterpolatedWithEnvVarTest.java | 7 +- ...ng4381ExtensionSingletonComponentTest.java | 7 +- ...enITmng4383ValidDependencyVersionTest.java | 8 +- ...ycleMappingFromExtensionInReactorTest.java | 8 +- .../it/MavenITmng4386DebugLoggingTest.java | 7 +- .../it/MavenITmng4387QuietLoggingTest.java | 7 +- ...g4393ParseExternalParenPomLenientTest.java | 7 +- ...enITmng4396AntBased20xMojoSupportTest.java | 7 +- .../it/MavenITmng4400RepositoryOrderTest.java | 8 +- ...ng4401RepositoryOrderForParentPomTest.java | 7 +- ...avenITmng4402DuplicateChildModuleTest.java | 8 +- ...ng4403LenientDependencyPomParsingTest.java | 7 +- .../it/MavenITmng4404UniqueProfileIdTest.java | 8 +- .../MavenITmng4405ValidPluginVersionTest.java | 8 +- ...nITmng4408NonExistentSettingsFileTest.java | 9 +- .../maven/it/MavenITmng4410UsageHelpTest.java | 7 +- .../it/MavenITmng4411VersionInfoTest.java | 5 +- ...MavenITmng4412OfflineModeInPluginTest.java | 9 +- ...Tmng4413MirroringOfDependencyRepoTest.java | 11 +- ...avenITmng4415InheritedPluginOrderTest.java | 7 +- ...6PluginOrderAfterProfileInjectionTest.java | 7 +- ...ecatedPomInterpolationExpressionsTest.java | 7 +- ...PluginExecutionPhaseInterpolationTest.java | 7 +- ...DataFromPluginParameterExpressionTest.java | 7 +- .../MavenITmng4428FollowHttpRedirectTest.java | 24 ++-- ...29CompRequirementOnNonDefaultImplTest.java | 7 +- ...g4430DistributionManagementStatusTest.java | 8 +- ...Tmng4433ForceParentSnapshotUpdateTest.java | 7 +- ...ITmng4436SingletonComponentLookupTest.java | 7 +- ...0StubModelForMissingDependencyPomTest.java | 7 +- ...esolutionOfSnapshotWithClassifierTest.java | 7 +- ...PluginVersionFromLifecycleMappingTest.java | 7 +- ...4459InMemorySettingsKeptEncryptedTest.java | 7 +- ...venITmng4461ArtifactUploadMonitorTest.java | 7 +- ...pendencyManagementImportVersionRanges.java | 9 +- ...4PlatformIndependentFileSeparatorTest.java | 7 +- ...ginPrefixFromLocalCacheOfDownRepoTest.java | 5 +- ...thenticatedDeploymentToCustomRepoTest.java | 20 ++- ...470AuthenticatedDeploymentToProxyTest.java | 29 ++-- ...ng4474PerLookupWagonInstantiationTest.java | 7 +- ...ectLevelPluginDepUsedForCliConfigTest.java | 5 +- ...Tmng4482ForcePluginSnapshotUpdateTest.java | 11 +- ...88ValidateExternalParenPomLenientTest.java | 7 +- ...ITmng4489MirroringOfExtensionRepoTest.java | 11 +- ...avenITmng4498IgnoreBrokenMetadataTest.java | 7 +- ...500NoUpdateOfTimestampedSnapshotsTest.java | 22 +-- ...ailUponMissingDependencyParentPomTest.java | 8 +- ...mng4526MavenProjectArtifactsScopeTest.java | 7 +- ...cludeWagonsFromMavenCoreArtifactsTest.java | 7 +- ...g4536RequiresNoProjectForkingMojoTest.java | 7 +- ...tiveComponentCollectionThreadSafeTest.java | 7 +- ...oreArtifactFilterConsidersGroupIdTest.java | 7 +- ...Tmng4554PluginPrefixMappingUpdateTest.java | 26 ++-- ...g4555MetaversionResolutionOfflineTest.java | 19 ++- ...venITmng4561MirroringOfPluginRepoTest.java | 11 +- ...65MultiConditionProfileActivationTest.java | 7 +- ...odelVersionSurroundedByWhitespaceTest.java | 7 +- ...PluginDepUsedForCliInvocInReactorTest.java | 7 +- ...solutionFromVersionlessPluginMgmtTest.java | 7 +- ...90ImportedPomUsesSystemPropertiesTest.java | 7 +- ...0DependencyOptionalFlagManagementTest.java | 8 +- ...15ValidateRequiredPluginParameterTest.java | 12 +- ...ng4618AggregatorBuiltAfterModulesTest.java | 7 +- ...ingsXmlInterpolationWithXmlMarkupTest.java | 9 +- ...lidationErrorUponMissingSystemDepTest.java | 7 +- ...33DualCompilerExecutionsWeaveModeTest.java | 9 +- ...ictPomParsingRejectsMisplacedTextTest.java | 8 +- ...654ArtifactHandlerForMainArtifactTest.java | 7 +- ...avenITmng4660OutdatedPackagedArtifact.java | 15 +- .../it/MavenITmng4660ResumeFromTest.java | 9 +- .../it/MavenITmng4666CoreRealmImportTest.java | 7 +- ...77DisabledPluginConfigInheritanceTest.java | 7 +- ...enITmng4679SnapshotUpdateInPluginTest.java | 7 +- ...ng4684DistMgmtOverriddenByProfileTest.java | 7 +- ...0InterdependentConflictResolutionTest.java | 12 +- ...96MavenProjectDependencyArtifactsTest.java | 7 +- ...ependencyManagementExclusionMergeTest.java | 7 +- ...ITmng4721OptionalPluginDependencyTest.java | 7 +- ...rrorProxyAuthUsedByProjectBuilderTest.java | 11 +- ...MavenITmng4745PluginVersionUpdateTest.java | 11 +- ...venITmng4747JavaAgentUsedByPluginTest.java | 7 +- ...edMavenProjectDependencyArtifactsTest.java | 7 +- ...etchRemoteMetadataForVersionRangeTest.java | 7 +- ...ng4761PluginLevelDependencyScopesTest.java | 9 +- ...enITmng4765LocalPomProjectBuilderTest.java | 7 +- ...768NearestMatchConflictResolutionTest.java | 12 +- ...ResolutionDoesntTouchDisabledRepoTest.java | 21 +-- ...ResolutionDoesntTouchDisabledRepoTest.java | 21 +-- ...kedReactorPluginVersionResolutionTest.java | 8 +- ...DepsWithVersionRangeFromLocalRepoTest.java | 7 +- ...g4781DeploymentToNexusStagingRepoTest.java | 33 +++-- ...ransitiveResolutionInForkedThreadTest.java | 7 +- ...enITmng4786AntBased21xMojoSupportTest.java | 7 +- ...4788InstallationToCustomLocalRepoTest.java | 7 +- ...4789ScopeInheritanceMeetsConflictTest.java | 7 +- ...tBuilderResolvesRemotePomArtifactTest.java | 7 +- ...InReactorProjectForkedByLifecycleTest.java | 7 +- ...mng4800NearestWinsVsScopeWideningTest.java | 8 +- ...ng4811CustomComponentConfiguratorTest.java | 7 +- ...lutionOfDependenciesDuringReactorTest.java | 7 +- ...enITmng4829ChecksumFailureWarningTest.java | 7 +- ...entProjectResolvedFromRemoteReposTest.java | 7 +- .../MavenITmng4840MavenPrerequisiteTest.java | 8 +- ...42ParentResolutionOfDependencyPomTest.java | 8 +- ...rResolutionAttachedWithExclusionsTest.java | 7 +- ...Tmng4874UpdateLatestPluginVersionTest.java | 5 +- ...venITmng4877DeployUsingPrivateKeyTest.java | 7 +- ...lUponOverconstrainedVersionRangesTest.java | 7 +- ...0MakeLikeReactorConsidersVersionsTest.java | 8 +- ...ITmng4891RobustSnapshotResolutionTest.java | 7 +- ...PluginDepWithNonRelocatedMavenApiTest.java | 7 +- ...erPropertyVsDependencyPomPropertyTest.java | 7 +- ...LifecycleMappingWithSameGoalTwiceTest.java | 7 +- ...ontainerLookupRealmDuringMojoExecTest.java | 7 +- .../maven/it/MavenITmng4936EventSpyTest.java | 7 +- ...Tmng4952MetadataReleaseInfoUpdateTest.java | 5 +- ...55LocalVsRemoteSnapshotResolutionTest.java | 7 +- ...venITmng4960MakeLikeReactorResumeTest.java | 8 +- ...mng4963ParentResolutionFromMirrorTest.java | 7 +- ...nITmng4966AbnormalUrlPreservationTest.java | 7 +- ...ExtensionVisibleToPluginInReactorTest.java | 7 +- ...ofileInjectedPluginExecutionOrderTest.java | 7 +- ...87TimestampBasedSnapshotSelectionTest.java | 7 +- .../it/MavenITmng4991NonProxyHostsTest.java | 15 +- ...4992MapStylePropertiesParamConfigTest.java | 7 +- ...g5000ChildPathAwareUrlInheritanceTest.java | 7 +- ...onRangeDependencyParentResolutionTest.java | 7 +- .../MavenITmng5009AggregationCycleTest.java | 7 +- ...gureCollectionArrayFromSystemPropTest.java | 7 +- ...012CollectionVsArrayParamCoercionTest.java | 7 +- ...ConfigureParamBeanFromScalarValueTest.java | 7 +- ...sedCompLookupFromChildPluginRealmTest.java | 7 +- ...nITmng5064SuppressSnapshotUpdatesTest.java | 22 +-- ...AtDependencyWithImpliedClassifierTest.java | 7 +- ...gatorDepResolutionModuleExtensionTest.java | 7 +- ...137ReactorResolutionInForkedBuildTest.java | 7 +- .../maven/it/MavenITmng5175WagonHttpTest.java | 24 ++-- ...MavenITmng5206PlexusLifecycleHonoured.java | 9 +- .../MavenITmng5208EventSpyParallelTest.java | 8 +- .../it/MavenITmng5214DontMapWsdlToJar.java | 7 +- .../it/MavenITmng5222MojoDeprecatedTest.java | 7 +- .../it/MavenITmng5224InjectedSettings.java | 11 +- ...nITmng5230MakeReactorWithExcludesTest.java | 15 +- ...SettingsProfilesRepositoriesOrderTest.java | 23 +-- .../MavenITmng5338FileOptionToDirectory.java | 18 +-- .../maven/it/MavenITmng5382Jsr330Plugin.java | 19 +-- ...venITmng5387ArtifactReplacementPlugin.java | 21 ++- ...89LifecycleParticipantAfterSessionEnd.java | 5 +- ...418FileProjectPropertiesActivatorTest.java | 9 +- ...gacyStringSearchModelInterpolatorTest.java | 5 +- ...enITmng5452MavenBuildTimestampUTCTest.java | 7 +- .../it/MavenITmng5482AetherNotFoundTest.java | 9 +- .../it/MavenITmng5503ZipInReactorTest.java | 9 +- .../MavenITmng5530MojoExecutionScopeTest.java | 7 +- ...venITmng5557ProperlyRestrictedReactor.java | 8 +- ...luginRelocationLosesConfigurationTest.java | 5 +- ...nITmng5572ReactorPluginExtensionsTest.java | 7 +- .../it/MavenITmng5576CdFriendlyVersions.java | 8 +- .../it/MavenITmng5578SessionScopeTest.java | 8 +- ...avenITmng5581LifecycleMappingDelegate.java | 6 +- .../it/MavenITmng5591WorkspaceReader.java | 5 +- ...ITmng5608ProfileActivationWarningTest.java | 7 +- ...ITmng5639ImportScopePomResolutionTest.java | 7 +- ...40LifecycleParticipantAfterSessionEnd.java | 13 +- ...663NestedImportScopePomResolutionTest.java | 7 +- .../maven/it/MavenITmng5669ReadPomsOnce.java | 6 +- .../it/MavenITmng5716ToolchainsTypeTest.java | 7 +- ...Tmng5742BuildExtensionClassloaderTest.java | 5 +- ...53CustomMojoExecutionConfiguratorTest.java | 5 +- .../it/MavenITmng5760ResumeFeatureTest.java | 13 +- .../it/MavenITmng5768CliExecutionIdTest.java | 5 +- .../it/MavenITmng5771CoreExtensionsTest.java | 9 +- ...nITmng5774ConfigurationProcessorsTest.java | 7 +- ...venITmng5783PluginDependencyFiltering.java | 5 +- ...venITmng5805PkgTypeMojoConfiguration2.java | 5 +- .../it/MavenITmng5840ParentVersionRanges.java | 8 +- ...nITmng5840RelativePathReactorMatching.java | 7 +- ...ITmng5868NoDuplicateAttachedArtifacts.java | 26 ++-- .../maven/it/MavenITmng5889FindBasedir.java | 13 +- ...ng5895CIFriendlyUsageWithPropertyTest.java | 8 +- ...ltimoduleWithEARFailsToResolveWARTest.java | 7 +- ...ostInTranstiveManagedDependenciesTest.java | 5 +- ...enITmng5958LifecyclePhaseBinaryCompat.java | 7 +- ...ng5965ParallelBuildMultipliesWorkTest.java | 6 +- .../MavenITmng6057CheckReactorOrderTest.java | 7 +- .../it/MavenITmng6065FailOnSeverityTest.java | 9 +- ...avenITmng6071GetResourceWithCustomPom.java | 7 +- .../it/MavenITmng6084Jsr250PluginTest.java | 19 +-- .../it/MavenITmng6090CIFriendlyTest.java | 8 +- .../it/MavenITmng6118SubmoduleInvocation.java | 8 +- ...xecutionConfigurationInterferenceTest.java | 5 +- ...nITmng6173GetAllProjectsInReactorTest.java | 13 +- ...6173GetProjectsAndDependencyGraphTest.java | 9 +- ...ITmng6189SiteReportPluginsWarningTest.java | 7 +- ...mng6210CoreExtensionsCustomScopesTest.java | 5 +- .../maven/it/MavenITmng6223FindBasedir.java | 41 +++++- ...Tmng6240PluginExtensionAetherProvider.java | 5 +- .../it/MavenITmng6255FixConcatLines.java | 12 +- ...g6256SpecialCharsAlternatePOMLocation.java | 11 +- ...enITmng6326CoreExtensionsNotFoundTest.java | 6 +- .../maven/it/MavenITmng6330RelativePath.java | 11 +- .../it/MavenITmng6386BaseUriPropertyTest.java | 15 +- .../it/MavenITmng6391PrintVersionTest.java | 8 +- .../MavenITmng6506PackageAnnotationTest.java | 5 +- ...ITmng6511OptionalProjectSelectionTest.java | 12 +- ...nITmng6558ToolchainsBuildingEventTest.java | 7 +- .../it/MavenITmng6562WarnDefaultBindings.java | 14 +- ...AnnotationShouldNotReExecuteGoalsTest.java | 14 +- .../maven/it/MavenITmng6656BuildConsumer.java | 9 +- .../maven/it/MavenITmng6720FailFastTest.java | 12 +- ...Tmng6754TimestampInMultimoduleProject.java | 6 +- ...9TransitiveDependencyRepositoriesTest.java | 6 +- ...72NestedImportScopeRepositoryOverride.java | 27 +--- .../maven/it/MavenITmng6957BuildConsumer.java | 9 +- ...Tmng6972AllowAccessToGraphPackageTest.java | 5 +- ...1ProjectListShouldIncludeChildrenTest.java | 9 +- ...g7045DropUselessAndOutdatedCdiApiTest.java | 6 +- ...Tmng7051OptionalProfileActivationTest.java | 12 +- .../MavenITmng7110ExtensionClassloader.java | 6 +- ...ITmng7112ProjectsWithNonRecursiveTest.java | 9 +- ...ITmng7128BlockExternalHttpReactorTest.java | 8 +- .../MavenITmng7160ExtensionClassloader.java | 9 +- ...ITmng7244IgnorePomPrefixInExpressions.java | 8 +- ...venITmng7335MissingJarInParallelBuild.java | 6 +- .../MavenITmng7349RelocationWarningTest.java | 5 +- .../MavenITmng7353CliGoalInvocationTest.java | 12 +- .../maven/it/MavenITmng7360BuildConsumer.java | 5 +- ...enITmng7390SelectModuleOutsideCwdTest.java | 15 +- ...ng7404IgnorePrefixlessExpressionsTest.java | 8 +- ...encyOfOptionalProjectsAndProfilesTest.java | 13 +- ...7464ReadOnlyMojoParametersWarningTest.java | 7 +- ...g7468UnsupportedPluginsParametersTest.java | 14 +- .../MavenITmng7470ResolverTransportTest.java | 13 +- .../it/MavenITmng7474SessionScopeTest.java | 5 +- .../maven/it/MavenITmng7487DeadlockTest.java | 6 +- ...04NotWarnUnsupportedReportPluginsTest.java | 6 +- ...ng7529VersionRangeRepositorySelection.java | 7 +- ...nTestSuite.java => TestSuiteOrdering.java} | 121 ++++++++++------ .../apache/maven/it/TunnelingProxyServer.java | 1 + .../src/test/resources-filtered/bootstrap.txt | 3 + .../test/resources/junit-platform.properties | 1 + .../maven-it-plugin-class-loader/pom.xml | 5 +- .../plugin/coreit/ExpressionUtilTest.java | 13 +- .../maven-it-plugin-expression/pom.xml | 5 +- .../plugin/coreit/ExpressionUtilTest.java | 15 +- .../maven/plugin/coreit/PropertyUtilTest.java | 16 ++- .../plugin/coreit/PathInterpolationMojo.java | 11 +- .../coreit/PluginParamInterpolationMojo.java | 12 +- .../coreit/PropertyInterpolationMojo.java | 6 +- .../PropertyInterpolationVerifierMojo.java | 4 + core-it-support/core-it-plugins/pom.xml | 13 -- core-it-support/maven-it-helper/pom.xml | 5 +- .../it/AbstractMavenIntegrationTestCase.java | 135 +++++++++++++++--- .../it/MavenIntegrationTestCaseTest.java | 8 +- .../maven-it-plugin-bootstrap/pom.xml | 5 + ...avenITmngXXXXDescriptionOfProblemTest.java | 4 +- pom.xml | 19 ++- 660 files changed, 4016 insertions(+), 1622 deletions(-) rename core-it-suite/src/test/java/org/apache/maven/it/{IntegrationTestSuite.java => TestSuiteOrdering.java} (94%) create mode 100644 core-it-suite/src/test/resources/junit-platform.properties diff --git a/core-it-suite/pom.xml b/core-it-suite/pom.xml index 3e225ee7b..e3b8be7a3 100644 --- a/core-it-suite/pom.xml +++ b/core-it-suite/pom.xml @@ -88,17 +88,10 @@ under the License. - junit - junit - 4.12 + org.junit.jupiter + junit-jupiter - - org.hamcrest - hamcrest-all - 1.3 - test - org.codehaus.plexus plexus-utils @@ -166,9 +159,10 @@ under the License. maven-surefire-plugin - **/IntegrationTestSuite.java + **/MavenIT*.java - never + 0 + true true @@ -318,7 +312,8 @@ under the License. maven-surefire-plugin false - once + 1 + true ${surefireMemory} -Dcom.sun.management.jmxremote=true diff --git a/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java b/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java index 53c5e97a9..b1920f86c 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java @@ -19,29 +19,33 @@ * under the License. */ -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; + /** * @author Benjamin Bentmann * */ public class ExpressionUtilTest - extends TestCase { + @Test public void testEvaluate() { Object array = new String[]{ "one", "two", "three" }; - Object list = Arrays.asList( new String[]{ "0", "-1", "-2" } ); + Object list = Arrays.asList( "0", "-1", "-2" ); Object map = Collections.singletonMap( "some.key", "value" ); Object bean = new BeanTwo(); - Map contexts = new HashMap(); + Map contexts = new HashMap<>(); contexts.put( "array", array ); contexts.put( "list", list ); contexts.put( "map", map ); @@ -78,6 +82,7 @@ public void testEvaluate() assertEquals( "arg", ExpressionUtil.evaluate( "bean/bean/arg", contexts ) ); } + @Test public void testGetProperty() { BeanOne bean1 = new BeanOne(); diff --git a/core-it-support/core-it-plugins/maven-it-plugin-expression/pom.xml b/core-it-support/core-it-plugins/maven-it-plugin-expression/pom.xml index c24a8ec99..4212fe116 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-expression/pom.xml +++ b/core-it-support/core-it-plugins/maven-it-plugin-expression/pom.xml @@ -45,9 +45,8 @@ under the License. 2.0 - junit - junit - 3.8.2 + org.junit.jupiter + junit-jupiter test diff --git a/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java b/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java index cc5dd5258..f30a94a8c 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java @@ -19,29 +19,33 @@ * under the License. */ -import junit.framework.TestCase; - import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; + /** * @author Benjamin Bentmann * */ public class ExpressionUtilTest - extends TestCase { + @Test public void testEvaluate() { Object array = new String[]{ "one", "two", "three" }; - Object list = Arrays.asList( new String[]{ "0", "-1", "-2" } ); + Object list = Arrays.asList( "0", "-1", "-2" ); Object map = Collections.singletonMap( "some.key", "value" ); Object bean = new BeanTwo(); - Map contexts = new HashMap(); + Map contexts = new HashMap<>(); contexts.put( "array", array ); contexts.put( "list", list ); contexts.put( "map", map ); @@ -91,6 +95,7 @@ private static Object evaluate( String expression, Object context ) return ExpressionUtil.evaluate( expression, context ).get( expression ); } + @Test public void testGetProperty() { BeanOne bean1 = new BeanOne(); diff --git a/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/PropertyUtilTest.java b/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/PropertyUtilTest.java index df39b3e09..3d8dc1f63 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/PropertyUtilTest.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/PropertyUtilTest.java @@ -19,21 +19,25 @@ * under the License. */ -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.Arrays; import java.util.Collections; import java.util.Properties; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * @author Benjamin Bentmann * */ public class PropertyUtilTest - extends TestCase { + @Test public void testStoreScalar() { Properties props = new Properties(); @@ -51,6 +55,7 @@ public void testStoreScalar() assertEquals( 4, props.size() ); } + @Test public void testStoreArray() { Properties props = new Properties(); @@ -62,6 +67,7 @@ public void testStoreArray() assertEquals( 3, props.size() ); } + @Test public void testStoreList() { Properties props = new Properties(); @@ -73,6 +79,7 @@ public void testStoreList() assertEquals( 3, props.size() ); } + @Test public void testStoreMap() { Properties props = new Properties(); @@ -83,6 +90,7 @@ public void testStoreMap() assertEquals( 2, props.size() ); } + @Test public void testStoreBean() { Properties props = new Properties(); @@ -93,6 +101,7 @@ public void testStoreBean() assertEquals( 2, props.size() ); } + @Test public void testStoreCycle() { Object[] arr = { null }; @@ -100,9 +109,10 @@ public void testStoreCycle() Properties props = new Properties(); PropertyUtil.store( props, "cycle", arr ); - assertTrue( "Should not die because of stack overflow", true ); + assertTrue( true, "Should not die because of stack overflow" ); } + @Test public void testGetPropertyName() { assertEquals( "name", PropertyUtil.getPropertyName( "getName" ) ); diff --git a/core-it-support/core-it-plugins/maven-it-plugin-model-interpolation/src/main/java/org/apache/maven/plugin/coreit/PathInterpolationMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-model-interpolation/src/main/java/org/apache/maven/plugin/coreit/PathInterpolationMojo.java index 5f2b01476..fdca91423 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-model-interpolation/src/main/java/org/apache/maven/plugin/coreit/PathInterpolationMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-model-interpolation/src/main/java/org/apache/maven/plugin/coreit/PathInterpolationMojo.java @@ -35,10 +35,17 @@ public class PathInterpolationMojo extends AbstractMojo { - /** @component */ + /** + * The model interpolator + * @component + */ private ModelInterpolator modelInterpolator; - /** @parameter default-value="${project}" */ + /** + * The current Maven project. + * + * @parameter default-value="${project}" + */ private MavenProject project; public void execute() diff --git a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java index c06e4dfb4..7e4c4ebfc 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java @@ -33,10 +33,18 @@ public class PluginParamInterpolationMojo extends AbstractMojo { - /** @parameter */ + /** + * myDirectory + * + * @parameter + */ private String myDirectory; - /** @parameter default-value="${project}" */ + /** + * The current Maven project. + * + * @parameter default-value="${project}" + */ private MavenProject project; public void execute() diff --git a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java index 2bff6cd81..3177fbf4d 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java @@ -34,7 +34,11 @@ public class PropertyInterpolationMojo extends AbstractMojo { - /** @parameter default-value="${project}" */ + /** + * The current Maven project. + * + * @parameter default-value="${project}" + */ private MavenProject project; public void execute() diff --git a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java index fb11cf15b..5de48c06e 100644 --- a/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java +++ b/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationVerifierMojo.java @@ -37,11 +37,15 @@ public class PropertyInterpolationVerifierMojo { /** + * The current Maven project. + * * @parameter default-value="${project}" */ private MavenProject project; /** + * The properties. + * * @parameter property="properties" */ private Properties properties; diff --git a/core-it-support/core-it-plugins/pom.xml b/core-it-support/core-it-plugins/pom.xml index ed0e815a5..2bcf95a7f 100644 --- a/core-it-support/core-it-plugins/pom.xml +++ b/core-it-support/core-it-plugins/pom.xml @@ -105,24 +105,11 @@ under the License. https://repository.apache.org/content/repositories/snapshots - - - - - org.apache.maven.plugins - maven-plugin-plugin - 3.3 - - - - - org.apache.maven.plugins maven-plugin-plugin - 3.3 diff --git a/core-it-support/maven-it-helper/pom.xml b/core-it-support/maven-it-helper/pom.xml index 9019474f0..2fdc6f104 100644 --- a/core-it-support/maven-it-helper/pom.xml +++ b/core-it-support/maven-it-helper/pom.xml @@ -56,9 +56,8 @@ under the License. 0.1 - junit - junit - 3.8.2 + org.junit.jupiter + junit-jupiter 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 e1e4df43c..213291392 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 @@ -20,7 +20,9 @@ */ import java.io.File; +import java.io.FilterInputStream; import java.io.IOException; +import java.io.InputStream; import java.io.PrintStream; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; @@ -28,19 +30,23 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import junit.framework.TestCase; import org.apache.maven.artifact.versioning.ArtifactVersion; 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.utils.io.FileUtils; +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; +import org.opentest4j.TestAbortedException; /** * @author Jason van Zyl * @author Kenney Westerhof */ public abstract class AbstractMavenIntegrationTestCase - extends TestCase { /** * Save System.out for progress reports etc. @@ -70,6 +76,8 @@ public abstract class AbstractMavenIntegrationTestCase private String matchPattern; + private String testName; + private static final String DEFAULT_MATCH_PATTERN = "(.*?)-(RC[0-9]+|SNAPSHOT|RC[0-9]+-SNAPSHOT)"; protected static final String ALL_MAVEN_VERSIONS = "[2.0,)"; @@ -83,24 +91,16 @@ protected AbstractMavenIntegrationTestCase( String versionRangeStr, String match { this.matchPattern = matchPattern; - try - { - versionRange = VersionRange.createFromVersionSpec( versionRangeStr ); - } - catch ( InvalidVersionSpecificationException e ) - { - throw (RuntimeException) new IllegalArgumentException( "Invalid version range: " + versionRangeStr, e ); - } + requiresMavenVersion( versionRangeStr ); + } - ArtifactVersion version = getMavenVersion(); - if ( version != null ) - { - skip = !versionRange.containsVersion( removePattern( version ) ); - } - else + + @BeforeAll + static void setupInputStream() + { + if ( !( System.in instanceof NonCloseableInputStream ) ) { - out.println( "WARNING: " + getITName() + ": version range '" + versionRange - + "' supplied but no Maven version - not skipping test." ); + System.setIn( new NonCloseableInputStream( System.in ) ); } } @@ -257,7 +257,8 @@ protected void runTest() long milliseconds = System.currentTimeMillis(); try { - super.runTest(); + // TODO: JUNIT5 + //super.runTest(); milliseconds = System.currentTimeMillis() - milliseconds; if ( invert != null ) { @@ -397,8 +398,21 @@ protected void failingMavenVersions( String versionRange ) } } + private static class NonCloseableInputStream extends FilterInputStream + { + NonCloseableInputStream( InputStream delegate ) + { + super( delegate ); + } + + @Override + public void close() throws IOException + { + } + } + private class UnsupportedJavaVersionException - extends RuntimeException + extends TestAbortedException { @SuppressWarnings( "checkstyle:visibilitymodifier" ) public ArtifactVersion javaVersion; @@ -408,6 +422,7 @@ private class UnsupportedJavaVersionException private UnsupportedJavaVersionException( ArtifactVersion javaVersion, VersionRange supportedRange ) { + super( "Java version " + javaVersion + " not in range " + supportedRange ); this.javaVersion = javaVersion; this.supportedRange = supportedRange; } @@ -415,7 +430,7 @@ private UnsupportedJavaVersionException( ArtifactVersion javaVersion, VersionRan } private class UnsupportedMavenVersionException - extends RuntimeException + extends TestAbortedException { @SuppressWarnings( "checkstyle:visibilitymodifier" ) public ArtifactVersion mavenVersion; @@ -425,6 +440,7 @@ private class UnsupportedMavenVersionException private UnsupportedMavenVersionException( ArtifactVersion mavenVersion, VersionRange supportedRange ) { + super( "Maven version " + mavenVersion + " not in range " + supportedRange ); this.mavenVersion = mavenVersion; this.supportedRange = supportedRange; } @@ -619,6 +635,17 @@ protected Verifier newVerifier( String basedir, String settings, boolean debug ) return verifier; } + @BeforeEach + void setupContext( TestInfo testInfo ) + { + testName = testInfo.getTestMethod().get().getName(); + } + + protected String getName() + { + return testName; + } + public static void assertCanonicalFileEquals( String message, File expected, File actual ) throws IOException { @@ -642,4 +669,70 @@ public static void assertCanonicalFileEquals( String expected, String actual ) { assertCanonicalFileEquals( null, new File( expected ), new File( actual ) ); } + + public static void assertEquals( Object o1, Object o2 ) + { + assertEquals( null, o1, o2 ); + } + + public static void assertEquals( String message, Object o1, Object o2 ) + { + org.junit.jupiter.api.Assertions.assertEquals( o1, o2, message ); + } + + public static void assertNotEquals( Object o1, Object o2 ) + { + assertNotEquals( null, o1, o2 ); + } + + public static void assertNotEquals( String message, Object o1, Object o2 ) + { + org.junit.jupiter.api.Assertions.assertNotEquals( o1, o2, message ); + } + + public static void assertTrue( boolean test ) + { + assertTrue( null, test ); + } + + public static void assertTrue( String message, boolean test ) + { + org.junit.jupiter.api.Assertions.assertTrue( test, message ); + } + + public static void assertFalse( boolean test ) + { + assertFalse( null, test ); + } + + public static void assertFalse( String message, boolean test ) + { + org.junit.jupiter.api.Assertions.assertFalse( test, message ); + } + + public static void assertNotNull( Object o ) + { + assertNotNull( null, o ); + } + + public static void assertNotNull( String message, Object o ) + { + org.junit.jupiter.api.Assertions.assertNotNull( o, message ); + } + + public static void assertNull( Object o ) + { + assertNull( null, o ); + } + + public static void assertNull( String message, Object o ) + { + org.junit.jupiter.api.Assertions.assertNull( o, message ); + } + + public static void fail( String message ) + { + org.junit.jupiter.api.Assertions.fail( message ); + } + } diff --git a/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/MavenIntegrationTestCaseTest.java b/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/MavenIntegrationTestCaseTest.java index 69509cced..3971d8132 100644 --- a/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/MavenIntegrationTestCaseTest.java +++ b/core-it-support/maven-it-helper/src/test/java/org/apache/maven/it/MavenIntegrationTestCaseTest.java @@ -19,14 +19,15 @@ * under the License. */ -import junit.framework.TestCase; - import org.apache.maven.artifact.versioning.DefaultArtifactVersion; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class MavenIntegrationTestCaseTest - extends TestCase { + @Test public void testRemovePatternForTestWithVersionRange() { AbstractMavenIntegrationTestCase test = new AbstractMavenIntegrationTestCase( "[2.0,)" ) @@ -49,6 +50,7 @@ private static void assertVersionEquals( String expected, String version, Abstra assertEquals( expected, test.removePattern( new DefaultArtifactVersion( version ) ).toString() ); } + @Test public void testRequiresMavenVersion() { System.setProperty( "maven.version", "2.1" ); diff --git a/core-it-support/maven-it-plugin-bootstrap/pom.xml b/core-it-support/maven-it-plugin-bootstrap/pom.xml index 841f9efed..4eef3049f 100644 --- a/core-it-support/maven-it-plugin-bootstrap/pom.xml +++ b/core-it-support/maven-it-plugin-bootstrap/pom.xml @@ -57,6 +57,11 @@ under the License. maven-resolver-impl ${mavenResolverVersion} + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.3 + diff --git a/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java b/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java index b4e1079d3..8f8bd59b7 100644 --- a/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java +++ b/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.util.ResourceExtractor; /** * This is a sample integration test. The IT tests typically diff --git a/pom.xml b/pom.xml index 94da15236..b6bd4463c 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,12 @@ under the License. org.apache.maven.shared maven-verifier - 1.8.0 + 2.0.0-SNAPSHOT + + + org.junit.jupiter + junit-jupiter + 5.8.0 @@ -136,7 +141,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin - 2.22.0 + 3.0.0-M7 true @@ -194,6 +199,16 @@ under the License. + + org.apache.maven.plugins + maven-resources-plugin + 3.2.0 + + + org.apache.maven.plugins + maven-plugin-plugin + 3.6.4 + From a57c85c784732c8736405eac2cddbb3aa3f08a64 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 12 Sep 2022 11:49:58 +0200 Subject: [PATCH 2/6] Add missing tests, move disabled test comments to the test itself --- .../org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java | 4 ++-- .../it/MavenITmng1493NonStandardModulePomNamesTest.java | 2 ++ .../org/apache/maven/it/MavenITmng2254PomEncodingTest.java | 2 ++ .../it/MavenITmng3038TransitiveDepManVersionTest.java | 2 +- .../maven/it/MavenITmng3052DepRepoAggregationTest.java | 2 ++ ...avenITmng3092SnapshotsExcludedFromVersionRangeTest.java | 2 +- .../maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java | 2 ++ .../MavenITmng3259DepsDroppedInMultiModuleBuildTest.java | 2 ++ .../maven/it/MavenITmng3314OfflineSnapshotsTest.java | 2 ++ .../it/MavenITmng3331ModulePathNormalizationTest.java | 3 +++ .../it/MavenITmng3394POMPluginVersionDominanceTest.java | 1 + .../maven/it/MavenITmng3485OverrideWagonExtensionTest.java | 2 ++ .../apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java | 2 ++ .../maven/it/MavenITmng3642DynamicResourcesTest.java | 2 ++ .../it/MavenITmng3671PluginLevelDepInterpolationTest.java | 2 ++ .../it/MavenITmng3679PluginExecIdInterpolationTest.java | 2 ++ .../maven/it/MavenITmng3680InvalidDependencyPOMTest.java | 2 ++ .../maven/it/MavenITmng3684BuildPluginParameterTest.java | 2 ++ .../maven/it/MavenITmng3693PomFileBasedirChangeTest.java | 2 ++ .../it/MavenITmng3694ReactorProjectsDynamismTest.java | 2 ++ .../maven/it/MavenITmng3723ConcreteParentProjectTest.java | 2 ++ .../maven/it/MavenITmng3724ExecutionProjectSyncTest.java | 2 ++ .../maven/it/MavenITmng3729MultiForkAggregatorsTest.java | 2 ++ .../MavenITmng3740SelfReferentialReactorProjectsTest.java | 2 ++ .../maven/it/MavenITmng3747PrefixedPathExpressionTest.java | 2 ++ .../MavenITmng3890TransitiveDependencyScopeUpdateTest.java | 2 +- .../test/java/org/apache/maven/it/TestSuiteOrdering.java | 7 ------- .../test/java/MavenITmngXXXXDescriptionOfProblemTest.java | 1 + .../maven/it/MavenITmngXXXXDescriptionOfProblemTest.java | 1 + 29 files changed, 51 insertions(+), 12 deletions(-) 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 74898d4db..420b5a9ed 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 @@ -36,9 +36,9 @@ /** * Downloads a snapshot dependency that was deployed with uniqueVersion = false, and checks it can be - * updated. See MNG-1908. + * updated. See MNG-1908. */ -@Disabled // MNG-3137 +@Disabled( "flaky test, see MNG-3137" ) public class MavenIT0108SnapshotUpdateTest extends AbstractMavenIntegrationTestCase { 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 dc1b78fd0..417d75d0a 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-1493. @@ -35,6 +36,7 @@ public MavenITmng1493NonStandardModulePomNamesTest() super( "(2.0.8,)" ); // 2.0.9+ (including snapshots) } + @Test public void testitMNG1493 () throws Exception { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java index 1d3212c2b..26b4db5a2 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 @@ -24,6 +24,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-2254: @@ -46,6 +47,7 @@ public MavenITmng2254PomEncodingTest() * * @throws Exception in case of failure */ + @Test public void testitMNG2254 () throws Exception { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java index c99f65195..4b38591a3 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 @@ -34,7 +34,7 @@ * @author Joakim Erdfelt * */ -@Disabled +@Disabled( "cannot reproduce" ) public class MavenITmng3038TransitiveDepManVersionTest extends AbstractMavenIntegrationTestCase { 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 9e71e0398..ee7258abc 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 @@ -24,6 +24,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3052. @@ -48,6 +49,7 @@ public MavenITmng3052DepRepoAggregationTest() super( "(2.0.9,)" ); // only test in 2.0.10+ } + @Test public void testitMNG3052 () throws Exception { 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 18b6ecdf5..bdded84b8 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 @@ -32,7 +32,7 @@ * * @author Benjamin Bentmann */ -@Disabled +@Disabled( "not fixed yet" ) public class MavenITmng3092SnapshotsExcludedFromVersionRangeTest extends AbstractMavenIntegrationTestCase { 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 3685208f1..1611e7e86 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3203. @@ -42,6 +43,7 @@ public MavenITmng3203DefaultLifecycleExecIdTest() super( "[2.2.0,)" ); } + @Test public void testitMNG3203 () throws Exception { 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 3458aa675..efe47a991 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3259. @@ -42,6 +43,7 @@ public MavenITmng3259DepsDroppedInMultiModuleBuildTest() super( "(2.0.8,)" ); } + @Test public void testitMNG3259 () throws Exception { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java index 140ee32b7..4cf865833 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3314. @@ -46,6 +47,7 @@ public MavenITmng3314OfflineSnapshotsTest() * * @throws Exception in case of failure */ + @Test public void testitMNG3314 () throws Exception { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java index 72acf9c82..fb4c62632 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3331. @@ -38,6 +39,7 @@ public MavenITmng3331ModulePathNormalizationTest() super( ALL_MAVEN_VERSIONS ); } + @Test public void testitMNG3331a () throws Exception { @@ -68,6 +70,7 @@ public void testitMNG3331a () verifier.resetStreams(); } + @Test public void testitMNG3331b () throws Exception { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java index 79c5680ed..902d90d21 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 @@ -44,6 +44,7 @@ public MavenITmng3394POMPluginVersionDominanceTest() super( "(2.0.8,)" ); // only test in 2.0.9+ } + @Test public void testitMNG3394a () throws Exception { 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 458117b24..84d13a91d 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3485. @@ -37,6 +38,7 @@ public MavenITmng3485OverrideWagonExtensionTest() super( "(2.0.8,3.0-alpha-1),[3.0-alpha-7,)" ); } + @Test public void testitMNG3485 () throws Exception { 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 a76a94ac1..286a4296c 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3498. @@ -41,6 +42,7 @@ public MavenITmng3498ForkToOtherMojoTest() super( ALL_MAVEN_VERSIONS ); } + @Test public void testitMNG3498 () throws Exception { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java index a6c2b2047..8e6298a03 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3642. @@ -41,6 +42,7 @@ public MavenITmng3642DynamicResourcesTest() super( "(2.0.9,)" ); // only test in 2.0.9+ } + @Test public void testitMNG3642 () throws Exception { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java index c7fdccff0..9c4bcb184 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3671. @@ -43,6 +44,7 @@ public MavenITmng3671PluginLevelDepInterpolationTest() super( "(2.0.8,)" ); // only test in 2.0.9+ } + @Test public void testitMNG3671 () throws Exception { 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 820bf649f..53de2b733 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3679: @@ -40,6 +41,7 @@ public MavenITmng3679PluginExecIdInterpolationTest() super( ALL_MAVEN_VERSIONS ); } + @Test public void testitMNG3679 () throws Exception { 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 ca902b624..89d96bc7e 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 @@ -24,6 +24,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3680. @@ -44,6 +45,7 @@ public MavenITmng3680InvalidDependencyPOMTest() * * @throws Exception in case of failure */ + @Test public void testitMNG3680 () throws Exception { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java index e65fea3ae..a102e1a90 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3684: @@ -39,6 +40,7 @@ public MavenITmng3684BuildPluginParameterTest() super( "(2.0.9,)" ); } + @Test public void testitMNG3684 () throws Exception { 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 e5787ea25..28bcce0d0 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 @@ -24,6 +24,7 @@ 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.junit.jupiter.api.Test; /** * This is a test set for MNG-3693: @@ -42,6 +43,7 @@ public MavenITmng3693PomFileBasedirChangeTest() super( ALL_MAVEN_VERSIONS ); } + @Test public void testitMNG3693 () throws Exception { 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 558c3f1dd..ff42afdd1 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3694: @@ -39,6 +40,7 @@ public MavenITmng3694ReactorProjectsDynamismTest() super( ALL_MAVEN_VERSIONS ); } + @Test public void testitMNG3694 () throws Exception { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java index 5b04d7d3e..39aa82199 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3723. @@ -44,6 +45,7 @@ public MavenITmng3723ConcreteParentProjectTest() super( "(2.0.8,)" ); // only test in 2.0.9+ } + @Test public void testitMNG3723 () throws Exception { 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 f90ed88df..0f5bdd8e8 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3724. @@ -41,6 +42,7 @@ public MavenITmng3724ExecutionProjectSyncTest() super( "(2.0.8,)" ); // only test in 2.0.9+ } + @Test public void testitMNG3724 () throws Exception { 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 151058216..addda0fa5 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3729. @@ -55,6 +56,7 @@ public MavenITmng3729MultiForkAggregatorsTest() super( "(2.0.8,3.0-alpha-1),[3.0-alpha-3,)" ); // only test in 2.0.9+ } + @Test public void testitMNG3729 () throws Exception { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java index 6815fcb28..c7830e417 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 @@ -23,6 +23,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3740. @@ -43,6 +44,7 @@ public MavenITmng3740SelfReferentialReactorProjectsTest() super( "(2.0.8,)" ); // only test in 2.0.9+ } + @Test public void testitMNG3740 () throws Exception { 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 a12ba3178..34bb0160d 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 @@ -24,6 +24,7 @@ import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; /** * This is a test set for MNG-3747. @@ -42,6 +43,7 @@ public MavenITmng3747PrefixedPathExpressionTest() super( "(2.0.8,)" ); // only test in 2.0.9+ } + @Test public void testitMNG3747 () throws Exception { diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java index 401b80544..7cd1562b2 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 @@ -33,7 +33,7 @@ * @author Benjamin Bentmann * */ -@Disabled +@Disabled( "won't fix" ) public class MavenITmng3890TransitiveDependencyScopeUpdateTest extends AbstractMavenIntegrationTestCase { 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 6a1680807..2ed40891c 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 @@ -105,18 +105,11 @@ public TestSuiteOrdering() * a fail fast technique as well. */ - // ------------------------------------------------------------------------------------------------------------- - // Tests that currently don't pass for any Maven version, i.e. the corresponding issue hasn't been resolved yet - // ------------------------------------------------------------------------------------------------------------- suite.addTestSuite( MavenITmng3890TransitiveDependencyScopeUpdateTest.class ); suite.addTestSuite( MavenITmng3092SnapshotsExcludedFromVersionRangeTest.class ); suite.addTestSuite( MavenITmng3038TransitiveDepManVersionTest.class ); suite.addTestSuite( MavenITmng2771PomExtensionComponentOverrideTest.class ); suite.addTestSuite( MavenITmng0612NewestConflictResolverTest.class ); - - // ------------------------------------------------------------------------------------------------------------- - // Tests that don't run stable and need to be fixed - // ------------------------------------------------------------------------------------------------------------- suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); suite.addTestSuite( MavenITmng7474SessionScopeTest.class ); suite.addTestSuite( MavenITmng7529VersionRangeRepositorySelection.class ); diff --git a/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java b/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java index 1392707d1..2009a503f 100644 --- a/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java +++ b/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java @@ -55,6 +55,7 @@ public MavenITmngXXXXDescriptionOfProblemTest() super( "(2.0.8,)" ); // only test in 2.0.9+ } + @Test public void testitMNGxxxx () throws Exception { diff --git a/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java b/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java index 8f8bd59b7..06578f39d 100644 --- a/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java +++ b/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java @@ -52,6 +52,7 @@ public MavenITmngXXXXDescriptionOfProblemTest() super( "(2.0.8,)" ); // only test in 2.0.9+ } + @Test public void testitMNGxxxx () throws Exception { From 57fd56a66636f136ec942bde841d5be6a7d14143 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 12 Sep 2022 12:00:55 +0200 Subject: [PATCH 3/6] Add unreferenced tests Unreferenced tests are automatically added at the beginning, but it looks more coherent to add them anyway --- .../src/test/java/org/apache/maven/it/TestSuiteOrdering.java | 3 +++ 1 file changed, 3 insertions(+) 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 2ed40891c..d92240847 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 @@ -105,6 +105,9 @@ public TestSuiteOrdering() * a fail fast technique as well. */ + suite.addTestSuite( MavenITmng5889FindBasedir.class ); + suite.addTestSuite( MavenITmng7360BuildConsumer.class ); + suite.addTestSuite( MavenITmng5452MavenBuildTimestampUTCTest.class ); suite.addTestSuite( MavenITmng3890TransitiveDependencyScopeUpdateTest.class ); suite.addTestSuite( MavenITmng3092SnapshotsExcludedFromVersionRangeTest.class ); suite.addTestSuite( MavenITmng3038TransitiveDepManVersionTest.class ); From 5d142ff1a75ecf9869933fb67bd1e8be1e96a8ed Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Tue, 13 Sep 2022 10:16:08 +0200 Subject: [PATCH 4/6] Reset verifier to run fresh test in MNG-5581 --- .../apache/maven/it/MavenITmng5581LifecycleMappingDelegate.java | 1 + 1 file changed, 1 insertion(+) 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 07998f7ff..5f730f2fd 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 @@ -66,6 +66,7 @@ public void testCustomLifecycle() verifier.verifyErrorFreeLog(); // run custom "test-only" build phase + verifier = newVerifier( projectDir.getAbsolutePath(), "remote" ); verifier.setForkJvm( true ); verifier.setMavenDebug( true ); verifier.executeGoal( "test-only" ); From df88cf1e7a35f93b9d5bab00116cd365263f0d66 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Tue, 13 Sep 2022 10:52:56 +0200 Subject: [PATCH 5/6] Remove useless lines --- .../org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java index 878575100..724e1b207 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java @@ -56,8 +56,6 @@ public void testItShouldNotWarn() @Test - - public void testItShouldNotWarn2() throws Exception { From a7af9a13e76128a086468106d3f41d688df37876 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Fri, 30 Sep 2022 21:59:14 +0200 Subject: [PATCH 6/6] Minimize changes in imports --- .../org/apache/maven/it/MavenIT0008SimplePluginTest.java | 5 +++-- .../apache/maven/it/MavenIT0009GoalConfigurationTest.java | 5 +++-- .../it/MavenIT0010DependencyClosureResolutionTest.java | 5 +++-- ...avenIT0011DefaultVersionByDependencyManagementTest.java | 5 +++-- .../apache/maven/it/MavenIT0012PomInterpolationTest.java | 5 +++-- .../maven/it/MavenIT0018DependencyManagementTest.java | 5 +++-- .../it/MavenIT0019PluginVersionMgmtBySuperPomTest.java | 5 +++-- .../org/apache/maven/it/MavenIT0021PomProfileTest.java | 5 +++-- .../apache/maven/it/MavenIT0023SettingsProfileTest.java | 5 +++-- .../maven/it/MavenIT0024MultipleGoalExecutionsTest.java | 5 +++-- .../it/MavenIT0025MultipleExecutionLevelConfigsTest.java | 5 +++-- .../maven/it/MavenIT0030DepPomDepMgmtInheritanceTest.java | 5 +++-- .../apache/maven/it/MavenIT0032MavenPrerequisiteTest.java | 5 +++-- .../maven/it/MavenIT0037AlternatePomFileSameDirTest.java | 5 +++-- .../it/MavenIT0038AlternatePomFileDifferentDirTest.java | 5 +++-- .../it/MavenIT0040PackagingFromPluginExtensionTest.java | 5 +++-- .../it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java | 5 +++-- .../org/apache/maven/it/MavenIT0051ReleaseProfileTest.java | 5 +++-- .../org/apache/maven/it/MavenIT0052ReleaseProfileTest.java | 5 +++-- .../maven/it/MavenIT0056MultipleGoalExecutionsTest.java | 5 +++-- .../maven/it/MavenIT0063SystemScopeDependencyTest.java | 5 +++-- .../maven/it/MavenIT0064MojoConfigViaSettersTest.java | 5 +++-- .../it/MavenIT0071PluginConfigWithDottedPropertyTest.java | 5 +++-- .../it/MavenIT0072InterpolationWithDottedPropertyTest.java | 5 +++-- .../maven/it/MavenIT0085TransitiveSystemScopeTest.java | 5 +++-- .../org/apache/maven/it/MavenIT0086PluginRealmTest.java | 5 +++-- .../it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java | 5 +++-- .../maven/it/MavenIT0090EnvVarInterpolationTest.java | 5 +++-- .../org/apache/maven/it/MavenIT0108SnapshotUpdateTest.java | 7 ++++--- ...enIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java | 5 +++-- .../org/apache/maven/it/MavenIT0130CleanLifecycleTest.java | 5 +++-- .../org/apache/maven/it/MavenIT0131SiteLifecycleTest.java | 5 +++-- .../org/apache/maven/it/MavenIT0132PomLifecycleTest.java | 5 +++-- .../org/apache/maven/it/MavenIT0133JarLifecycleTest.java | 5 +++-- .../org/apache/maven/it/MavenIT0134WarLifecycleTest.java | 5 +++-- .../org/apache/maven/it/MavenIT0135EjbLifecycleTest.java | 5 +++-- .../org/apache/maven/it/MavenIT0136RarLifecycleTest.java | 5 +++-- .../org/apache/maven/it/MavenIT0137EarLifecycleTest.java | 5 +++-- .../apache/maven/it/MavenIT0138PluginLifecycleTest.java | 5 +++-- .../it/MavenIT0139InterpolationWithProjectPrefixTest.java | 5 +++-- .../it/MavenIT0140InterpolationWithPomPrefixTest.java | 5 +++-- .../maven/it/MavenIT0142DirectDependencyScopesTest.java | 5 +++-- .../it/MavenIT0143TransitiveDependencyScopesTest.java | 5 +++-- .../maven/it/MavenIT0144LifecycleExecutionOrderTest.java | 5 +++-- .../maven/it/MavenIT0146InstallerSnapshotNaming.java | 5 +++-- .../apache/maven/it/MavenIT0199CyclicImportScopeTest.java | 5 +++-- .../java/org/apache/maven/it/MavenITBootstrapTest.java | 5 +++-- .../maven/it/MavenITmng0095ReactorFailureBehaviorTest.java | 7 ++++--- .../maven/it/MavenITmng0187CollectedProjectsTest.java | 5 +++-- .../maven/it/MavenITmng0249ResolveDepsFromReactorTest.java | 5 +++-- ...nITmng0282NonReactorExecWhenProjectIndependentTest.java | 5 +++-- .../it/MavenITmng0294MergeGlobalAndUserSettingsTest.java | 5 +++-- .../maven/it/MavenITmng0377PluginLookupFromPrefixTest.java | 5 +++-- .../it/MavenITmng0449PluginVersionResolutionTest.java | 5 +++-- .../it/MavenITmng0461TolerateMissingDependencyPomTest.java | 5 +++-- .../apache/maven/it/MavenITmng0469ReportConfigTest.java | 5 +++-- .../apache/maven/it/MavenITmng0471CustomLifecycleTest.java | 5 +++-- .../maven/it/MavenITmng0479OverrideCentralRepoTest.java | 7 ++++--- .../MavenITmng0496IgnoreUnknownPluginParametersTest.java | 5 +++-- .../apache/maven/it/MavenITmng0505VersionRangeTest.java | 5 +++-- .../maven/it/MavenITmng0507ArtifactRelocationTest.java | 5 +++-- .../it/MavenITmng0522InheritedPluginMgmtConfigTest.java | 5 +++-- .../it/MavenITmng0553SettingsAuthzEncryptionTest.java | 5 +++-- .../maven/it/MavenITmng0557UserSettingsCliOptionTest.java | 5 +++-- .../maven/it/MavenITmng0612NewestConflictResolverTest.java | 5 +++-- .../apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java | 5 +++-- .../maven/it/MavenITmng0674PluginParameterAliasTest.java | 5 +++-- .../apache/maven/it/MavenITmng0680ParentBasedirTest.java | 5 +++-- .../it/MavenITmng0761MissingSnapshotDistRepoTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng0768OfflineModeTest.java | 7 ++++--- .../MavenITmng0773SettingsProfileReactorPollutionTest.java | 5 +++-- .../it/MavenITmng0781PluginConfigVsExecConfigTest.java | 5 +++-- .../maven/it/MavenITmng0786ProfileAwareReactorTest.java | 5 +++-- .../it/MavenITmng0814ExplicitProfileActivationTest.java | 5 +++-- .../maven/it/MavenITmng0818WarDepsNotTransitiveTest.java | 5 +++-- .../maven/it/MavenITmng0820ConflictResolutionTest.java | 5 +++-- .../maven/it/MavenITmng0823MojoContextPassingTest.java | 5 +++-- .../it/MavenITmng0828PluginConfigValuesInDebugTest.java | 5 +++-- .../maven/it/MavenITmng0836PluginParentResolutionTest.java | 7 ++++--- .../MavenITmng0848SystemPropOverridesDefaultValueTest.java | 5 +++-- .../maven/it/MavenITmng0866EvaluateDefaultValueTest.java | 5 +++-- .../it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java | 5 +++-- .../maven/it/MavenITmng0947OptionalDependencyTest.java | 5 +++-- ...0956ComponentInjectionViaProjectLevelPluginDepTest.java | 5 +++-- .../it/MavenITmng0985NonExecutedPluginMgmtGoalsTest.java | 5 +++-- .../it/MavenITmng1021EqualAttachmentBuildNumberTest.java | 5 +++-- .../maven/it/MavenITmng1052PluginMgmtConfigTest.java | 5 +++-- .../maven/it/MavenITmng1073AggregatorForksReactorTest.java | 5 +++-- .../it/MavenITmng1088ReactorPluginResolutionTest.java | 5 +++-- .../it/MavenITmng1142VersionRangeIntersectionTest.java | 5 +++-- .../maven/it/MavenITmng1144MultipleDefaultGoalsTest.java | 5 +++-- .../it/MavenITmng1233WarDepWithProvidedScopeTest.java | 5 +++-- .../maven/it/MavenITmng1323AntrunDependenciesTest.java | 5 +++-- .../apache/maven/it/MavenITmng1349ChecksumFormatsTest.java | 5 +++-- .../maven/it/MavenITmng1412DependenciesOrderTest.java | 5 +++-- .../maven/it/MavenITmng1415QuotedSystemPropertiesTest.java | 5 +++-- .../it/MavenITmng1491ReactorArtifactIdCollisionTest.java | 7 ++++--- .../it/MavenITmng1493NonStandardModulePomNamesTest.java | 5 +++-- .../apache/maven/it/MavenITmng1701DuplicatePluginTest.java | 7 ++++--- .../it/MavenITmng1703PluginMgmtDepInheritanceTest.java | 5 +++-- ...nITmng1751ForcedMetadataUpdateDuringDeploymentTest.java | 5 +++-- ...nITmng1803PomValidationErrorIncludesLineNumberTest.java | 5 +++-- .../it/MavenITmng1895ScopeConflictResolutionTest.java | 5 +++-- .../MavenITmng1957JdkActivationWithVersionRangeTest.java | 5 +++-- .../it/MavenITmng1992SystemPropOverridesPomPropTest.java | 5 +++-- .../MavenITmng1995InterpolateBooleanModelElementsTest.java | 5 +++-- .../it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java | 5 +++-- ...venITmng2045testJarDependenciesBrokenInReactorTest.java | 5 +++-- ...ng2052InterpolateWithSettingsProfilePropertiesTest.java | 5 +++-- .../it/MavenITmng2054PluginExecutionInheritanceTest.java | 5 +++-- .../maven/it/MavenITmng2068ReactorRelativeParentsTest.java | 5 +++-- ...venITmng2098VersionRangeSatisfiedFromWrongRepoTest.java | 5 +++-- .../it/MavenITmng2103PluginExecutionInheritanceTest.java | 5 +++-- .../maven/it/MavenITmng2123VersionRangeDependencyTest.java | 5 +++-- ...MavenITmng2124PomInterpolationWithParentValuesTest.java | 5 +++-- .../it/MavenITmng2130ParentLookupFromReactorCacheTest.java | 5 +++-- .../maven/it/MavenITmng2135PluginBuildInReactorTest.java | 5 +++-- .../maven/it/MavenITmng2136ActiveByDefaultProfileTest.java | 5 +++-- ...avenITmng2140ReactorAwareDepResolutionWhenForkTest.java | 5 +++-- ...MavenITmng2174PluginDepsManagedByParentProfileTest.java | 5 +++-- .../maven/it/MavenITmng2196ParentResolutionTest.java | 7 ++++--- .../maven/it/MavenITmng2199ParentVersionRangeTest.java | 7 ++++--- .../it/MavenITmng2201PluginConfigInterpolationTest.java | 5 +++-- ...MavenITmng2222OutputDirectoryReactorResolutionTest.java | 5 +++-- .../maven/it/MavenITmng2228ComponentInjectionTest.java | 5 +++-- .../it/MavenITmng2234ActiveProfilesFromSettingsTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng2254PomEncodingTest.java | 5 +++-- ...enITmng2276ProfileActivationBySettingsPropertyTest.java | 5 +++-- .../MavenITmng2277AggregatorAndResolutionPluginsTest.java | 5 +++-- .../maven/it/MavenITmng2293CustomPluginParamImplTest.java | 5 +++-- .../apache/maven/it/MavenITmng2305MultipleProxiesTest.java | 5 +++-- .../maven/it/MavenITmng2309ProfileInjectionOrderTest.java | 5 +++-- .../maven/it/MavenITmng2318LocalParentResolutionTest.java | 5 +++-- .../it/MavenITmng2339BadProjectInterpolationTest.java | 5 +++-- .../maven/it/MavenITmng2362DeployedPomEncodingTest.java | 5 +++-- .../it/MavenITmng2363BasedirAwareFileActivatorTest.java | 5 +++-- .../apache/maven/it/MavenITmng2387InactiveProxyTest.java | 5 +++-- .../maven/it/MavenITmng2432PluginPrefixOrderTest.java | 5 +++-- ...g2486TimestampedDependencyVersionInterpolationTest.java | 5 +++-- .../apache/maven/it/MavenITmng2562Timestamp322Test.java | 5 +++-- .../apache/maven/it/MavenITmng2576MakeLikeReactorTest.java | 5 +++-- .../it/MavenITmng2577SettingsXmlInterpolationTest.java | 5 +++-- .../it/MavenITmng2591MergeInheritedPluginConfigTest.java | 5 +++-- .../maven/it/MavenITmng2605BogusProfileActivationTest.java | 5 +++-- .../MavenITmng2668UsePluginDependenciesForSortingTest.java | 5 +++-- .../maven/it/MavenITmng2690MojoLoadingErrorsTest.java | 7 ++++--- .../apache/maven/it/MavenITmng2693SitePluginRealmTest.java | 5 +++-- .../maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java | 5 +++-- .../it/MavenITmng2720SiblingClasspathArtifactsTest.java | 5 +++-- .../MavenITmng2738ProfileIdCollidesWithCliOptionTest.java | 5 +++-- .../it/MavenITmng2739RequiredRepositoryElementsTest.java | 7 ++++--- ...nITmng2741PluginMetadataResolutionErrorMessageTest.java | 7 ++++--- .../maven/it/MavenITmng2744checksumVerificationTest.java | 5 +++-- .../it/MavenITmng2749ExtensionAvailableToPluginTest.java | 5 +++-- .../MavenITmng2771PomExtensionComponentOverrideTest.java | 5 +++-- .../maven/it/MavenITmng2790LastUpdatedMetadataTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng2820PomCommentsTest.java | 5 +++-- ...mng2831CustomArtifactHandlerAndCustomLifecycleTest.java | 5 +++-- .../MavenITmng2843PluginConfigPropertiesInjectionTest.java | 5 +++-- ...Tmng2848ProfileActivationByEnvironmentVariableTest.java | 5 +++-- .../maven/it/MavenITmng2861RelocationsAndRangesTest.java | 5 +++-- .../apache/maven/it/MavenITmng2865MirrorWildcardTest.java | 5 +++-- .../MavenITmng2871PrePackageSubartifactResolutionTest.java | 5 +++-- .../maven/it/MavenITmng2892HideCorePlexusUtilsTest.java | 5 +++-- .../it/MavenITmng2921ActiveAttachedArtifactsTest.java | 5 +++-- .../maven/it/MavenITmng2926PluginPrefixOrderTest.java | 5 +++-- .../it/MavenITmng2972OverridePluginDependencyTest.java | 5 +++-- .../it/MavenITmng2994SnapshotRangeRepositoryTest.java | 5 +++-- ...enITmng3004ReactorFailureBehaviorMultithreadedTest.java | 7 ++++--- .../apache/maven/it/MavenITmng3012CoreClassImportTest.java | 5 +++-- .../it/MavenITmng3023ReactorDependencyResolutionTest.java | 7 ++++--- .../it/MavenITmng3038TransitiveDepManVersionTest.java | 7 ++++--- .../it/MavenITmng3043BestEffortReactorResolutionTest.java | 5 +++-- .../maven/it/MavenITmng3052DepRepoAggregationTest.java | 5 +++-- ...avenITmng3092SnapshotsExcludedFromVersionRangeTest.java | 5 +++-- .../it/MavenITmng3099SettingsProfilesWithNoPomTest.java | 5 +++-- .../maven/it/MavenITmng3118TestClassPathOrderTest.java | 5 +++-- .../it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java | 5 +++-- ...Tmng3133UrlNormalizationNotBeforeInterpolationTest.java | 5 +++-- ...venITmng3139UseCachedMetadataOfBlacklistedRepoTest.java | 5 +++-- .../apache/maven/it/MavenITmng3183LoggingToFileTest.java | 5 +++-- .../maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java | 5 +++-- .../it/MavenITmng3208ProfileAwareReactorSortingTest.java | 5 +++-- .../maven/it/MavenITmng3217InterPluginDependencyTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng3220ImportScopeTest.java | 7 ++++--- .../MavenITmng3259DepsDroppedInMultiModuleBuildTest.java | 5 +++-- .../it/MavenITmng3268MultipleHyphenPCommandLineTest.java | 5 +++-- .../maven/it/MavenITmng3284UsingCachedPluginsTest.java | 5 +++-- .../apache/maven/it/MavenITmng3288SystemScopeDirTest.java | 7 ++++--- .../it/MavenITmng3297DependenciesNotLeakedToMojoTest.java | 5 +++-- .../maven/it/MavenITmng3314OfflineSnapshotsTest.java | 5 +++-- .../it/MavenITmng3331ModulePathNormalizationTest.java | 5 +++-- .../it/MavenITmng3355TranslatedPathInterpolationTest.java | 5 +++-- .../it/MavenITmng3372DirectInvocationOfPluginsTest.java | 5 +++-- .../it/MavenITmng3379ParallelArtifactDownloadsTest.java | 5 +++-- .../it/MavenITmng3380ManagedRelocatedTransdepsTest.java | 5 +++-- .../it/MavenITmng3394POMPluginVersionDominanceTest.java | 5 +++-- ...96DependencyManagementForOverConstrainedRangesTest.java | 5 +++-- .../maven/it/MavenITmng3401CLIDefaultExecIdTest.java | 5 +++-- .../maven/it/MavenITmng3415JunkRepositoryMetadataTest.java | 5 +++-- .../it/MavenITmng3422ActiveComponentCollectionTest.java | 5 +++-- ...mng3441MetadataUpdatedFromDeploymentRepositoryTest.java | 5 +++-- .../apache/maven/it/MavenITmng3461MirrorMatchingTest.java | 5 +++-- ...g3470StrictChecksumVerificationOfDependencyPomTest.java | 7 ++++--- .../apache/maven/it/MavenITmng3475BaseAlignedDirTest.java | 5 +++-- ...MavenITmng3477DependencyResolutionErrorMessageTest.java | 7 ++++--- .../it/MavenITmng3482DependencyPomInterpolationTest.java | 5 +++-- .../maven/it/MavenITmng3485OverrideWagonExtensionTest.java | 5 +++-- .../apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng3503Xpp3ShadingTest.java | 5 +++-- .../it/MavenITmng3506ArtifactHandlersFromPluginsTest.java | 7 ++++--- .../apache/maven/it/MavenITmng3529QuotedCliArgTest.java | 5 +++-- .../it/MavenITmng3535SelfReferentialPropertiesTest.java | 5 +++-- .../maven/it/MavenITmng3536AppendedAbsolutePathsTest.java | 5 +++-- .../maven/it/MavenITmng3545ProfileDeactivationTest.java | 5 +++-- ...ITmng3575HexadecimalOctalPluginParameterConfigTest.java | 5 +++-- .../it/MavenITmng3581PluginUsesWagonDependencyTest.java | 5 +++-- .../it/MavenITmng3586SystemScopePluginDependencyTest.java | 5 +++-- .../it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java | 5 +++-- .../maven/it/MavenITmng3600DeploymentModeDefaultsTest.java | 5 +++-- .../it/MavenITmng3607ClassLoadersUseValidUrlsTest.java | 5 +++-- .../maven/it/MavenITmng3621UNCInheritedPathsTest.java | 5 +++-- .../it/MavenITmng3641ProfileActivationWarningTest.java | 5 +++-- .../maven/it/MavenITmng3642DynamicResourcesTest.java | 5 +++-- .../apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java | 7 ++++--- .../apache/maven/it/MavenITmng3652UserAgentHeaderTest.java | 5 +++-- .../it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java | 5 +++-- .../it/MavenITmng3671PluginLevelDepInterpolationTest.java | 5 +++-- .../it/MavenITmng3679PluginExecIdInterpolationTest.java | 5 +++-- .../maven/it/MavenITmng3680InvalidDependencyPOMTest.java | 5 +++-- .../maven/it/MavenITmng3684BuildPluginParameterTest.java | 5 +++-- .../maven/it/MavenITmng3693PomFileBasedirChangeTest.java | 5 +++-- .../it/MavenITmng3694ReactorProjectsDynamismTest.java | 5 +++-- .../maven/it/MavenITmng3701ImplicitProfileIdTest.java | 5 +++-- ...avenITmng3703ExecutionProjectWithRelativePathsTest.java | 5 +++-- .../maven/it/MavenITmng3710PollutedClonedPluginsTest.java | 5 +++-- .../maven/it/MavenITmng3714ToolchainsCliOptionTest.java | 5 +++-- .../maven/it/MavenITmng3716AggregatorForkingTest.java | 5 +++-- .../maven/it/MavenITmng3719PomExecutionOrderingTest.java | 5 +++-- .../maven/it/MavenITmng3723ConcreteParentProjectTest.java | 5 +++-- .../maven/it/MavenITmng3724ExecutionProjectSyncTest.java | 5 +++-- .../maven/it/MavenITmng3729MultiForkAggregatorsTest.java | 5 +++-- .../apache/maven/it/MavenITmng3732ActiveProfilesTest.java | 5 +++-- .../MavenITmng3740SelfReferentialReactorProjectsTest.java | 5 +++-- .../maven/it/MavenITmng3746POMPropertyOverrideTest.java | 5 +++-- .../maven/it/MavenITmng3747PrefixedPathExpressionTest.java | 5 +++-- .../apache/maven/it/MavenITmng3748BadSettingsXmlTest.java | 7 ++++--- .../it/MavenITmng3766ToolchainsFromExtensionTest.java | 5 +++-- .../it/MavenITmng3769ExclusionRelocatedTransdepsTest.java | 5 +++-- .../MavenITmng3775ConflictResolutionBacktrackingTest.java | 5 +++-- .../it/MavenITmng3796ClassImportInconsistencyTest.java | 5 +++-- .../it/MavenITmng3805ExtensionClassPathOrderingTest.java | 5 +++-- ...MavenITmng3807PluginConfigExpressionEvaluationTest.java | 5 +++-- .../it/MavenITmng3808ReportInheritanceOrderingTest.java | 5 +++-- .../maven/it/MavenITmng3810BadProfileActivationTest.java | 5 +++-- ...mng3811ReportingPluginConfigurationInheritanceTest.java | 5 +++-- .../it/MavenITmng3813PluginClassPathOrderingTest.java | 5 +++-- .../maven/it/MavenITmng3814BogusProjectCycleTest.java | 5 +++-- .../maven/it/MavenITmng3821EqualPluginExecIdsTest.java | 5 +++-- .../it/MavenITmng3822BasedirAlignedInterpolationTest.java | 5 +++-- .../apache/maven/it/MavenITmng3827PluginConfigTest.java | 5 +++-- .../maven/it/MavenITmng3831PomInterpolationTest.java | 5 +++-- .../MavenITmng3833PomInterpolationDataFlowChainTest.java | 5 +++-- .../it/MavenITmng3836PluginConfigInheritanceTest.java | 5 +++-- .../apache/maven/it/MavenITmng3838EqualPluginDepsTest.java | 5 +++-- .../maven/it/MavenITmng3839PomParsingCoalesceTextTest.java | 5 +++-- .../apache/maven/it/MavenITmng3843PomInheritanceTest.java | 5 +++-- .../maven/it/MavenITmng3845LimitedPomInheritanceTest.java | 5 +++-- .../it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java | 5 +++-- ...avenITmng3852PluginConfigWithHeterogeneousListTest.java | 5 +++-- .../it/MavenITmng3853ProfileInjectedDistReposTest.java | 5 +++-- .../maven/it/MavenITmng3863AutoPluginGroupIdTest.java | 7 ++++--- .../maven/it/MavenITmng3864PerExecPluginConfigTest.java | 5 +++-- .../it/MavenITmng3866PluginConfigInheritanceTest.java | 5 +++-- .../MavenITmng3872ProfileActivationInRelocatedPomTest.java | 5 +++-- .../maven/it/MavenITmng3873MultipleExecutionGoalsTest.java | 5 +++-- .../maven/it/MavenITmng3877BasedirAlignedModelTest.java | 5 +++-- .../maven/it/MavenITmng3886ExecutionGoalsOrderTest.java | 5 +++-- .../maven/it/MavenITmng3887PluginExecutionOrderTest.java | 5 +++-- .../MavenITmng3890TransitiveDependencyScopeUpdateTest.java | 5 +++-- .../maven/it/MavenITmng3892ReleaseDeploymentTest.java | 5 +++-- .../maven/it/MavenITmng3899ExtensionInheritanceTest.java | 5 +++-- .../MavenITmng3900ProfilePropertiesInterpolationTest.java | 5 +++-- .../it/MavenITmng3904NestedBuildDirInterpolationTest.java | 5 +++-- .../MavenITmng3906MergedPluginClassPathOrderingTest.java | 5 +++-- .../it/MavenITmng3916PluginExecutionInheritanceTest.java | 5 +++-- .../maven/it/MavenITmng3924XmlMarkupInterpolationTest.java | 5 +++-- .../it/MavenITmng3925MergedPluginExecutionOrderTest.java | 5 +++-- .../it/MavenITmng3927PluginDefaultExecutionConfigTest.java | 5 +++-- .../it/MavenITmng3937MergedPluginExecutionGoalsTest.java | 5 +++-- .../maven/it/MavenITmng3938MergePluginExecutionsTest.java | 5 +++-- .../maven/it/MavenITmng3940EnvVarInterpolationTest.java | 5 +++-- ...mng3941ExecutionProjectRestrictedToForkingMojoTest.java | 5 +++-- .../it/MavenITmng3943PluginExecutionInheritanceTest.java | 5 +++-- .../maven/it/MavenITmng3944BasedirInterpolationTest.java | 5 +++-- .../it/MavenITmng3947PluginDefaultExecutionConfigTest.java | 5 +++-- ...MavenITmng3948ParentResolutionFromProfileReposTest.java | 5 +++-- .../apache/maven/it/MavenITmng3951AbsolutePathsTest.java | 5 +++-- .../it/MavenITmng3953AuthenticatedDeploymentTest.java | 5 +++-- .../maven/it/MavenITmng3955EffectiveSettingsTest.java | 5 +++-- .../MavenITmng3970DepResolutionFromProfileReposTest.java | 5 +++-- .../apache/maven/it/MavenITmng3974MirrorOrderingTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng3979ElementJoinTest.java | 5 +++-- ...MavenITmng3983PluginResolutionFromProfileReposTest.java | 5 +++-- .../maven/it/MavenITmng3991ValidDependencyScopeTest.java | 7 ++++--- .../maven/it/MavenITmng3998PluginExecutionConfigTest.java | 5 +++-- .../maven/it/MavenITmng4000MultiPluginExecutionsTest.java | 5 +++-- .../maven/it/MavenITmng4005UniqueDependencyKeyTest.java | 7 ++++--- .../maven/it/MavenITmng4007PlatformFileSeparatorTest.java | 5 +++-- .../maven/it/MavenITmng4008MergedFilterOrderTest.java | 5 +++-- .../maven/it/MavenITmng4009InheritProfileEffectsTest.java | 5 +++-- .../MavenITmng4016PrefixedPropertyInterpolationTest.java | 5 +++-- .../MavenITmng4022IdempotentPluginConfigMergingTest.java | 5 +++-- .../MavenITmng4023ParentProfileOneTimeInjectionTest.java | 5 +++-- .../it/MavenITmng4026ReactorDependenciesOrderTest.java | 5 +++-- .../it/MavenITmng4034ManagedProfileDependencyTest.java | 5 +++-- ...MavenITmng4036ParentResolutionFromSettingsRepoTest.java | 5 +++-- .../maven/it/MavenITmng4040ProfileInjectedModulesTest.java | 5 +++-- .../MavenITmng4048VersionRangeReactorResolutionTest.java | 5 +++-- .../it/MavenITmng4052ReactorAwareImportScopeTest.java | 5 +++-- .../maven/it/MavenITmng4053PluginConfigAttributesTest.java | 5 +++-- ...mng4056ClassifierBasedDepResolutionFromReactorTest.java | 5 +++-- .../maven/it/MavenITmng4068AuthenticatedMirrorTest.java | 5 +++-- .../maven/it/MavenITmng4070WhitespaceTrimmingTest.java | 5 +++-- .../maven/it/MavenITmng4072InactiveProfileReposTest.java | 5 +++-- .../maven/it/MavenITmng4087PercentEncodedFileUrlTest.java | 5 +++-- .../maven/it/MavenITmng4091BadPluginDescriptorTest.java | 7 ++++--- .../MavenITmng4102InheritedPropertyInterpolationTest.java | 5 +++-- ...MavenITmng4106InterpolationUsesDominantProfileTest.java | 5 +++-- ...Tmng4107InterpolationUsesDominantProfileSourceTest.java | 5 +++-- .../maven/it/MavenITmng4112MavenVersionPropertyTest.java | 5 +++-- .../apache/maven/it/MavenITmng4116UndecodedUrlsTest.java | 5 +++-- .../it/MavenITmng4129PluginExecutionInheritanceTest.java | 5 +++-- .../apache/maven/it/MavenITmng4150VersionRangeTest.java | 5 +++-- .../maven/it/MavenITmng4162ReportingMigrationTest.java | 5 +++-- .../maven/it/MavenITmng4166HideCoreCommonsCliTest.java | 5 +++-- .../maven/it/MavenITmng4172EmptyDependencySetTest.java | 5 +++-- .../it/MavenITmng4180PerDependencyExclusionsTest.java | 5 +++-- .../maven/it/MavenITmng4189UniqueVersionSnapshotTest.java | 5 +++-- .../maven/it/MavenITmng4190MirrorRepoMergingTest.java | 5 +++-- .../apache/maven/it/MavenITmng4193UniqueRepoIdTest.java | 7 ++++--- .../maven/it/MavenITmng4196ExclusionOnPluginDepTest.java | 5 +++-- .../it/MavenITmng4199CompileMeetsRuntimeScopeTest.java | 5 +++-- .../MavenITmng4203TransitiveDependencyExclusionTest.java | 5 +++-- .../apache/maven/it/MavenITmng4207PluginWithLog4JTest.java | 5 +++-- ...mng4208InterpolationPrefersCliOverProjectPropsTest.java | 5 +++-- .../it/MavenITmng4214MirroredParentSearchReposTest.java | 5 +++-- .../maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java | 5 +++-- ...233ReactorResolutionForManuallyCreatedArtifactTest.java | 5 +++-- .../it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java | 5 +++-- .../MavenITmng4238ArtifactHandlerExtensionUsageTest.java | 7 ++++--- .../it/MavenITmng4262MakeLikeReactorDottedPath370Test.java | 5 +++-- .../it/MavenITmng4262MakeLikeReactorDottedPathTest.java | 5 +++-- .../MavenITmng4269BadReactorResolutionFromOutDirTest.java | 5 +++-- .../MavenITmng4270ArtifactHandlersFromPluginDepsTest.java | 7 ++++--- ...venITmng4273RestrictedCoreRealmAccessForPluginTest.java | 5 +++-- .../maven/it/MavenITmng4274PluginRealmArtifactsTest.java | 5 +++-- .../maven/it/MavenITmng4275RelocationWarningTest.java | 5 +++-- .../it/MavenITmng4276WrongTransitivePlexusUtilsTest.java | 5 +++-- .../maven/it/MavenITmng4281PreferLocalSnapshotTest.java | 5 +++-- .../maven/it/MavenITmng4283ParentPomPackagingTest.java | 7 ++++--- .../maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java | 7 ++++--- .../maven/it/MavenITmng4292EnumTypeMojoParametersTest.java | 5 +++-- .../MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java | 5 +++-- .../it/MavenITmng4304ProjectDependencyArtifactsTest.java | 5 +++-- .../maven/it/MavenITmng4305LocalRepoBasedirTest.java | 5 +++-- ...enITmng4309StrictChecksumValidationForMetadataTest.java | 7 ++++--- ...312TypeAwarePluginParameterExpressionInjectionTest.java | 5 +++-- .../it/MavenITmng4314DirectInvocationOfAggregatorTest.java | 5 +++-- ...ITmng4317PluginVersionResolutionFromMultiReposTest.java | 5 +++-- .../maven/it/MavenITmng4318ProjectExecutionRootTest.java | 5 +++-- ...MavenITmng4319PluginExecutionGoalInterpolationTest.java | 5 +++-- .../it/MavenITmng4320AggregatorAndDependenciesTest.java | 5 +++-- .../it/MavenITmng4321CliUsesPluginMgmtConfigTest.java | 5 +++-- ...venITmng4326LocalSnapshotSuppressesRemoteCheckTest.java | 5 +++-- ...ITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java | 5 +++-- ...enITmng4328PrimitiveMojoParameterConfigurationTest.java | 5 +++-- .../maven/it/MavenITmng4331DependencyCollectionTest.java | 5 +++-- .../it/MavenITmng4332DefaultPluginExecutionOrderTest.java | 5 +++-- .../maven/it/MavenITmng4335SettingsOfflineModeTest.java | 7 ++++--- .../apache/maven/it/MavenITmng4338OptionalMojosTest.java | 5 +++-- .../maven/it/MavenITmng4341PluginExecutionOrderTest.java | 5 +++-- ...ITmng4342IndependentMojoParameterDefaultValuesTest.java | 5 +++-- .../it/MavenITmng4343MissingReleaseUpdatePolicyTest.java | 7 ++++--- .../it/MavenITmng4344ManagedPluginExecutionOrderTest.java | 5 +++-- .../it/MavenITmng4345DefaultPluginExecutionOrderTest.java | 5 +++-- .../MavenITmng4347ImportScopeWithSettingsProfilesTest.java | 5 +++-- .../MavenITmng4348NoUnnecessaryRepositoryAccessTest.java | 5 +++-- .../MavenITmng4349RelocatedArtifactWithInvalidPomTest.java | 5 +++-- .../MavenITmng4350LifecycleMappingExecutionOrderTest.java | 5 +++-- ...ITmng4353PluginDependencyResolutionFromPomRepoTest.java | 5 +++-- ...enITmng4355ExtensionAutomaticVersionResolutionTest.java | 5 +++-- ...Tmng4356NoNeedlessRelookupFromActiveCollectionTest.java | 5 +++-- ...venITmng4357LifecycleMappingDiscoveryInReactorTest.java | 5 +++-- ...Tmng4359LocallyReachableParentOutsideOfReactorTest.java | 5 +++-- .../apache/maven/it/MavenITmng4360WebDavSupportTest.java | 5 +++-- .../MavenITmng4361ForceDependencySnapshotUpdateTest.java | 5 +++-- ...enITmng4363DynamicAdditionOfDependencyArtifactTest.java | 5 +++-- .../it/MavenITmng4365XmlMarkupInAttributeValueTest.java | 5 +++-- .../it/MavenITmng4367LayoutAwareMirrorSelectionTest.java | 5 +++-- .../MavenITmng4368TimestampAwareArtifactInstallerTest.java | 5 +++-- ...4379TransitiveSystemPathInterpolatedWithEnvVarTest.java | 5 +++-- .../it/MavenITmng4381ExtensionSingletonComponentTest.java | 5 +++-- .../maven/it/MavenITmng4383ValidDependencyVersionTest.java | 7 ++++--- ...Tmng4385LifecycleMappingFromExtensionInReactorTest.java | 7 ++++--- .../apache/maven/it/MavenITmng4386DebugLoggingTest.java | 5 +++-- .../apache/maven/it/MavenITmng4387QuietLoggingTest.java | 5 +++-- .../it/MavenITmng4393ParseExternalParenPomLenientTest.java | 5 +++-- .../maven/it/MavenITmng4396AntBased20xMojoSupportTest.java | 5 +++-- .../apache/maven/it/MavenITmng4400RepositoryOrderTest.java | 5 +++-- .../it/MavenITmng4401RepositoryOrderForParentPomTest.java | 5 +++-- .../maven/it/MavenITmng4402DuplicateChildModuleTest.java | 7 ++++--- .../it/MavenITmng4403LenientDependencyPomParsingTest.java | 5 +++-- .../apache/maven/it/MavenITmng4404UniqueProfileIdTest.java | 7 ++++--- .../maven/it/MavenITmng4405ValidPluginVersionTest.java | 7 ++++--- .../it/MavenITmng4408NonExistentSettingsFileTest.java | 7 ++++--- .../org/apache/maven/it/MavenITmng4410UsageHelpTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng4411VersionInfoTest.java | 5 +++-- .../maven/it/MavenITmng4412OfflineModeInPluginTest.java | 7 ++++--- .../it/MavenITmng4413MirroringOfDependencyRepoTest.java | 5 +++-- .../maven/it/MavenITmng4415InheritedPluginOrderTest.java | 5 +++-- ...MavenITmng4416PluginOrderAfterProfileInjectionTest.java | 5 +++-- ...ITmng4421DeprecatedPomInterpolationExpressionsTest.java | 5 +++-- ...avenITmng4422PluginExecutionPhaseInterpolationTest.java | 5 +++-- ...ng4423SessionDataFromPluginParameterExpressionTest.java | 5 +++-- .../maven/it/MavenITmng4428FollowHttpRedirectTest.java | 5 +++-- .../MavenITmng4429CompRequirementOnNonDefaultImplTest.java | 5 +++-- .../it/MavenITmng4430DistributionManagementStatusTest.java | 7 ++++--- .../it/MavenITmng4433ForceParentSnapshotUpdateTest.java | 5 +++-- .../it/MavenITmng4436SingletonComponentLookupTest.java | 5 +++-- ...MavenITmng4450StubModelForMissingDependencyPomTest.java | 5 +++-- ...venITmng4452ResolutionOfSnapshotWithClassifierTest.java | 5 +++-- ...avenITmng4453PluginVersionFromLifecycleMappingTest.java | 5 +++-- .../MavenITmng4459InMemorySettingsKeptEncryptedTest.java | 5 +++-- .../maven/it/MavenITmng4461ArtifactUploadMonitorTest.java | 5 +++-- ...enITmng4463DependencyManagementImportVersionRanges.java | 7 ++++--- ...MavenITmng4464PlatformIndependentFileSeparatorTest.java | 5 +++-- ...nITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java | 5 +++-- ...enITmng4469AuthenticatedDeploymentToCustomRepoTest.java | 5 +++-- .../MavenITmng4470AuthenticatedDeploymentToProxyTest.java | 5 +++-- .../it/MavenITmng4474PerLookupWagonInstantiationTest.java | 5 +++-- ...ITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java | 5 +++-- .../it/MavenITmng4482ForcePluginSnapshotUpdateTest.java | 5 +++-- .../MavenITmng4488ValidateExternalParenPomLenientTest.java | 5 +++-- .../it/MavenITmng4489MirroringOfExtensionRepoTest.java | 5 +++-- .../maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java | 5 +++-- .../MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java | 5 +++-- ...venITmng4522FailUponMissingDependencyParentPomTest.java | 7 ++++--- .../it/MavenITmng4526MavenProjectArtifactsScopeTest.java | 5 +++-- ...enITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java | 5 +++-- .../it/MavenITmng4536RequiresNoProjectForkingMojoTest.java | 5 +++-- ...enITmng4544ActiveComponentCollectionThreadSafeTest.java | 5 +++-- ...venITmng4553CoreArtifactFilterConsidersGroupIdTest.java | 5 +++-- .../it/MavenITmng4554PluginPrefixMappingUpdateTest.java | 5 +++-- .../it/MavenITmng4555MetaversionResolutionOfflineTest.java | 7 ++++--- .../maven/it/MavenITmng4561MirroringOfPluginRepoTest.java | 5 +++-- .../MavenITmng4565MultiConditionProfileActivationTest.java | 5 +++-- ...venITmng4572ModelVersionSurroundedByWhitespaceTest.java | 5 +++-- ...0ProjectLevelPluginDepUsedForCliInvocInReactorTest.java | 5 +++-- ...luginPrefixResolutionFromVersionlessPluginMgmtTest.java | 5 +++-- .../MavenITmng4590ImportedPomUsesSystemPropertiesTest.java | 5 +++-- ...MavenITmng4600DependencyOptionalFlagManagementTest.java | 5 +++-- .../MavenITmng4615ValidateRequiredPluginParameterTest.java | 7 ++++--- .../it/MavenITmng4618AggregatorBuiltAfterModulesTest.java | 5 +++-- ...ITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java | 5 +++-- ...ng4629NoPomValidationErrorUponMissingSystemDepTest.java | 5 +++-- .../MavenITmng4633DualCompilerExecutionsWeaveModeTest.java | 5 +++-- ...nITmng4644StrictPomParsingRejectsMisplacedTextTest.java | 7 ++++--- .../MavenITmng4654ArtifactHandlerForMainArtifactTest.java | 5 +++-- .../maven/it/MavenITmng4660OutdatedPackagedArtifact.java | 7 ++++--- .../org/apache/maven/it/MavenITmng4660ResumeFromTest.java | 7 ++++--- .../apache/maven/it/MavenITmng4666CoreRealmImportTest.java | 5 +++-- .../MavenITmng4677DisabledPluginConfigInheritanceTest.java | 5 +++-- .../maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java | 5 +++-- .../it/MavenITmng4684DistMgmtOverriddenByProfileTest.java | 5 +++-- ...MavenITmng4690InterdependentConflictResolutionTest.java | 5 +++-- .../MavenITmng4696MavenProjectDependencyArtifactsTest.java | 5 +++-- ...venITmng4720DependencyManagementExclusionMergeTest.java | 5 +++-- .../it/MavenITmng4721OptionalPluginDependencyTest.java | 5 +++-- ...enITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java | 5 +++-- .../maven/it/MavenITmng4745PluginVersionUpdateTest.java | 5 +++-- .../maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java | 5 +++-- ...mng4750ResolvedMavenProjectDependencyArtifactsTest.java | 5 +++-- ...venITmng4755FetchRemoteMetadataForVersionRangeTest.java | 5 +++-- .../it/MavenITmng4761PluginLevelDependencyScopesTest.java | 5 +++-- .../maven/it/MavenITmng4765LocalPomProjectBuilderTest.java | 5 +++-- .../MavenITmng4768NearestMatchConflictResolutionTest.java | 5 +++-- ...1PluginPrefixResolutionDoesntTouchDisabledRepoTest.java | 7 ++++--- ...PluginVersionResolutionDoesntTouchDisabledRepoTest.java | 7 ++++--- ...nITmng4776ForkedReactorPluginVersionResolutionTest.java | 5 +++-- ...g4779MultipleDepsWithVersionRangeFromLocalRepoTest.java | 5 +++-- .../it/MavenITmng4781DeploymentToNexusStagingRepoTest.java | 5 +++-- ...venITmng4785TransitiveResolutionInForkedThreadTest.java | 5 +++-- .../maven/it/MavenITmng4786AntBased21xMojoSupportTest.java | 5 +++-- .../MavenITmng4788InstallationToCustomLocalRepoTest.java | 5 +++-- .../MavenITmng4789ScopeInheritanceMeetsConflictTest.java | 5 +++-- ...mng4791ProjectBuilderResolvesRemotePomArtifactTest.java | 5 +++-- ...DepResolutionInReactorProjectForkedByLifecycleTest.java | 5 +++-- .../it/MavenITmng4800NearestWinsVsScopeWideningTest.java | 5 +++-- .../it/MavenITmng4811CustomComponentConfiguratorTest.java | 5 +++-- ...mng4814ReResolutionOfDependenciesDuringReactorTest.java | 5 +++-- .../maven/it/MavenITmng4829ChecksumFailureWarningTest.java | 5 +++-- ...nITmng4834ParentProjectResolvedFromRemoteReposTest.java | 5 +++-- .../maven/it/MavenITmng4840MavenPrerequisiteTest.java | 5 +++-- .../MavenITmng4842ParentResolutionOfDependencyPomTest.java | 5 +++-- ...mng4872ReactorResolutionAttachedWithExclusionsTest.java | 5 +++-- .../it/MavenITmng4874UpdateLatestPluginVersionTest.java | 5 +++-- .../maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java | 5 +++-- ...nITmng4883FailUponOverconstrainedVersionRangesTest.java | 5 +++-- ...MavenITmng4890MakeLikeReactorConsidersVersionsTest.java | 5 +++-- .../it/MavenITmng4891RobustSnapshotResolutionTest.java | 5 +++-- ...avenITmng4895PluginDepWithNonRelocatedMavenApiTest.java | 5 +++-- ...enITmng4913UserPropertyVsDependencyPomPropertyTest.java | 5 +++-- ...avenITmng4919LifecycleMappingWithSameGoalTwiceTest.java | 5 +++-- ...venITmng4925ContainerLookupRealmDuringMojoExecTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng4936EventSpyTest.java | 5 +++-- .../it/MavenITmng4952MetadataReleaseInfoUpdateTest.java | 5 +++-- .../MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java | 5 +++-- .../maven/it/MavenITmng4960MakeLikeReactorResumeTest.java | 5 +++-- .../it/MavenITmng4963ParentResolutionFromMirrorTest.java | 5 +++-- .../it/MavenITmng4966AbnormalUrlPreservationTest.java | 5 +++-- ...avenITmng4973ExtensionVisibleToPluginInReactorTest.java | 5 +++-- ...enITmng4975ProfileInjectedPluginExecutionOrderTest.java | 5 +++-- .../MavenITmng4987TimestampBasedSnapshotSelectionTest.java | 5 +++-- .../apache/maven/it/MavenITmng4991NonProxyHostsTest.java | 5 +++-- .../MavenITmng4992MapStylePropertiesParamConfigTest.java | 5 +++-- .../it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java | 5 +++-- ...Tmng5006VersionRangeDependencyParentResolutionTest.java | 5 +++-- .../maven/it/MavenITmng5009AggregationCycleTest.java | 5 +++-- ...Tmng5011ConfigureCollectionArrayFromSystemPropTest.java | 5 +++-- .../MavenITmng5012CollectionVsArrayParamCoercionTest.java | 5 +++-- ...avenITmng5013ConfigureParamBeanFromScalarValueTest.java | 5 +++-- ...g5019StringBasedCompLookupFromChildPluginRealmTest.java | 5 +++-- .../it/MavenITmng5064SuppressSnapshotUpdatesTest.java | 5 +++-- ...5096ExclusionAtDependencyWithImpliedClassifierTest.java | 5 +++-- ...Tmng5135AggregatorDepResolutionModuleExtensionTest.java | 5 +++-- .../MavenITmng5137ReactorResolutionInForkedBuildTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng5175WagonHttpTest.java | 5 +++-- .../maven/it/MavenITmng5206PlexusLifecycleHonoured.java | 5 +++-- .../maven/it/MavenITmng5208EventSpyParallelTest.java | 5 +++-- .../apache/maven/it/MavenITmng5214DontMapWsdlToJar.java | 5 +++-- .../apache/maven/it/MavenITmng5222MojoDeprecatedTest.java | 5 +++-- .../apache/maven/it/MavenITmng5224InjectedSettings.java | 5 +++-- .../it/MavenITmng5230MakeReactorWithExcludesTest.java | 5 +++-- ...avenITmng5280SettingsProfilesRepositoriesOrderTest.java | 5 +++-- .../maven/it/MavenITmng5338FileOptionToDirectory.java | 5 +++-- .../org/apache/maven/it/MavenITmng5382Jsr330Plugin.java | 5 +++-- .../maven/it/MavenITmng5387ArtifactReplacementPlugin.java | 5 +++-- .../MavenITmng5389LifecycleParticipantAfterSessionEnd.java | 5 +++-- .../MavenITmng5418FileProjectPropertiesActivatorTest.java | 5 +++-- ...enITmng5445LegacyStringSearchModelInterpolatorTest.java | 5 +++-- .../maven/it/MavenITmng5452MavenBuildTimestampUTCTest.java | 5 +++-- .../apache/maven/it/MavenITmng5482AetherNotFoundTest.java | 7 ++++--- .../apache/maven/it/MavenITmng5503ZipInReactorTest.java | 5 +++-- .../maven/it/MavenITmng5530MojoExecutionScopeTest.java | 5 +++-- .../maven/it/MavenITmng5557ProperlyRestrictedReactor.java | 7 ++++--- ...venITmng5561PluginRelocationLosesConfigurationTest.java | 5 +++-- .../it/MavenITmng5572ReactorPluginExtensionsTest.java | 5 +++-- .../apache/maven/it/MavenITmng5576CdFriendlyVersions.java | 5 +++-- .../apache/maven/it/MavenITmng5578SessionScopeTest.java | 5 +++-- .../maven/it/MavenITmng5581LifecycleMappingDelegate.java | 7 ++++--- .../org/apache/maven/it/MavenITmng5591WorkspaceReader.java | 5 +++-- .../it/MavenITmng5608ProfileActivationWarningTest.java | 5 +++-- .../it/MavenITmng5639ImportScopePomResolutionTest.java | 5 +++-- .../MavenITmng5640LifecycleParticipantAfterSessionEnd.java | 7 ++++--- .../MavenITmng5663NestedImportScopePomResolutionTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng5669ReadPomsOnce.java | 5 +++-- .../apache/maven/it/MavenITmng5716ToolchainsTypeTest.java | 5 +++-- .../it/MavenITmng5742BuildExtensionClassloaderTest.java | 5 +++-- .../MavenITmng5753CustomMojoExecutionConfiguratorTest.java | 5 +++-- .../apache/maven/it/MavenITmng5760ResumeFeatureTest.java | 7 ++++--- .../apache/maven/it/MavenITmng5768CliExecutionIdTest.java | 5 +++-- .../apache/maven/it/MavenITmng5771CoreExtensionsTest.java | 5 +++-- .../it/MavenITmng5774ConfigurationProcessorsTest.java | 7 ++++--- .../maven/it/MavenITmng5783PluginDependencyFiltering.java | 5 +++-- .../maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java | 5 +++-- .../apache/maven/it/MavenITmng5840ParentVersionRanges.java | 5 +++-- .../it/MavenITmng5840RelativePathReactorMatching.java | 5 +++-- .../it/MavenITmng5868NoDuplicateAttachedArtifacts.java | 5 +++-- .../org/apache/maven/it/MavenITmng5889FindBasedir.java | 5 +++-- .../it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java | 5 +++-- ...ng5898BuildMultimoduleWithEARFailsToResolveWARTest.java | 5 +++-- ...5935OptionalLostInTranstiveManagedDependenciesTest.java | 5 +++-- .../maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java | 7 ++++--- .../it/MavenITmng5965ParallelBuildMultipliesWorkTest.java | 7 ++++--- .../maven/it/MavenITmng6057CheckReactorOrderTest.java | 5 +++-- .../apache/maven/it/MavenITmng6065FailOnSeverityTest.java | 7 ++++--- .../maven/it/MavenITmng6071GetResourceWithCustomPom.java | 5 +++-- .../apache/maven/it/MavenITmng6084Jsr250PluginTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng6090CIFriendlyTest.java | 5 +++-- .../apache/maven/it/MavenITmng6118SubmoduleInvocation.java | 5 +++-- ...ng6127PluginExecutionConfigurationInterferenceTest.java | 5 +++-- .../it/MavenITmng6173GetAllProjectsInReactorTest.java | 5 +++-- .../MavenITmng6173GetProjectsAndDependencyGraphTest.java | 5 +++-- .../it/MavenITmng6189SiteReportPluginsWarningTest.java | 5 +++-- .../it/MavenITmng6210CoreExtensionsCustomScopesTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng6223FindBasedir.java | 5 +++-- .../it/MavenITmng6240PluginExtensionAetherProvider.java | 5 +++-- .../org/apache/maven/it/MavenITmng6255FixConcatLines.java | 5 +++-- .../it/MavenITmng6256SpecialCharsAlternatePOMLocation.java | 5 +++-- .../maven/it/MavenITmng6326CoreExtensionsNotFoundTest.java | 7 ++++--- .../org/apache/maven/it/MavenITmng6330RelativePath.java | 7 ++++--- .../apache/maven/it/MavenITmng6386BaseUriPropertyTest.java | 5 +++-- .../apache/maven/it/MavenITmng6391PrintVersionTest.java | 5 +++-- .../maven/it/MavenITmng6506PackageAnnotationTest.java | 5 +++-- .../it/MavenITmng6511OptionalProjectSelectionTest.java | 7 ++++--- .../it/MavenITmng6558ToolchainsBuildingEventTest.java | 5 +++-- .../apache/maven/it/MavenITmng6562WarnDefaultBindings.java | 5 +++-- ...ng6566ExecuteAnnotationShouldNotReExecuteGoalsTest.java | 7 ++++--- .../org/apache/maven/it/MavenITmng6656BuildConsumer.java | 5 +++-- .../org/apache/maven/it/MavenITmng6720FailFastTest.java | 7 ++++--- .../it/MavenITmng6754TimestampInMultimoduleProject.java | 5 +++-- ...MavenITmng6759TransitiveDependencyRepositoriesTest.java | 5 +++-- .../MavenITmng6772NestedImportScopeRepositoryOverride.java | 5 +++-- .../org/apache/maven/it/MavenITmng6957BuildConsumer.java | 5 +++-- .../it/MavenITmng6972AllowAccessToGraphPackageTest.java | 5 +++-- ...MavenITmng6981ProjectListShouldIncludeChildrenTest.java | 7 ++++--- .../it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java | 7 ++++--- .../it/MavenITmng7051OptionalProfileActivationTest.java | 7 ++++--- .../maven/it/MavenITmng7110ExtensionClassloader.java | 7 ++++--- .../it/MavenITmng7112ProjectsWithNonRecursiveTest.java | 7 ++++--- .../it/MavenITmng7128BlockExternalHttpReactorTest.java | 7 ++++--- .../maven/it/MavenITmng7160ExtensionClassloader.java | 7 ++++--- .../it/MavenITmng7244IgnorePomPrefixInExpressions.java | 7 ++++--- ...enITmng7310LifecycleActivatedInSpecifiedModuleTest.java | 6 +++--- .../maven/it/MavenITmng7335MissingJarInParallelBuild.java | 7 ++++--- .../maven/it/MavenITmng7349RelocationWarningTest.java | 5 +++-- .../maven/it/MavenITmng7353CliGoalInvocationTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng7360BuildConsumer.java | 5 +++-- .../maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java | 7 ++++--- .../it/MavenITmng7404IgnorePrefixlessExpressionsTest.java | 7 ++++--- ...ng7443ConsistencyOfOptionalProjectsAndProfilesTest.java | 7 ++++--- .../MavenITmng7464ReadOnlyMojoParametersWarningTest.java | 5 +++-- .../it/MavenITmng7468UnsupportedPluginsParametersTest.java | 5 +++-- .../maven/it/MavenITmng7470ResolverTransportTest.java | 5 +++-- .../apache/maven/it/MavenITmng7474SessionScopeTest.java | 5 +++-- .../org/apache/maven/it/MavenITmng7487DeadlockTest.java | 7 ++++--- .../MavenITmng7504NotWarnUnsupportedReportPluginsTest.java | 7 ++++--- .../it/MavenITmng7529VersionRangeRepositorySelection.java | 5 +++-- 639 files changed, 1996 insertions(+), 1358 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 c61ab7619..790aa7c96 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0008SimplePluginTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0008SimplePluginTest 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 8c9293525..326fe0f77 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0009GoalConfigurationTest 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 363c387fd..ed6812d98 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0010DependencyClosureResolutionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.junit.jupiter.api.Test; public class MavenIT0010DependencyClosureResolutionTest 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 24366d4b2..bdf828715 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0011DefaultVersionByDependencyManagementTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.junit.jupiter.api.Test; public class MavenIT0011DefaultVersionByDependencyManagementTest 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 4f626127f..8261b7406 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0012PomInterpolationTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0012PomInterpolationTest 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 013f8b3d8..a776c4488 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018DependencyManagementTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0018DependencyManagementTest 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 2f0a8ecd9..7a2550a21 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0019PluginVersionMgmtBySuperPomTest 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 1772c8899..6b00dc800 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0021PomProfileTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0021PomProfileTest 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 a82539d51..4c113761f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0023SettingsProfileTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0023SettingsProfileTest 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 043cc1c21..0b697dc45 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 2819dbec9..515671847 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c079e8c5f..85a11677f 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0030DepPomDepMgmtInheritanceTest 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 4e33c9f39..0ea450385 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0032MavenPrerequisiteTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0032MavenPrerequisiteTest 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 c431566f6..f86f33ada 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 32f54a999..5c4022d3b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 509fb5b28..35f013050 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 31271d949..2327cca30 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java index 33e74cea9..49150a67d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0051ReleaseProfileTest diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java index 85836c5a5..bf7a9a4ec 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052ReleaseProfileTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0052ReleaseProfileTest 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 11f6e4ee2..369917f46 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0056MultipleGoalExecutionsTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0056MultipleGoalExecutionsTest 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 9e828fd56..48134b486 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.junit.jupiter.api.Test; public class MavenIT0063SystemScopeDependencyTest 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 cda51130b..180d86819 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0064MojoConfigViaSettersTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0064MojoConfigViaSettersTest 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 8d7d1db6c..0a175ec7a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 2f0bf8e80..d2d12bc24 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 9332bf570..52efc1015 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0085TransitiveSystemScopeTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.junit.jupiter.api.Test; public class MavenIT0085TransitiveSystemScopeTest 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 bc8fdafae..85e36dc10 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 88203b4dd..8464276fb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 fa9d11242..7d3dde47d 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.HashMap; 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.junit.jupiter.api.Test; public class MavenIT0090EnvVarInterpolationTest 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 3874d98ed..69cce4da7 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 @@ -19,6 +19,10 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; @@ -27,9 +31,6 @@ 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.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 5bd2a797f..b83458142 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest 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 5da333845..4ba72748b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 1e3165610..f12cf86a2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 6b5e22611..428c705fc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 f1794a8c7..7368f7654 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 49ad0130e..aba379df3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d2e976237..b84c3ed12 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 82762b374..408825cba 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 40cce493a..d07ae6df2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 7f2a9a7bf..f6061ba87 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8b9be46c9..231263f7f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8d0f70581..b9a4e2c7c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 287bcce3f..25fe1a602 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 0beb90026..9274e8520 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 15214a4ed..e0ea701ad 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; 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.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 9540c5c60..c6d81ff82 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.io.IOException; import java.net.InetAddress; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 6a686dc6e..7032cadf1 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 e8ad9f641..322f07b34 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; 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 fd3a06c25..d0666c41c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 0b4d4a225..50396c5c5 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -26,8 +29,6 @@ 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.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 54195e453..078a40447 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 0b21a3fa6..654167ee3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 e1ef16a99..470b719ee 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 cab1a5435..b8060f153 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 b42bc6571..534d26f31 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 979ba934e..cbce7fb3c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 d370e2f6d..5328c88e8 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 3861d490b..3423e75f1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 528c22d01..4a5f0d6f2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 983b222bc..38e9a7a16 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d8e70d3c7..79a89ac01 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 59a575f7d..41c6b36eb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 67b62fdb8..a59847169 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 cff6103fc..3a810e926 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Collections; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 88539b63b..0917560cf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ef2eb897c..3e6bf43b2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 79484bfbe..30d2e7aad 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 ca84f1bcb..9988d05d8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d835bf4fb..f3bd2d67b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c0649aa9d..1154368dd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8071d7789..6868c309a 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 @@ -19,6 +19,10 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -30,9 +34,6 @@ 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.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 b869dc3d0..b1669adde 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 00d05647b..2a4e6d56e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 78f0d63df..be2f344fd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 6358a532b..f5694170c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 5e36a2ecb..ecc35bd07 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Collection; import java.util.Collections; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 912c47822..05d9006e3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 bbe53171c..586296552 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 d7efa1277..2b1a1b72f 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 @@ -19,14 +19,15 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 f5b40f7d3..94eb60d83 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java index 7d2c9360f..d4e4b9d07 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 827394ad0..2d948b7cc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 2f6dfe972..e24b7f5b7 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c51f2641d..74ffb8e18 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0947OptionalDependencyTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 4ba7acc7b..38a5bdd9b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 06e34ef93..8838424ae 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 5cbdbbfcb..296007a55 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 04cb27cd5..af9073130 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a4948dd09..d4f3ac0fd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 54c122277..60e308aa4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d9f654710..cb166eca6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 f4471fb3e..b0fd79a99 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 d89d6eeb3..994e13e15 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 d7adad240..ec710cf5c 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 34922bc07..973c9d293 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 49b70b5bb..37dfb4576 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 e423cb8f0..210a03d96 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 e5d8b85bb..91f0857f2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 417d75d0a..3cf932ad6 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 67322569a..4b265090a 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 5f7e132c4..8a9a775f4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a8e5ef923..16ba7880e 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 31ebd4a56..bfd53c86e 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 136a3d310..62a817bea 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 766e8d3ce..d5111e2be 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a39e39492..5e2f376d8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 092884915..a0842b080 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 0cb6bd40b..e20a92e8d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 be6ee27aa..1bb6e214a 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 168ae427d..5098ea571 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 3ad349149..739bf1d23 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 61ea5ae55..b5175082d 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8aa00dfb4..4dd7fb11f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 2bfe43239..68f7216e3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 f4ac06335..40af8da62 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 c6c8d3bd5..911d9af69 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 33caf67d4..85103ccdf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2130ParentLookupFromReactorCacheTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 1e8192be2..2be73750c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 528e85755..4319788d8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a4c317d2f..a203386a6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 b7468a016..dc768f242 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 891b21342..f8dfa5c6f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2196ParentResolutionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 5b0f88c82..49a88aaeb 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 @@ -15,13 +15,14 @@ */ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; 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.junit.jupiter.api.Test; public class MavenITmng2199ParentVersionRangeTest 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 1949ba83e..b1ef2759b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 87da9936e..31ec2978a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 0b7d0ce72..331910076 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 b5189487e..9084bd4f6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 26b4db5a2..82561434f 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 e54bc4000..6f04cff5e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 4185fad21..83c35a06f 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java index 1c3b082c1..b71130a3d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 9c27fbd8d..180c658a1 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -28,8 +31,6 @@ 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.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 c0029998a..80547df0f 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 1c05250a1..7b690b73d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 9f63dea98..52e16099c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 9d89bfce1..6e5fda404 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 5b49c16f3..855603123 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c5937778f..0a5c1e13f 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.net.InetAddress; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ecd8701ba..4a4e402bd 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 4b804e5db..1ddb9523e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 77fc378c3..30c6e384d 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 521a434e2..c466e6f92 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 b7824a892..5abfd7e17 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ed8b3b143..acb3b4e59 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 9a4953d29..fd292515a 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 199f02960..12f91b045 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 69faa2c37..b82a3ceb8 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 @@ -19,14 +19,15 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; 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.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 1e22c84ca..2a0dc99b8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 1a1d72e89..1baef6727 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2695OfflinePluginSnapshotsTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 74eadd9bc..a06c2e45d 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 @@ -19,11 +19,12 @@ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 95e56ed83..4ae70fbbd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 09a12c764..f2e388bbf 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 88e743da4..8faafc6b1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 4bfc094db..85662dc95 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 279d75101..70fb84206 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a19b5ae9a..0f98641cb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 5ebc3b322..236503468 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 @@ -19,14 +19,15 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 3eb7daabe..2f40d9ed8 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 1715c55a5..9a853ed7a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 56c6e1efc..c978c35a9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 fdbe340fc..fad915c45 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8d09cf294..de25ee036 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 0f525dc23..6650086c6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 53ff0d807..51170c5ae 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 9f8d691ef..93d20e86e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 919b68ae9..182dabd6c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 d725f035a..b99f11b1a 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 91905aa52..d11d3cc3e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 212c76cd9..3ca34ae33 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 6b490795b..b1e7afdc8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 dd95023bb..f82f2b8de 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a4f03dd33..45d36b256 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 4b38591a3..1485cebba 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 0c5baeb9d..5c8f7b1e3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 ee7258abc..39444172d 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 bdded84b8..c4d2bf9a8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 0c8a81b93..4b932cc5a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3099SettingsProfilesWithNoPomTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 2cc67d2b8..4058759dc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3118TestClassPathOrderTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 40702f8a4..162522e80 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 4589ae18c..041cba337 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 f6fc059cd..9349b7f6f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 de27d40e1..b5ed93120 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 1611e7e86..2fd76da53 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8495d3604..073b4f44d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 2cb9eecb6..c0b5ea6cd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 2e3b72e4f..db8dc5232 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 efe47a991..f2ef938fa 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 1eadf2865..9caafd1ca 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 57aa04988..009fe2d63 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 377041a01..ee29d6f2f 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 bec94589e..9f1e01863 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 4cf865833..d6e8c8896 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3314OfflineSnapshotsTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 fb4c62632..8f7aa0bbc 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 2cdf389eb..fbde79fb0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a8ba7d175..2a8a69a7c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ff258ba3e..a2ebab894 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 0a573bda7..a9dad147f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 902d90d21..614c207c6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d3bd3dd4d..301b63d8e 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 38e968a9c..a20568b4c 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c4d8a70a1..c1fd01bfa 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -29,8 +32,6 @@ 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.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 70f99e947..e80277944 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 b24a3402b..8dde60dc4 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.io.FileReader; import java.io.IOException; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 4d6733293..f10b72efe 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -26,8 +29,6 @@ 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.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 d14f2c26d..589de15b7 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 f60c623f4..3c9c5dc6b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.io.IOException; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 c623b0d6c..f7b1bab36 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; 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 576bf55df..3925659c8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 84d13a91d..847f9282f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 286a4296c..d6bc3dec6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3498ForkToOtherMojoTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 44eec2168..283227e54 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 13a0b178e..478eb404e 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 39d8aeab7..cbe967ef7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 403e79e64..53c8a1368 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 f44dd94d1..892fef9b1 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 3c73d0ebf..10a985bc9 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ddab56bec..bbe1f2f31 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3575HexadecimalOctalPluginParameterConfigTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 36b2e3542..466b55ea6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 707cfed14..df12d5d3c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 7b3f35e8a..1ae189760 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -27,8 +30,6 @@ 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.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 4f6119bb1..3eaa8a1fe 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 1170c89e9..35875a531 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.net.URI; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 fbb073f75..02e82cacd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 b51a42e75..eb8a047ea 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 8e6298a03..96b9a01f6 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d50d17b48..475f60c0f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3645POMSyntaxErrorTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 001dbd70e..b7575989c 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -26,8 +29,6 @@ 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.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 8ad4bea69..a3428f6ee 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 9c4bcb184..4fb45a7ad 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 53de2b733..7f7925e24 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 89d96bc7e..2405914a1 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 a102e1a90..171e77981 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 28bcce0d0..0c595d728 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 ff42afdd1..fe4889fd0 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 fef22164b..43999a327 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 3d71b7960..35c25034d 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 baa2727e9..db6816ed9 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 075fc8fd5..5bfc156ef 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c99a19e89..97953cfcc 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 4943ca148..98b84472d 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 39aa82199..89c0e4bc5 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 0f5bdd8e8..e1fc2d96a 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 addda0fa5..34f5480b9 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 3e2aaef52..a865531e5 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -26,8 +29,6 @@ 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.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 c7830e417..5ad9fa79c 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 3a0f6ffeb..e1fc4ec63 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 34bb0160d..40d03b512 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d37a94228..435a3c22b 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 13cad6694..50a55cbc7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c9b19ff92..68d0005b7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 45f576263..5a52a15dc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 8476df3d6..c9d8eae81 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 23be7b99c..41e0e25a8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 b66f4c414..986634cb0 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 67626f4d6..6c02a9fc4 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 4bfdb5c33..caaa5c48b 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 39a71da7c..bfaa9162b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 51a28e596..3f9acd8f5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 7676b724e..2790dd7d4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 addfcf730..e8e148716 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a5d4b22d9..15251c526 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 aa0cdb346..2e5c7dabd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 081116874..3756d690b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ce2b1e847..c0a0e56b8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 701001238..0186ac3bf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 0e527e268..57da30aae 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 e2381b29f..22d1abc3b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 896370e5e..d34b921e2 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Collection; import java.util.Properties; import java.util.TreeSet; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 3b8cb2a11..6c78434d6 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 9277d5fe9..f91c335f2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 f58f387d8..0d6cb1bb7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 858abca80..735972252 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 970c5d19f..e7d49c85b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 b933fd4fb..2c0b53789 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 7ed018085..15101c7c5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 96cba2960..bd7b2c6f0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 7a0689da3..324d587ca 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 3b8726a62..e94309325 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.io.IOException; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 64a166ed2..6726fc354 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 1c5f536c2..a77c2d41a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 7cd1562b2..4a2eadedb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 995bb766f..cbcf47a2b 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Locale; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 b4a558bcc..7a87cf9be 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ced34f47d..963ea897f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 55f5b7d13..510327750 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 e2fd97639..0a4d832d5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 24e7a0107..353073cab 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 a19e8ee77..ccb1c8805 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 764420d13..5774e9bbd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 82d982583..ef8fab333 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 f35c1bfa8..0f0c0173f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 14a60aed8..da73a96f1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 b798ec63c..11dceaba7 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 @@ -19,14 +19,15 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.HashMap; import java.util.Map; 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.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 2f5bad0d7..2b6b75b69 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 37d7a7762..96fea1dc7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 582e5f109..55decb484 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 98cdec42c..29fbd714e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 045295fb3..d13562c2c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 7ba334ac7..281d1cc14 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 1d15e9746..76abfde3c 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 657c95110..c98cb3857 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 27dc6bceb..f0b465906 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 e9fbee9c3..af7a43ab3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 44efc6e62..8acfdfe2a 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c108db46a..3d7961412 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 84233d7ff..6388dd453 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 e316579b9..8856b25a9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 6280a0fd1..6c09e57f9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 0fd223163..61acf898d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8111f00c0..86267bfb5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d88e9400e..e7590a9a7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d843786d5..b1756cf6e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 b9afcfd65..a46203b71 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 f484e43ce..476c7230d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 38b980ce3..ff5c9a638 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 13700aceb..c12862e37 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 91c038569..10d7aa161 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 167d30894..23670fbaf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 6814b7466..dd6c13f1b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 86a847770..b6981cbf9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 13cfb7a0c..ca99d1efc 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 5d89109d5..db4a9f8eb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 06eaf8645..b9682ca3f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 f7ea77e37..8cd13bd8b 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 825e596a5..655e3e06e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 4b103cdc0..bb9967a5b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 48f1d0538..039321c88 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 dbc8147b9..1806226d8 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; 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.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 34a166b1a..20cc23134 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 6d5a76be8..1ac112cc6 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 24449fa94..4cbe117d5 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ad7b3c928..0b4b91e9c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4112MavenVersionPropertyTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng4112MavenVersionPropertyTest 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 c4e499161..da473c819 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 85d608c48..a52ac665c 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 76fc04403..0d8276569 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 64296eb3d..6d300027b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 18e7ada58..455b7da4d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 6cc381c68..8a651b35b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 5f8948431..b71698f07 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 df7fb4c20..72453ce86 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 0a94c0091..fdb6948ee 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 @@ -19,14 +19,15 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 53ea93290..984ed8367 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 97821e796..100ac77a4 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 f490ff0e2..18c1657d0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 dee198a0d..c644fb512 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 3d038628b..f9e8b3629 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 32adc750a..110ed1ca7 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 1363cd0cd..cca302b0b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 2072663d5..a18f00b34 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 f13802819..2223ae518 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 61a0ae997..ec10c8de5 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -31,8 +34,6 @@ 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.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 bc0f448ee..9c5ce48ec 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ac6d4e81d..8eb26036d 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a241b37ac..7fd650448 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 54659cb1e..538aec68c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 7da3009dc..5e9e5b4b3 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 4146b3c72..621e6485d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4273RestrictedCoreRealmAccessForPluginTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 701c08735..ac5e34e47 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 f27c331d5..2ae3d96de 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 82b65ae96..1775d6905 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4276WrongTransitivePlexusUtilsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 81f12dd34..1537ac322 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 2ec6f64c4..5f2d5a8d9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8d08ba9fe..6a6a0dace 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 be0464491..e579de138 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 688a8b3a2..2a3f266c3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 5e5b81fa2..f51891119 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 dcf2ae00c..8aa2f44fd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 184563bee..9792a7e5c 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import 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.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 5e190e2a1..0c662a635 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 553c6ea92..c6fef2021 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 6e38e8625..073719188 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ed7e57514..f23163d06 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 0921b0f3b..157d056c1 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c6d0487c1..8c9f13c55 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 9941b8a5b..4c86838ad 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d50467dc4..7a2ab1d26 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -31,8 +34,6 @@ import java.util.Properties; import java.util.concurrent.ConcurrentLinkedDeque; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c6647fa4f..013ec2786 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 f50cb0b57..758eefe90 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d1ce9fc71..e61dd930d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 7f8b2f0be..764b0e89a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 c5d786e6d..326a2eb21 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 5c94eb007..ec81146d8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4338OptionalMojosTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a9237bc98..12d929751 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 c113d0362..b8eb20d6c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 4e9d954ad..d009f2d8b 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 @@ -19,6 +19,10 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -29,9 +33,6 @@ import java.util.Properties; 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.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 033a1267e..db2c577be 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 99efef9cd..0baf10edb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 28362e595..9ca2ec133 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 856e6f9d2..f9b3563c3 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -28,8 +31,6 @@ 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.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 f3d8fcc05..514841fd3 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 edd9bdc56..69bdb1e00 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 b68469e22..f782167c0 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 141dfa416..3d307aeaf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 fe5215fda..58a5cff6f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java index cfc063991..3ea0b6f07 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 81f202af9..bd2241221 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 eb328a4a3..afef01d55 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -28,8 +31,6 @@ 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.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 3df128e3b..f34804d21 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 647a2b975..34d2acd26 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 163cc19b7..036dbb01f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 54760b174..fb9c3791b 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 b381584d6..161dc8ad8 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 6d93b265a..55e0b02a9 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 c6181ee96..4f8e14db2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 b708a1dd1..21bf95c1e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 0772b762e..60235c759 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a35779ce0..6484d94dd 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 4490a60d1..447f8b6fc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 941c77d1a..afb85b202 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 566fcc4cb..bc961bb60 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8b20d5cc9..8a79ce73a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ac50a74db..5dc6df26f 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 6ee8ecbe4..876cd0f12 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c1bd163d2..a75f15a7a 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 2efbb5f82..fcfea472a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 6af086411..a1e0709cf 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ca66b11b1..4763e6386 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c97e11ed1..641887c8e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ee86eb1c0..0685a7fb0 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 b9f962bc6..be0d0ba5e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 673d9677b..113febb26 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 41e8b3acb..cf26dbc46 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 8437ba813..a8f2b26dc 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 e43b16213..1394089b3 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 76249e3b7..3f35cfaf0 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 444efbf9c..a806ff782 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 1fdb87165..da037d7d1 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -28,8 +31,6 @@ 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.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 6b77187b0..e5d3a6ce8 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 22ac7fadc..3c8c0d95a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a292fc5fd..d153bfa7a 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8b7d79205..12608c191 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 cd6eb46e8..0fca26d11 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 832b76a1f..e2ff43298 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 107f571b7..7238c8e99 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 69b5cf763..f7aac7972 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 83592b5a7..d7607190e 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d50505fb8..652d52a14 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 @@ -18,13 +18,14 @@ */ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; 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.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 d1b99c315..a09b976cb 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 1f9776f19..2bf125221 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 15ec45339..6dcdd9400 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 4d4290952..28b983503 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -29,8 +32,6 @@ 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.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 de8523839..bfe2d2a53 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java index 6e0feeef6..b83822527 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 88a83ee1a..8c49134c9 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 07f0e49ef..c4970cbb6 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 81f76eb2d..8403e9634 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 36cdfa41f..f24c52256 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 ac393685e..3ba1d0e69 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -28,8 +31,6 @@ 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.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 5da9aae2e..5c691c1f0 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 b0f6544a0..963d5fce2 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 ba3ae9bea..dca6c01fc 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 1dc802cd8..05866b441 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 aa872802a..843809b7c 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 3212f87b6..c88acfc1c 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 3c0ecba95..2178a7123 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -30,8 +33,6 @@ 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.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 4b95d94fe..6e20ffb06 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 @@ -19,6 +19,10 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -27,9 +31,6 @@ import java.util.Properties; 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.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 4a4ae3437..12fc80527 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 92f585771..52f142745 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java index b52bb5d33..f1e5fc822 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 7ece4999b..5b140c597 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 30d5f52bf..9df63b524 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java index 10bc31d09..80fad4085 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d62669b47..2cbc98de6 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 0e3cb064d..eaef9219e 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 2f386af28..d991c95f4 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 23f6b9547..2094c546c 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 045a37eda..f7f0c9313 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 435bbd1c5..0476f00da 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 @@ -1,9 +1,10 @@ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 f7728987d..b5a705a36 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c03be897f..659b411a7 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java index 71a92f2a3..0bbdeeccc 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660OutdatedPackagedArtifact.java @@ -19,6 +19,10 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; import java.nio.file.FileVisitResult; @@ -29,9 +33,6 @@ import java.nio.file.attribute.BasicFileAttributes; 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.junit.jupiter.api.Test; import static java.nio.file.FileVisitResult.CONTINUE; diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java index a38fe6dca..e7b49706c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4660ResumeFromTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8c6156622..3ef9698d6 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 82b883a6a..e9da8b243 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 018bb9040..55059f06c 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8e75e4872..c08a1849d 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 7af86abc9..5b832b5b9 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 a718fef54..0bd6912e2 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.HashSet; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 1846f6079..6aac5649c 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 0b89e1fe6..4860918f5 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 f81985bde..dc88cb7e7 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 bc364fc8b..7971e8ead 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 d67017720..1c3abbbb5 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d3958f3a7..d617a1986 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 edebe6de3..63cef3997 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 8b369641b..9e31507f7 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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/MavenITmng4765LocalPomProjectBuilderTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java index 9b91fc810..23f5685d7 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 2d4caefe1..4f5cb342d 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 b312b9d19..5a1cfba6e 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 @@ -19,6 +19,10 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -27,9 +31,6 @@ import java.util.Properties; 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.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 a7274a268..8c56dcdcb 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 @@ -19,6 +19,10 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -28,9 +32,6 @@ 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.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 2e1627a84..287f96940 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 cde6a622d..a88e6f4d5 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 0924ee049..eb61684d4 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -26,8 +29,6 @@ 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.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 b0cea788a..a7dce789c 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 10ee0b479..5b3c57895 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 e9d1cbd59..f09eb7da0 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 9f5b8ff07..fb66934ff 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 ff52e7790..38a6234db 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 b7a5259f2..ea1db3ce9 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 66fbc69df..cef802a9d 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 82d76ffb6..79b21e7e8 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 dcc69ba01..85d41a4f7 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 707057381..c8d48ccdc 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 c95199158..bd998dee4 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 08a314831..af1a20275 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 42fa10348..7e1edbcc8 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 f7fceefdd..87f15b51a 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 98e8f30dc..cf417014c 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 f270c0534..b712a345e 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 bf5bb42e6..236fed13c 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 f88b3e7a3..4e701e869 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 19071a400..f4ec3a56b 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 813fb2522..85dd3dd1e 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d1a146868..b948c8f43 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 7c62c042e..723d7ba81 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 6fc922965..f5362bff4 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 74545a9f0..cfcc58554 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 34ef35fd8..05308e151 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; import org.apache.maven.shared.utils.io.FileUtils; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 e2c353f92..3103a6799 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 9bc2e4eba..4d238646b 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 12af70c5a..e8ba4389b 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d909d6dbb..dd83c406f 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 08ba490d8..3a8eec106 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a3faa25ea..24a3f0d51 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 a4b0a8b84..cda19c1b8 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 4339f53d4..01cc1f10c 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.net.InetAddress; 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.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 e38a009a0..b4f43508a 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 df351fb03..b37f81053 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a677450d0..747e6465f 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 a577f9485..5495b83dc 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java index 58b038efa..02bf288de 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5011ConfigureCollectionArrayFromSystemPropTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 a0e7f1457..880d2a6ee 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 44001aa6d..52b8f57f8 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 69a64c1d4..47cec1ab6 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 d633d0093..d90ab1017 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -28,8 +31,6 @@ 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.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 21fcac061..d3184e05a 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 55bbfb55a..286fd3537 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 e3734042e..8a6ae4b06 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 a0fa0d255..59963949b 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -27,8 +30,6 @@ 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.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 b28aa2167..cb7f47b89 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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/MavenITmng5208EventSpyParallelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5208EventSpyParallelTest.java index 928b7fe6b..a301008c4 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 967924d59..256964611 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.junit.jupiter.api.Test; public class MavenITmng5214DontMapWsdlToJar 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 562bc1dd3..4aebcd94f 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 @@ -19,14 +19,15 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Properties; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 ff0b737ab..e6d9c54d0 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.io.FileReader; import java.util.ArrayList; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 484944a02..a5eff6a29 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 1bb2f65bd..e3c2b41f8 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -30,8 +33,6 @@ import java.io.PrintWriter; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 3a1583c3a..9b4377c51 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ac6615041..9fe114949 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8a870f312..affd5c56a 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 2584d8d57..aae54787c 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5389LifecycleParticipantAfterSessionEnd 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 7e65dd122..0550eb310 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5445LegacyStringSearchModelInterpolatorTest.java index 8b250406f..9156dad4e 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 474f3e742..365e3c5dc 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8eeb5bc43..b61f08d93 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 @@ -19,14 +19,15 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; 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.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 36c269380..9ff05cd22 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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/MavenITmng5530MojoExecutionScopeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java index b39345b9c..5232e7294 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5530MojoExecutionScopeTest 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 637c470ea..6c5f7ae96 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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/MavenITmng5561PluginRelocationLosesConfigurationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5561PluginRelocationLosesConfigurationTest.java index 8750273e6..e5e3a00e7 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5561PluginRelocationLosesConfigurationTest 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 543cbb9f2..31f14813e 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 394913ca8..4e18dde54 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.List; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 5bb6b5df3..fd420b4bc 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5578SessionScopeTest 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 0dbd3ce6f..3fa2b9ade 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5581LifecycleMappingDelegate 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 f49bd4cab..c187a073c 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5591WorkspaceReader 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 7e1d7e052..43b1e5e8d 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.List; import java.util.regex.Pattern; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 00bec3ff9..99b7b2439 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 3e31ad21b..033bfd880 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 9a8ee5297..460f3a1ef 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 704f75bcd..2a4c17635 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; import java.util.Collections; @@ -27,8 +30,6 @@ import java.util.Map; import java.util.Set; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 494a448da..30665e5e7 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 6e7bd9ba9..87151770f 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.junit.jupiter.api.Test; public class MavenITmng5742BuildExtensionClassloaderTest 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 197c07fed..696c4fd4f 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.junit.jupiter.api.Test; public class MavenITmng5753CustomMojoExecutionConfiguratorTest diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java index 1115041b9..c78182396 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5760ResumeFeatureTest.java @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; 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.junit.jupiter.api.Test; /** 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 f2ee4f8b3..3d2681fff 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5768CliExecutionIdTest 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 93d02d0e9..ad77b4117 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 @@ -1,10 +1,11 @@ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 7b4699894..70fde8868 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 @@ -1,11 +1,12 @@ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5774ConfigurationProcessorsTest 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 05fd7d5da..d649bfa36 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 @@ -1,10 +1,11 @@ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.junit.jupiter.api.Test; public class MavenITmng5783PluginDependencyFiltering 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 099e4e2c9..b113c7f98 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 @@ -1,9 +1,10 @@ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5805PkgTypeMojoConfiguration2 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 ea7a6482d..c97ab330f 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 @@ -1,9 +1,10 @@ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5840ParentVersionRanges 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 42a5ca0d4..f246b70b8 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 @@ -1,9 +1,10 @@ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5840RelativePathReactorMatching 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 434ea61fa..d9b0fa54d 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -27,8 +30,6 @@ import java.nio.file.Path; import java.util.Arrays; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 9afc4be17..d50234468 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 99fc4b004..8ec2ad76e 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 79ffc615b..5724cb4fc 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 537b54dc2..c5ab70765 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 73b3a5328..d593580a1 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 @@ -1,10 +1,11 @@ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng5958LifecyclePhaseBinaryCompat 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 e991d11d9..e9ba2fcc6 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 @@ -1,5 +1,9 @@ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -7,9 +11,6 @@ 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.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 1a9d092f4..7831edb78 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.LinkedList; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java index ccd6ecb2c..0b633d19c 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6065FailOnSeverityTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 0521235c7..a0df79d0e 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 @@ -1,9 +1,10 @@ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 789818975..2f7aeff8a 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 9bf2809b5..60d6956e5 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 085b6b20a..d8019612d 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 33bc55168..06377f0e9 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.junit.jupiter.api.Test; public class MavenITmng6127PluginExecutionConfigurationInterferenceTest 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 30f0d2046..7dbe5c25c 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -26,8 +29,6 @@ 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.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 15ec0e05d..7bb7f63f2 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 359c6b5f6..f37fdcd97 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 71e93d1be..8d7898e5c 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 2e116ebea..b6e4222d6 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 8125f8c1b..bc3427419 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.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 e1d9ecf35..41f289ff8 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 @@ -19,14 +19,15 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; import com.google.common.base.Charsets; import com.google.common.base.Joiner; import com.google.common.io.Files; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 47b282bd1..50c18049a 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 6c1e5ec52..ff8037e64 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 @@ -19,15 +19,16 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 745204235..f70335078 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 ff7e60895..497960dcf 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Properties; import org.apache.maven.shared.utils.Os; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 e0cdec16e..bcc8e21e8 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; 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.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 8d69985d2..0bdc0c30c 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng6506PackageAnnotationTest 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 88caac63f..f002bda59 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 cbaf50871..5d4d77d97 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java index 724e1b207..377ad0c3d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.Arrays; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng6562WarnDefaultBindings 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 ce7521e3e..ed6293dca 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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/MavenITmng6656BuildConsumer.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java index 1afbc787e..74adffa55 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.io.IOException; import java.util.Collections; 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.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 e59fa74ff..bf95d057e 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.Arrays; 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.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 29678dae3..b0d3b7dee 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 @@ -19,6 +19,9 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -29,8 +32,6 @@ 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.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 3018f72dd..e5cab2700 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + 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.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java index ccb7647e9..a702072bb 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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/MavenITmng6957BuildConsumer.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java index b4c0bc4bd..3950b5862 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.io.IOException; import java.util.Collections; 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.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 923250589..db651c299 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 62a79c3da..539ed15a0 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.util.List; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng6981ProjectListShouldIncludeChildrenTest 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 e9a31e9c7..bee5b0586 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7045DropUselessAndOutdatedCdiApiTest diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java index f07139d2e..6475a55a5 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7051OptionalProfileActivationTest 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 9d4fe557b..721c675aa 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 @@ -19,15 +19,16 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.Reader; import java.util.Properties; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7110ExtensionClassloader 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 72b625cac..10a1c7c0f 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7112ProjectsWithNonRecursiveTest 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 1bdbabf33..e551651e0 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 @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7128BlockExternalHttpReactorTest 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 56224f7a7..624778c8c 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7160ExtensionClassloader 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 a003edc65..60249ae74 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 @@ -18,13 +18,14 @@ */ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; 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.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 c783335fc..5bd90d4e1 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 @@ -19,10 +19,10 @@ * under the License. */ -import java.io.File; - -import org.apache.maven.shared.verifier.Verifier; import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + +import java.io.File; /** * 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 14e81629b..fe60e22d5 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; import java.util.Arrays; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7335MissingJarInParallelBuild 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 a025a393e..502bd79fa 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 @@ -19,12 +19,13 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; public class MavenITmng7349RelocationWarningTest 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 4dea51699..8d01cd4f9 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java index c0c62bcab..d2bf03374 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7360BuildConsumer.java @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; /** diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java index a0110b2d4..93ddbb225 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7390SelectModuleOutsideCwdTest.java @@ -19,11 +19,12 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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/MavenITmng7404IgnorePrefixlessExpressionsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7404IgnorePrefixlessExpressionsTest.java index 4552c4efb..53660ca69 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 @@ -18,13 +18,14 @@ */ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; 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.junit.jupiter.api.Test; public class MavenITmng7404IgnorePrefixlessExpressionsTest extends AbstractMavenIntegrationTestCase diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java index 98cb16877..88bea5a7e 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest.java @@ -19,14 +19,15 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; import java.util.Arrays; 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.junit.jupiter.api.Test; public class MavenITmng7443ConsistencyOfOptionalProjectsAndProfilesTest 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 d32fbbad6..b18610c2f 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; 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.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 e897f87dd..fabc28185 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 @@ -19,13 +19,14 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.ArrayList; 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.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 836778ed6..24e41f7ea 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 @@ -1,11 +1,12 @@ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; import java.util.HashMap; import java.util.Map; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.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 ebc9347fa..0346c72a1 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 c87053302..902e539a3 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 @@ -18,12 +18,13 @@ */ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; -import org.apache.maven.shared.verifier.VerificationException; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.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 846d96a99..35cc59179 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 @@ -18,13 +18,14 @@ */ package org.apache.maven.it; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; +import org.apache.maven.shared.verifier.VerificationException; + import java.io.File; import java.io.IOException; 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.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 e1e03a47a..d698671f9 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 @@ -19,10 +19,11 @@ * under the License. */ +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.apache.maven.shared.verifier.Verifier; + import java.io.File; -import org.apache.maven.shared.verifier.Verifier; -import org.apache.maven.shared.verifier.util.ResourceExtractor; import org.junit.jupiter.api.Test; /**