You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/12/26 15:12:39 UTC
[maven] 02/02: [MNG-7650] Reformat
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8150c62749a637a98fbb9489fb8162034956220b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Dec 23 20:03:44 2022 +0100
[MNG-7650] Reformat
---
.../apache/maven/settings/GlobalSettingsTest.java | 5 +--
.../org/apache/maven/api/DependencyCoordinate.java | 1 +
.../src/main/java/org/apache/maven/api/Event.java | 1 +
.../java/org/apache/maven/api/LocalRepository.java | 1 +
.../java/org/apache/maven/api/MojoExecution.java | 1 +
.../src/main/java/org/apache/maven/api/Node.java | 1 +
.../main/java/org/apache/maven/api/Project.java | 1 +
.../java/org/apache/maven/api/ResolutionScope.java | 1 +
.../src/main/java/org/apache/maven/api/Scope.java | 1 +
.../main/java/org/apache/maven/api/Session.java | 1 +
.../java/org/apache/maven/api/SessionData.java | 1 +
.../main/java/org/apache/maven/api/Toolchain.java | 1 +
.../maven/api/plugin/annotations/Component.java | 1 +
.../maven/api/plugin/annotations/Execute.java | 1 +
.../apache/maven/api/plugin/annotations/Mojo.java | 1 +
.../maven/api/plugin/annotations/Parameter.java | 1 +
.../services/ArtifactCoordinateFactoryRequest.java | 4 +--
.../maven/api/services/ArtifactDeployer.java | 1 +
.../api/services/ArtifactDeployerRequest.java | 5 +--
.../maven/api/services/ArtifactFactoryRequest.java | 4 +--
.../maven/api/services/ArtifactInstaller.java | 1 +
.../api/services/ArtifactInstallerRequest.java | 5 +--
.../apache/maven/api/services/ArtifactManager.java | 1 +
.../maven/api/services/ArtifactResolver.java | 1 +
.../api/services/ArtifactResolverRequest.java | 5 +--
.../maven/api/services/ArtifactResolverResult.java | 1 +
.../org/apache/maven/api/services/BaseRequest.java | 1 +
.../api/services/DependencyCollectorRequest.java | 5 +--
.../api/services/DependencyCollectorResult.java | 1 +
.../DependencyCoordinateFactoryRequest.java | 5 +--
.../maven/api/services/LocalRepositoryManager.java | 1 +
.../java/org/apache/maven/api/services/Lookup.java | 1 +
.../apache/maven/api/services/ProjectBuilder.java | 1 +
.../maven/api/services/ProjectBuilderRequest.java | 5 +--
.../maven/api/services/ProjectBuilderResult.java | 1 +
.../apache/maven/api/services/ProjectManager.java | 1 +
.../org/apache/maven/api/services/Prompter.java | 1 +
.../maven/api/services/RepositoryFactory.java | 1 +
.../apache/maven/api/services/SettingsBuilder.java | 1 +
.../maven/api/services/SettingsBuilderRequest.java | 5 +--
.../maven/api/services/SettingsBuilderResult.java | 1 +
.../java/org/apache/maven/api/services/Source.java | 1 +
.../maven/api/services/ToolchainManager.java | 1 +
.../api/services/ToolchainsBuilderRequest.java | 5 +--
.../api/services/ToolchainsBuilderResult.java | 1 +
.../org/apache/maven/api/services/Transport.java | 1 +
.../apache/maven/api/services/xml/XmlFactory.java | 1 +
.../maven/api/services/xml/XmlReaderRequest.java | 1 +
.../maven/api/services/xml/XmlWriterRequest.java | 1 +
.../main/java/org/apache/maven/api/xml/Dom.java | 1 +
.../codehaus/modello/plugin/velocity/Helper.java | 1 +
.../plugin/velocity/ModelloVelocityMojo.java | 1 +
.../modello/plugin/velocity/VelocityGenerator.java | 1 +
.../java/org/apache/maven/artifact/Artifact.java | 1 +
.../org/apache/maven/artifact/ArtifactUtils.java | 1 +
.../org/apache/maven/artifact/DefaultArtifact.java | 1 +
.../artifact/repository/ArtifactRepository.java | 1 +
.../AbstractArtifactResolutionException.java | 1 +
.../resolver/ArtifactNotFoundException.java | 1 +
.../resolver/ArtifactResolutionException.java | 1 +
.../MultipleArtifactsNotFoundException.java | 1 +
.../versioning/DefaultArtifactVersion.java | 4 +--
.../OverConstrainedVersionException.java | 1 +
.../maven/artifact/versioning/VersionRange.java | 1 +
.../apache/maven/artifact/ArtifactUtilsTest.java | 11 ++++---
.../apache/maven/artifact/DefaultArtifactTest.java | 8 ++---
.../artifact/versioning/ComparableVersionIT.java | 5 +--
.../artifact/versioning/ComparableVersionTest.java | 7 ++--
.../versioning/DefaultArtifactVersionTest.java | 4 +--
.../artifact/versioning/VersionRangeTest.java | 9 +++---
maven-bom/pom.xml | 2 +-
.../building/DefaultProblemCollectorTest.java | 6 ++--
.../apache/maven/building/DefaultProblemTest.java | 6 ++--
.../org/apache/maven/building/FileSourceTest.java | 7 ++--
.../building/ProblemCollectorFactoryTest.java | 7 ++--
.../apache/maven/building/StringSourceTest.java | 5 +--
.../org/apache/maven/building/UrlSourceTest.java | 7 ++--
.../maven/artifact/deployer/ArtifactDeployer.java | 1 +
.../artifact/deployer/DefaultArtifactDeployer.java | 1 +
.../artifact/installer/ArtifactInstaller.java | 1 +
.../installer/DefaultArtifactInstaller.java | 1 +
.../artifact/manager/DefaultWagonManager.java | 1 +
.../maven/artifact/manager/WagonManager.java | 1 +
.../repository/DefaultArtifactRepository.java | 1 +
.../DefaultArtifactRepositoryFactory.java | 1 +
.../metadata/DefaultRepositoryMetadataManager.java | 1 +
.../metadata/GroupRepositoryMetadata.java | 1 +
.../repository/metadata/MetadataBridge.java | 1 +
.../maven/artifact/resolver/ArtifactCollector.java | 1 +
.../maven/artifact/resolver/ArtifactResolver.java | 1 +
.../artifact/resolver/DebugResolutionListener.java | 1 +
.../artifact/resolver/DefaultArtifactResolver.java | 1 +
.../artifact/resolver/UnresolvedArtifacts.java | 1 +
.../artifact/resolver/filter/OrArtifactFilter.java | 1 +
.../artifact/versioning/ManagedVersionMap.java | 1 +
.../profiles/DefaultMavenProfilesBuilder.java | 1 +
.../maven/profiles/DefaultProfileManager.java | 1 +
.../maven/profiles/MavenProfilesBuilder.java | 1 +
.../org/apache/maven/profiles/ProfileManager.java | 1 +
.../maven/profiles/ProfilesConversionUtils.java | 1 +
.../profiles/activation/FileProfileActivator.java | 1 +
.../activation/SystemPropertyProfileActivator.java | 1 +
.../maven/project/DefaultMavenProjectBuilder.java | 1 +
.../DefaultProjectBuilderConfiguration.java | 1 +
.../project/InvalidProjectModelException.java | 1 +
.../apache/maven/project/MavenProjectBuilder.java | 1 +
.../java/org/apache/maven/project/ModelUtils.java | 1 +
.../maven/project/ProjectBuilderConfiguration.java | 1 +
.../org/apache/maven/project/ProjectUtils.java | 1 +
.../AbstractStringBasedModelInterpolator.java | 1 +
.../interpolation/BuildTimestampValueSource.java | 1 +
.../project/interpolation/ModelInterpolator.java | 1 +
.../PathTranslatingPostProcessor.java | 1 +
.../interpolation/RegexBasedModelInterpolator.java | 1 +
.../StringSearchModelInterpolator.java | 1 +
.../maven/project/path/DefaultPathTranslator.java | 1 +
.../maven/repository/DefaultMirrorSelector.java | 1 +
.../repository/MetadataResolutionRequest.java | 1 +
.../maven/repository/MetadataResolutionResult.java | 1 +
.../apache/maven/repository/MirrorSelector.java | 1 +
.../repository/UserLocalArtifactRepository.java | 1 +
.../maven/repository/VersionNotFoundException.java | 1 +
.../legacy/DefaultUpdateCheckManager.java | 1 +
.../repository/legacy/DefaultWagonManager.java | 1 +
.../repository/legacy/LegacyRepositorySystem.java | 1 +
.../repository/legacy/TransferListenerAdapter.java | 1 +
.../repository/legacy/UpdateCheckManager.java | 1 +
.../maven/repository/legacy/WagonManager.java | 1 +
.../DefaultArtifactRepositoryFactory.java | 1 +
.../resolver/DefaultLegacyArtifactCollector.java | 1 +
.../legacy/resolver/LegacyArtifactCollector.java | 1 +
.../transform/AbstractVersionTransformation.java | 1 +
.../resolver/transform/ArtifactTransformation.java | 1 +
.../transform/ArtifactTransformationManager.java | 1 +
.../DefaultArtifactTransformationManager.java | 1 +
.../resolver/transform/SnapshotTransformation.java | 1 +
.../repository/metadata/ArtifactMetadata.java | 1 +
.../repository/metadata/ClasspathContainer.java | 1 +
.../metadata/DefaultClasspathTransformation.java | 1 +
.../metadata/DefaultGraphConflictResolver.java | 1 +
.../maven/repository/metadata/MetadataGraph.java | 1 +
.../repository/metadata/MetadataResolution.java | 1 +
.../metadata/MetadataResolutionRequest.java | 1 +
.../maven/repository/metadata/MetadataSource.java | 1 +
.../usability/plugin/ExpressionDocumenter.java | 1 +
.../AbstractArtifactComponentTestCase.java | 12 ++++---
.../artifact/deployer/ArtifactDeployerTest.java | 12 ++++---
.../deployer/SimpleArtifactMetadataSource.java | 6 ++--
.../factory/DefaultArtifactFactoryTest.java | 5 +--
.../artifact/installer/ArtifactInstallerTest.java | 8 +++--
.../artifact/metadata/TestMetadataSource.java | 8 +++--
.../repository/MavenArtifactRepositoryTest.java | 4 +--
.../resolver/ArtifactResolutionExceptionTest.java | 5 +--
.../artifact/resolver/ArtifactResolverTest.java | 10 +++---
.../resolver/DefaultArtifactResolverTest.java | 6 ++--
.../maven/artifact/resolver/TestFileWagon.java | 1 +
.../artifact/resolver/TestTransferListener.java | 1 +
.../resolver/filter/AndArtifactFilterTest.java | 7 ++--
.../resolver/filter/FilterHashEqualsTest.java | 5 +--
.../resolver/filter/OrArtifactFilterTest.java | 7 ++--
.../resolver/filter/ScopeArtifactFilterTest.java | 6 ++--
.../maven/artifact/testutils/TestFileManager.java | 9 +++---
.../transform/TransformationManagerTest.java | 8 +++--
.../manager/DefaultProfileManagerTest.java | 8 +++--
.../project/AbstractMavenProjectTestCase.java | 6 ++--
.../maven/project/ClasspathArtifactResolver.java | 6 ++--
.../maven/project/EmptyLifecycleExecutor.java | 1 +
.../project/EmptyLifecyclePluginAnalyzer.java | 1 +
.../project/LegacyLocalRepositoryManager.java | 1 +
.../apache/maven/project/ProjectClasspathTest.java | 9 +++---
.../apache/maven/project/TestArtifactResolver.java | 1 +
.../maven/project/TestMavenRepositorySystem.java | 1 +
.../apache/maven/project/TestProjectBuilder.java | 6 ++--
.../AbstractProjectInheritanceTestCase.java | 5 +--
.../inheritance/t00/ProjectInheritanceTest.java | 4 +--
.../inheritance/t01/ProjectInheritanceTest.java | 4 +--
.../inheritance/t02/ProjectInheritanceTest.java | 9 +++---
.../inheritance/t03/ProjectInheritanceTest.java | 5 +--
.../inheritance/t04/ProjectInheritanceTest.java | 9 +++---
.../inheritance/t05/ProjectInheritanceTest.java | 9 +++---
.../inheritance/t06/ProjectInheritanceTest.java | 9 +++---
.../inheritance/t07/ProjectInheritanceTest.java | 11 ++++---
.../inheritance/t08/ProjectInheritanceTest.java | 9 +++---
.../inheritance/t09/ProjectInheritanceTest.java | 11 ++++---
.../inheritance/t10/ProjectInheritanceTest.java | 9 +++---
.../inheritance/t11/ProjectInheritanceTest.java | 7 ++--
.../inheritance/t12/ProjectInheritanceTest.java | 7 ++--
.../inheritance/t12scm/ProjectInheritanceTest.java | 5 +--
.../project/path/DefaultPathTranslatorTest.java | 5 +--
.../repository/DefaultMirrorSelectorTest.java | 4 +--
.../repository/LegacyRepositorySystemTest.java | 12 ++++---
.../maven/repository/MirrorProcessorTest.java | 12 ++++---
.../legacy/DefaultUpdateCheckManagerTest.java | 14 ++++----
.../repository/legacy/DefaultWagonManagerTest.java | 18 ++++++-----
.../legacy/LegacyRepositorySystemTest.java | 8 +++--
.../maven/repository/legacy/StringWagon.java | 6 ++--
.../resolver/DefaultArtifactCollectorTest.java | 12 ++++---
.../conflict/AbstractConflictResolverTest.java | 8 +++--
.../DefaultClasspathTransformationTest.java | 7 ++--
.../DefaultGraphConflictResolutionPolicyTest.java | 4 +--
.../metadata/DefaultGraphConflictResolverTest.java | 7 ++--
.../repository/metadata/TestMetadataSource.java | 8 +++--
maven-core/pom.xml | 2 +-
.../org/apache/maven/ArtifactFilterManager.java | 1 +
.../apache/maven/DefaultArtifactFilterManager.java | 8 +++--
.../main/java/org/apache/maven/DefaultMaven.java | 10 +++---
.../maven/DefaultProjectDependenciesResolver.java | 8 +++--
.../org/apache/maven/MavenExecutionException.java | 1 +
.../apache/maven/ProjectDependenciesResolver.java | 1 +
.../main/java/org/apache/maven/ReactorReader.java | 12 ++++---
.../java/org/apache/maven/RepositoryUtils.java | 1 +
.../main/java/org/apache/maven/SessionScoped.java | 9 +++---
.../maven/artifact/InvalidRepositoryException.java | 1 +
.../artifact/factory/DefaultArtifactFactory.java | 1 +
.../handler/manager/ArtifactHandlerManager.java | 1 +
.../manager/DefaultArtifactHandlerManager.java | 8 +++--
.../providers/EarArtifactHandlerProvider.java | 1 +
.../providers/EjbArtifactHandlerProvider.java | 1 +
.../EjbClientArtifactHandlerProvider.java | 1 +
.../providers/JarArtifactHandlerProvider.java | 1 +
.../JavaSourceArtifactHandlerProvider.java | 1 +
.../providers/JavadocArtifactHandlerProvider.java | 1 +
.../MavenPluginArtifactHandlerProvider.java | 1 +
.../providers/PomArtifactHandlerProvider.java | 1 +
.../providers/RarArtifactHandlerProvider.java | 1 +
.../providers/TestJarArtifactHandlerProvider.java | 1 +
.../providers/WarArtifactHandlerProvider.java | 1 +
.../artifact/metadata/ArtifactMetadataSource.java | 1 +
.../maven/artifact/metadata/ResolutionGroup.java | 1 +
.../repository/DefaultRepositoryRequest.java | 1 +
.../repository/LegacyLocalRepositoryManager.java | 1 +
.../repository/MavenArtifactRepository.java | 1 +
.../repository/layout/DefaultRepositoryLayout.java | 1 +
.../metadata/AbstractRepositoryMetadata.java | 1 +
.../metadata/RepositoryMetadataManager.java | 1 +
.../metadata/io/DefaultMetadataReader.java | 6 ++--
.../repository/metadata/io/MetadataReader.java | 1 +
.../resolver/ArtifactResolutionRequest.java | 1 +
.../resolver/ArtifactResolutionResult.java | 1 +
.../resolver/DefaultResolutionErrorHandler.java | 5 +--
.../maven/artifact/resolver/ResolutionNode.java | 1 +
.../resolver/filter/AndArtifactFilter.java | 1 +
.../resolver/filter/ExcludesArtifactFilter.java | 1 +
.../resolver/filter/ExclusionArtifactFilter.java | 1 +
.../resolver/filter/ExclusionSetFilter.java | 1 +
.../resolver/filter/IncludesArtifactFilter.java | 1 +
.../apache/maven/bridge/MavenRepositorySystem.java | 8 +++--
.../classrealm/ArtifactClassRealmConstituent.java | 1 +
.../apache/maven/classrealm/ClassRealmManager.java | 1 +
.../maven/classrealm/DefaultClassRealmManager.java | 8 +++--
.../internal/DefaultBeanConfigurator.java | 6 ++--
.../internal/EnhancedComponentConfigurator.java | 1 +
.../eventspy/internal/EventSpyDispatcher.java | 6 ++--
.../maven/exception/DefaultExceptionHandler.java | 6 ++--
.../org/apache/maven/execution/BuildSummary.java | 1 +
.../execution/DefaultBuildResumptionAnalyzer.java | 6 ++--
.../DefaultBuildResumptionDataRepository.java | 6 ++--
.../execution/DefaultMavenExecutionRequest.java | 1 +
.../DefaultMavenExecutionRequestPopulator.java | 8 +++--
.../execution/DefaultMavenExecutionResult.java | 1 +
.../maven/execution/MavenExecutionRequest.java | 1 +
.../maven/execution/MavenExecutionResult.java | 1 +
.../org/apache/maven/execution/MavenSession.java | 1 +
.../apache/maven/execution/ProfileActivation.java | 4 +--
.../apache/maven/execution/ProjectActivation.java | 4 +--
.../maven/execution/ProjectDependencyGraph.java | 1 +
.../maven/execution/ProjectExecutionEvent.java | 1 +
.../org/apache/maven/execution/ReactorManager.java | 1 +
.../maven/execution/scope/MojoExecutionScoped.java | 9 +++---
.../scope/internal/MojoExecutionScope.java | 11 ++++---
.../internal/MojoExecutionScopeCoreModule.java | 1 +
.../maven/extension/internal/CoreExports.java | 9 +++---
.../extension/internal/CoreExportsProvider.java | 4 ++-
.../extension/internal/CoreExtensionEntry.java | 1 +
.../apache/maven/graph/DefaultGraphBuilder.java | 10 +++---
.../maven/graph/DefaultProjectDependencyGraph.java | 1 +
.../graph/FilteredProjectDependencyGraph.java | 1 +
.../org/apache/maven/graph/ProjectSelector.java | 1 +
.../aether/ConsumerModelSourceTransformer.java | 1 +
.../DefaultRepositorySystemSessionFactory.java | 8 +++--
.../internal/aether/LoggingRepositoryListener.java | 1 +
.../aether/MavenChainedWorkspaceReader.java | 1 +
.../maven/internal/aether/ResolverLifecycle.java | 5 +--
.../aether/ReverseTreeRepositoryListener.java | 5 +--
.../apache/maven/internal/impl/AbstractNode.java | 1 +
.../maven/internal/impl/AbstractSession.java | 5 +--
.../maven/internal/impl/DefaultArtifact.java | 5 +--
.../internal/impl/DefaultArtifactCoordinate.java | 5 +--
.../impl/DefaultArtifactCoordinateFactory.java | 7 ++--
.../internal/impl/DefaultArtifactDeployer.java | 10 +++---
.../internal/impl/DefaultArtifactFactory.java | 7 ++--
.../internal/impl/DefaultArtifactInstaller.java | 7 ++--
.../internal/impl/DefaultArtifactManager.java | 6 ++--
.../internal/impl/DefaultArtifactResolver.java | 12 ++++---
.../maven/internal/impl/DefaultDependency.java | 5 +--
.../internal/impl/DefaultDependencyCollector.java | 10 +++---
.../internal/impl/DefaultDependencyCoordinate.java | 5 +--
.../impl/DefaultDependencyCoordinateFactory.java | 10 +++---
.../apache/maven/internal/impl/DefaultEvent.java | 1 +
.../internal/impl/DefaultLocalRepository.java | 6 ++--
.../impl/DefaultLocalRepositoryManager.java | 4 ++-
.../org/apache/maven/internal/impl/DefaultLog.java | 5 +--
.../apache/maven/internal/impl/DefaultLookup.java | 6 ++--
.../impl/DefaultMessageBuilderFactory.java | 4 ++-
.../internal/impl/DefaultModelXmlFactory.java | 8 +++--
.../maven/internal/impl/DefaultMojoExecution.java | 1 +
.../apache/maven/internal/impl/DefaultNode.java | 1 +
.../apache/maven/internal/impl/DefaultProject.java | 1 +
.../maven/internal/impl/DefaultProjectBuilder.java | 8 +++--
.../maven/internal/impl/DefaultProjectManager.java | 6 ++--
.../maven/internal/impl/DefaultPrompter.java | 6 ++--
.../internal/impl/DefaultRepositoryFactory.java | 4 ++-
.../apache/maven/internal/impl/DefaultSession.java | 5 +--
.../maven/internal/impl/DefaultSessionFactory.java | 1 +
.../internal/impl/DefaultSettingsBuilder.java | 8 +++--
.../internal/impl/DefaultSettingsXmlFactory.java | 6 ++--
.../internal/impl/DefaultToolchainManager.java | 8 +++--
.../internal/impl/DefaultToolchainsBuilder.java | 8 +++--
.../internal/impl/DefaultToolchainsXmlFactory.java | 6 ++--
.../maven/internal/impl/DefaultTransport.java | 8 +++--
.../internal/impl/DefaultTransportProvider.java | 10 +++---
.../maven/internal/impl/DefaultTypeRegistry.java | 5 +--
.../maven/internal/impl/DefaultVersionParser.java | 10 +++---
.../apache/maven/internal/impl/EventSpyImpl.java | 4 ++-
.../apache/maven/internal/impl/WrapperNode.java | 1 +
.../maven/lifecycle/DefaultLifecycleExecutor.java | 8 +++--
.../apache/maven/lifecycle/DefaultLifecycles.java | 8 +++--
.../maven/lifecycle/LifeCyclePluginAnalyzer.java | 1 +
.../java/org/apache/maven/lifecycle/Lifecycle.java | 1 +
.../lifecycle/LifecycleExecutionException.java | 4 +--
.../apache/maven/lifecycle/LifecycleExecutor.java | 1 +
.../maven/lifecycle/LifecycleMappingDelegate.java | 1 +
.../apache/maven/lifecycle/MavenExecutionPlan.java | 1 +
.../lifecycle/internal/BuildListCalculator.java | 6 ++--
.../internal/CompoundProjectExecutionListener.java | 1 +
.../internal/DefaultExecutionEventCatapult.java | 1 +
.../DefaultLifecycleExecutionPlanCalculator.java | 8 +++--
.../internal/DefaultLifecycleMappingDelegate.java | 8 +++--
.../internal/DefaultLifecyclePluginAnalyzer.java | 10 +++---
.../DefaultLifecycleTaskSegmentCalculator.java | 8 +++--
.../internal/DefaultMojoExecutionConfigurator.java | 8 +++--
.../internal/DefaultProjectArtifactFactory.java | 4 ++-
.../lifecycle/internal/DependencyContext.java | 1 +
.../lifecycle/internal/ExecutionPlanItem.java | 1 +
.../lifecycle/internal/LifecycleDebugLogger.java | 6 ++--
.../internal/LifecycleDependencyResolver.java | 6 ++--
.../internal/LifecycleExecutionPlanCalculator.java | 1 +
.../lifecycle/internal/LifecycleModuleBuilder.java | 6 ++--
.../internal/LifecyclePluginResolver.java | 6 ++--
.../maven/lifecycle/internal/LifecycleStarter.java | 6 ++--
.../internal/LifecycleTaskSegmentCalculator.java | 1 +
.../lifecycle/internal/MojoDescriptorCreator.java | 8 +++--
.../maven/lifecycle/internal/MojoExecutor.java | 10 +++---
.../lifecycle/internal/ProjectArtifactFactory.java | 1 +
.../maven/lifecycle/internal/ProjectBuildList.java | 1 +
.../maven/lifecycle/internal/ProjectIndex.java | 1 +
.../maven/lifecycle/internal/ProjectSegment.java | 1 +
.../lifecycle/internal/ReactorBuildStatus.java | 1 +
.../maven/lifecycle/internal/builder/Builder.java | 1 +
.../lifecycle/internal/builder/BuilderCommon.java | 8 +++--
.../multithreaded/ConcurrencyDependencyGraph.java | 1 +
.../multithreaded/MultiThreadedBuilder.java | 8 +++--
.../builder/multithreaded/ThreadOutputMuxer.java | 1 +
.../singlethreaded/SingleThreadedBuilder.java | 4 ++-
.../lifecycle/mapping/DefaultLifecycleMapping.java | 6 ++--
.../maven/lifecycle/mapping/LifecycleMojo.java | 1 +
.../maven/lifecycle/mapping/LifecyclePhase.java | 1 +
.../providers/AbstractLifecycleProvider.java | 4 ++-
.../AbstractLifecycleMappingProvider.java | 6 ++--
.../plugin/DefaultLifecycleBindingsInjector.java | 8 +++--
.../apache/maven/plugin/BuildPluginManager.java | 1 +
.../java/org/apache/maven/plugin/CacheUtils.java | 1 +
.../plugin/CompoundMojoExecutionListener.java | 1 +
.../maven/plugin/DebugConfigurationListener.java | 1 +
.../maven/plugin/DefaultBuildPluginManager.java | 8 +++--
.../maven/plugin/DefaultExtensionRealmCache.java | 6 ++--
.../plugin/DefaultMojosExecutionStrategy.java | 4 ++-
.../maven/plugin/DefaultPluginArtifactsCache.java | 6 ++--
.../maven/plugin/DefaultPluginDescriptorCache.java | 6 ++--
.../maven/plugin/DefaultPluginRealmCache.java | 6 ++--
.../apache/maven/plugin/ExtensionRealmCache.java | 1 +
.../apache/maven/plugin/MavenPluginManager.java | 1 +
.../plugin/MavenPluginPrerequisitesChecker.java | 1 +
.../org/apache/maven/plugin/MojoExecution.java | 1 +
.../maven/plugin/MojosExecutionStrategy.java | 1 +
.../apache/maven/plugin/PluginArtifactsCache.java | 1 +
.../apache/maven/plugin/PluginDescriptorCache.java | 1 +
.../org/apache/maven/plugin/PluginManager.java | 1 +
.../maven/plugin/PluginNotFoundException.java | 1 +
.../maven/plugin/PluginParameterException.java | 1 +
.../plugin/PluginParameterExpressionEvaluator.java | 1 +
.../PluginParameterExpressionEvaluatorV4.java | 1 +
.../org/apache/maven/plugin/PluginRealmCache.java | 1 +
.../AbstractMavenPluginParametersValidator.java | 1 +
.../plugin/internal/DefaultLegacySupport.java | 4 ++-
.../plugin/internal/DefaultMavenPluginManager.java | 8 +++--
.../internal/DefaultMavenPluginValidator.java | 4 ++-
.../DefaultPluginDependenciesResolver.java | 8 +++--
.../plugin/internal/DefaultPluginManager.java | 4 ++-
.../plugin/internal/DeprecatedPluginValidator.java | 1 +
.../MavenPluginJavaPrerequisiteChecker.java | 1 +
.../MavenPluginMavenPrerequisiteChecker.java | 1 +
.../plugin/internal/MavenPluginValidator.java | 1 +
.../maven/plugin/internal/MojoLogWrapper.java | 4 +--
.../internal/PluginDependenciesResolver.java | 1 +
.../ReadOnlyPluginParametersValidator.java | 1 +
.../internal/ValidatingConfigurationListener.java | 1 +
.../plugin/prefix/DefaultPluginPrefixRequest.java | 1 +
.../prefix/NoPluginFoundForPrefixException.java | 1 +
.../maven/plugin/prefix/PluginPrefixRequest.java | 1 +
.../internal/DefaultPluginPrefixResolver.java | 8 +++--
.../version/DefaultPluginVersionRequest.java | 1 +
.../maven/plugin/version/PluginVersionRequest.java | 1 +
.../version/PluginVersionResolutionException.java | 1 +
.../internal/DefaultPluginVersionResolver.java | 8 +++--
.../project/DefaultDependencyResolutionResult.java | 1 +
.../maven/project/DefaultMavenProjectHelper.java | 6 ++--
.../project/DefaultModelBuildingListener.java | 1 +
.../maven/project/DefaultProjectBuilder.java | 8 +++--
.../project/DefaultProjectBuildingHelper.java | 8 +++--
.../project/DefaultProjectBuildingRequest.java | 1 +
.../project/DefaultProjectBuildingResult.java | 1 +
.../DefaultProjectDependenciesResolver.java | 8 +++--
.../maven/project/DefaultProjectRealmCache.java | 6 ++--
.../maven/project/DependencyResolutionResult.java | 1 +
.../maven/project/ExtensionDescriptorBuilder.java | 1 +
.../project/InvalidProjectVersionException.java | 1 +
.../org/apache/maven/project/MavenProject.java | 1 +
.../org/apache/maven/project/ProjectBuilder.java | 1 +
.../maven/project/ProjectBuildingHelper.java | 1 +
.../maven/project/ProjectBuildingRequest.java | 1 +
.../maven/project/ProjectBuildingResult.java | 1 +
.../apache/maven/project/ProjectModelResolver.java | 1 +
.../apache/maven/project/ProjectRealmCache.java | 1 +
.../org/apache/maven/project/ProjectSorter.java | 1 +
.../org/apache/maven/project/ReactorModelPool.java | 1 +
.../project/artifact/ActiveProjectArtifact.java | 1 +
.../project/artifact/ArtifactWithDependencies.java | 1 +
.../maven/project/artifact/AttachedArtifact.java | 1 +
.../artifact/DefaultMavenMetadataCache.java | 6 ++--
.../project/artifact/DefaultMetadataSource.java | 1 +
.../artifact/DefaultProjectArtifactsCache.java | 6 ++--
.../InvalidDependencyVersionException.java | 1 +
.../maven/project/artifact/MavenMetadataCache.java | 1 +
.../project/artifact/MavenMetadataSource.java | 8 +++--
.../maven/project/artifact/PluginArtifact.java | 1 +
.../maven/project/artifact/ProjectArtifact.java | 1 +
.../project/artifact/ProjectArtifactMetadata.java | 1 +
.../project/artifact/ProjectArtifactsCache.java | 1 +
.../project/collector/DefaultProjectsSelector.java | 8 +++--
.../collector/MultiModuleCollectionStrategy.java | 8 +++--
.../collector/PomlessCollectionStrategy.java | 6 ++--
.../collector/ProjectCollectionStrategy.java | 1 +
.../maven/project/collector/ProjectsSelector.java | 1 +
.../collector/RequestPomCollectionStrategy.java | 8 +++--
.../apache/maven/project/path/PathTranslator.java | 1 +
.../properties/internal/EnvironmentUtils.java | 1 +
.../DelegatingLocalArtifactRepository.java | 1 +
.../apache/maven/repository/RepositorySystem.java | 1 +
.../legacy/metadata/ArtifactMetadataSource.java | 1 +
.../metadata/DefaultMetadataResolutionRequest.java | 1 +
.../legacy/metadata/MetadataResolutionRequest.java | 1 +
.../legacy/metadata/ResolutionGroup.java | 1 +
.../rtinfo/internal/DefaultRuntimeInformation.java | 8 +++--
.../maven/session/scope/internal/SessionScope.java | 9 +++---
.../session/scope/internal/SessionScopeModule.java | 3 +-
.../settings/DefaultMavenSettingsBuilder.java | 6 ++--
.../maven/settings/MavenSettingsBuilder.java | 1 +
.../org/apache/maven/settings/SettingsUtilsV4.java | 1 +
.../apache/maven/toolchain/DefaultToolchain.java | 1 +
.../maven/toolchain/DefaultToolchainManager.java | 10 +++---
.../toolchain/DefaultToolchainManagerPrivate.java | 8 +++--
.../maven/toolchain/DefaultToolchainsBuilder.java | 6 ++--
.../apache/maven/toolchain/ToolchainManager.java | 1 +
.../apache/maven/toolchain/ToolchainPrivate.java | 1 +
.../apache/maven/toolchain/ToolchainsBuilder.java | 1 +
.../maven/toolchain/java/JavaToolchainFactory.java | 6 ++--
.../maven/toolchain/java/JavaToolchainImpl.java | 1 +
.../maven/AbstractCoreMavenComponentTestCase.java | 6 ++--
.../java/org/apache/maven/DefaultMavenTest.java | 16 ++++++----
.../maven/MavenLifecycleParticipantTest.java | 7 ++--
.../src/test/java/org/apache/maven/MavenTest.java | 1 +
.../maven/ProjectDependenciesResolverTest.java | 12 ++++---
.../artifact/handler/ArtifactHandlerTest.java | 8 +++--
.../filter/ExclusionArtifactFilterTest.java | 11 ++++---
.../DefaultBeanConfiguratorPathTest.java | 5 +--
.../configuration/DefaultBeanConfiguratorTest.java | 5 +--
.../exception/DefaultExceptionHandlerTest.java | 5 +--
.../DefaultBuildResumptionAnalyzerTest.java | 11 ++++---
.../DefaultBuildResumptionDataRepositoryTest.java | 13 ++++----
.../DefaultMavenExecutionRequestPopulatorTest.java | 6 ++--
.../maven/execution/DefaultMavenExecutionTest.java | 9 +++---
.../scope/internal/MojoExecutionScopeTest.java | 9 +++---
.../maven/graph/DefaultGraphBuilderTest.java | 33 +++++++++----------
.../graph/DefaultProjectDependencyGraphTest.java | 5 +--
.../apache/maven/graph/ProjectSelectorTest.java | 21 ++++++------
.../maven/internal/MultilineMessageHelperTest.java | 5 +--
.../aether/ConsumerModelSourceTransformerTest.java | 1 +
.../aether/ReverseTreeRepositoryListenerTest.java | 15 +++++----
.../maven/internal/impl/PropertiesAsMapTest.java | 13 ++++----
.../org/apache/maven/internal/impl/TestApi.java | 8 +++--
.../maven/internal/impl/TestRepositorySystem.java | 8 +++--
.../maven/lifecycle/DefaultLifecyclesTest.java | 16 ++++++----
.../lifecycle/DelegatingMojoExecutionListener.java | 6 ++--
.../DelegatingProjectExecutionListener.java | 6 ++--
.../lifecycle/EmptyLifecyclePluginAnalyzer.java | 1 +
.../lifecycle/LifecycleExecutorSubModulesTest.java | 5 +--
.../maven/lifecycle/LifecycleExecutorTest.java | 16 ++++++----
.../maven/lifecycle/MavenExecutionPlanTest.java | 9 +++---
.../lifecycle/MojoExecutionXPathContainer.java | 1 +
.../internal/BuildListCalculatorTest.java | 9 +++---
.../internal/ConcurrencyDependencyGraphTest.java | 19 +++++------
.../internal/LifecycleDependencyResolverTest.java | 8 +++--
.../LifecycleExecutionPlanCalculatorTest.java | 4 +--
.../internal/LifecycleModuleBuilderTest.java | 8 +++--
.../LifecycleTaskSegmentCalculatorImplTest.java | 7 ++--
.../lifecycle/internal/PhaseRecorderTest.java | 7 ++--
.../lifecycle/internal/ProjectBuildListTest.java | 8 ++---
.../internal/builder/BuilderCommonTest.java | 9 +++---
.../ConcurrencyDependencyGraphTest.java | 5 +--
.../multithreaded/ThreadOutputMuxerTest.java | 5 +--
.../internal/stub/BuildPluginManagerStub.java | 1 +
.../internal/stub/CompletionServiceStub.java | 1 +
.../internal/stub/DefaultLifecyclesStub.java | 9 +++---
.../internal/stub/LifeCyclePluginAnalyzerStub.java | 1 +
.../stub/LifecycleExecutionPlanCalculatorStub.java | 1 +
.../stub/LifecycleTaskSegmentCalculatorStub.java | 1 +
.../lifecycle/internal/stub/MojoExecutorStub.java | 4 ++-
.../stub/ProjectDependenciesResolverStub.java | 1 +
.../internal/stub/ProjectDependencyGraphStub.java | 1 +
.../stub/ProjectDependencyGraphStubTest.java | 7 ++--
.../lifecycle/mapping/LifecyclePhaseTest.java | 9 +++---
.../org/apache/maven/plugin/PluginManagerTest.java | 10 +++---
.../maven/plugin/PluginParameterExceptionTest.java | 5 +--
.../PluginParameterExpressionEvaluatorTest.java | 14 ++++----
.../plugin/internal/DefaultLegacySupportTest.java | 5 +--
.../MavenPluginJavaPrerequisiteCheckerTest.java | 4 +--
.../plugin/internal/MavenPluginValidatorTest.java | 8 +++--
.../project/AbstractMavenProjectTestCase.java | 4 ++-
.../project/DefaultMavenProjectBuilderTest.java | 27 ++++++++--------
.../maven/project/EmptyLifecycleExecutor.java | 1 +
.../maven/project/EmptyProjectBuildingHelper.java | 1 +
.../project/ExtensionDescriptorBuilderTest.java | 13 ++++----
.../project/LegacyLocalRepositoryManager.java | 1 +
.../org/apache/maven/project/MavenProjectTest.java | 13 ++++----
.../apache/maven/project/PomConstructionTest.java | 26 ++++++++-------
.../apache/maven/project/ProjectBuilderTest.java | 29 +++++++++--------
.../ProjectBuildingResultWithLocationMatcher.java | 4 +--
...ectBuildingResultWithProblemMessageMatcher.java | 4 +--
.../maven/project/ProjectModelResolverTest.java | 15 +++++----
.../apache/maven/project/ProjectSorterTest.java | 11 ++++---
.../apache/maven/project/TestMetadataSource.java | 4 ++-
.../artifact/DefaultMavenMetadataCacheTest.java | 7 ++--
.../artifact/DefaultProjectArtifactsCacheTest.java | 5 +--
.../project/artifact/MavenMetadataSourceTest.java | 1 +
.../canonical/CanonicalProjectBuilderTest.java | 7 ++--
.../maven/project/harness/PomTestWrapper.java | 1 +
.../project/harness/Xpp3DomAttributeIterator.java | 1 +
.../project/harness/Xpp3DomAttributePointer.java | 1 +
.../maven/project/harness/Xpp3DomNodeIterator.java | 1 +
.../maven/project/harness/Xpp3DomNodePointer.java | 1 +
.../project/harness/Xpp3DomPointerFactory.java | 1 +
.../maven/repository/TestRepositoryConnector.java | 1 +
.../repository/TestRepositoryConnectorFactory.java | 1 +
.../maven/repository/TestRepositorySystem.java | 8 +++--
.../internal/DefaultRuntimeInformationTest.java | 11 ++++---
.../settings/PomConstructionWithSettingsTest.java | 8 +++--
.../apache/maven/settings/SettingsUtilsTest.java | 7 ++--
.../DefaultToolchainManagerPrivateTest.java | 15 +++++----
.../toolchain/DefaultToolchainManagerTest.java | 13 ++++----
.../maven/toolchain/DefaultToolchainTest.java | 13 ++++----
.../toolchain/RequirementMatcherFactoryTest.java | 4 +--
.../main/java/org/apache/maven/cli/CLIManager.java | 1 +
.../org/apache/maven/cli/CLIReportingUtils.java | 5 +--
.../main/java/org/apache/maven/cli/CliRequest.java | 1 +
.../main/java/org/apache/maven/cli/MavenCli.java | 13 ++++----
.../SettingsXmlConfigurationProcessor.java | 10 +++---
.../maven/cli/event/DefaultEventSpyContext.java | 1 +
.../maven/cli/event/ExecutionEventLogger.java | 9 +++---
.../internal/BootstrapCoreExtensionManager.java | 6 ++--
.../cli/logging/Slf4jConfigurationFactory.java | 1 +
.../maven/cli/logging/Slf4jStdoutLogger.java | 1 +
.../impl/UnsupportedSlf4jBindingConfiguration.java | 1 +
.../transfer/AbstractMavenTransferListener.java | 1 +
.../cli/transfer/ConsoleMavenTransferListener.java | 1 +
.../cli/transfer/Slf4jMavenTransferListener.java | 1 +
.../sisu/plexus/PlexusXmlBeanConverter.java | 20 ++++++------
.../maven/cli/CLIManagerDocumentationTest.java | 1 +
.../apache/maven/cli/CLIReportingUtilsTest.java | 4 +--
.../org/apache/maven/cli/CleanArgumentTest.java | 4 +--
.../java/org/apache/maven/cli/MavenCliTest.java | 37 +++++++++++-----------
.../maven/cli/event/ExecutionEventLoggerTest.java | 13 ++++----
.../maven/cli/transfer/FileSizeFormatTest.java | 7 ++--
.../maven/model/building/ArtifactModelSource.java | 1 +
.../building/BuildModelSourceTransformer.java | 6 ++--
.../building/DefaultBuildPomXMLFilterFactory.java | 1 +
.../maven/model/building/DefaultModelBuilder.java | 12 ++++---
.../model/building/DefaultModelBuilderFactory.java | 1 +
.../building/DefaultModelBuildingRequest.java | 1 +
.../model/building/DefaultModelBuildingResult.java | 1 +
.../building/DefaultModelProblemCollector.java | 1 +
.../model/building/DefaultModelProcessor.java | 8 +++--
.../building/DefaultModelSourceTransformer.java | 1 +
.../model/building/DefaultTransformerContext.java | 1 +
.../maven/model/building/FileModelSource.java | 1 +
.../maven/model/building/FileToRawModelMerger.java | 1 +
.../model/building/FilterModelBuildingRequest.java | 1 +
.../apache/maven/model/building/ModelBuilder.java | 1 +
.../model/building/ModelBuildingException.java | 1 +
.../maven/model/building/ModelBuildingRequest.java | 1 +
.../maven/model/building/ModelBuildingResult.java | 1 +
.../org/apache/maven/model/building/ModelData.java | 1 +
.../building/ModelProblemCollectorRequest.java | 1 +
.../maven/model/building/ModelProblemUtils.java | 1 +
.../model/building/ModelSourceTransformer.java | 1 +
.../org/apache/maven/model/building/Result.java | 8 ++---
.../maven/model/building/TransformerContext.java | 1 +
.../maven/model/building/UrlModelSource.java | 1 +
.../DefaultDependencyManagementImporter.java | 6 ++--
.../composition/DependencyManagementImporter.java | 1 +
.../inheritance/DefaultInheritanceAssembler.java | 6 ++--
.../AbstractStringBasedModelInterpolator.java | 4 ++-
.../interpolation/BuildTimestampValueSource.java | 1 +
.../DefaultModelVersionProcessor.java | 4 ++-
.../model/interpolation/ModelInterpolator.java | 1 +
.../model/interpolation/ModelVersionProcessor.java | 1 +
.../PathTranslatingPostProcessor.java | 1 +
.../StringVisitorModelInterpolator.java | 8 +++--
.../interpolation/UrlNormalizingPostProcessor.java | 1 +
.../apache/maven/model/io/DefaultModelReader.java | 8 +++--
.../apache/maven/model/io/DefaultModelWriter.java | 6 ++--
.../org/apache/maven/model/io/ModelReader.java | 1 +
.../org/apache/maven/model/io/ModelWriter.java | 1 +
.../maven/model/locator/DefaultModelLocator.java | 3 +-
.../DefaultDependencyManagementInjector.java | 6 ++--
.../DefaultPluginManagementInjector.java | 6 ++--
.../apache/maven/model/merge/MavenModelMerger.java | 1 +
.../normalization/DefaultModelNormalizer.java | 6 ++--
.../model/path/DefaultModelPathTranslator.java | 8 +++--
.../model/path/DefaultModelUrlNormalizer.java | 1 +
.../maven/model/path/DefaultPathTranslator.java | 3 +-
.../maven/model/path/ModelPathTranslator.java | 1 +
.../ProfileActivationFilePathInterpolator.java | 4 ++-
.../plugin/DefaultPluginConfigurationExpander.java | 4 ++-
.../plugin/DefaultReportConfigurationExpander.java | 1 +
.../profile/DefaultProfileActivationContext.java | 4 +--
.../model/profile/DefaultProfileInjector.java | 6 ++--
.../model/profile/DefaultProfileSelector.java | 8 +++--
.../maven/model/profile/ProfileSelector.java | 1 +
.../profile/activation/FileProfileActivator.java | 4 ++-
.../activation/JdkVersionProfileActivator.java | 6 ++--
.../OperatingSystemProfileActivator.java | 1 +
.../activation/PropertyProfileActivator.java | 1 +
.../maven/model/resolution/ModelResolver.java | 1 +
.../model/superpom/DefaultSuperPomProvider.java | 8 +++--
.../model/validation/DefaultModelValidator.java | 8 +++--
.../model/building/ComplexActivationTest.java | 9 +++---
.../building/DefaultModelBuilderFactoryTest.java | 9 +++---
.../model/building/DefaultModelBuilderTest.java | 7 ++--
.../maven/model/building/FileModelSourceTest.java | 9 +++---
.../model/building/FileToRawModelMergerTest.java | 7 ++--
.../model/building/SimpleProblemCollector.java | 1 +
.../DefaultInheritanceAssemblerTest.java | 9 +++---
.../AbstractModelInterpolatorTest.java | 9 +++---
.../interpolation/MavenBuildTimestampTest.java | 5 +--
.../maven/model/merge/MavenModelMergerTest.java | 7 ++--
.../maven/model/path/DefaultUrlNormalizerTest.java | 4 +--
.../activation/AbstractProfileActivatorTest.java | 5 +--
.../activation/FileProfileActivatorTest.java | 5 +--
.../activation/JdkVersionProfileActivatorTest.java | 1 +
.../activation/PropertyProfileActivatorTest.java | 1 +
.../validation/DefaultModelValidatorTest.java | 9 +++---
.../transform/BuildToRawPomXMLFilterFactory.java | 1 +
.../maven/model/transform/CiFriendlyXMLFilter.java | 1 +
.../maven/model/transform/FastForwardFilter.java | 1 +
.../maven/model/transform/ModulesXMLFilter.java | 1 +
.../maven/model/transform/ParentXMLFilter.java | 1 +
.../RawToConsumerPomXMLFilterFactory.java | 1 +
.../transform/ReactorDependencyXMLFilter.java | 1 +
.../model/transform/RelativePathXMLFilter.java | 1 +
.../model/transform/pull/BufferingParser.java | 1 +
.../model/transform/pull/NodeBufferingParser.java | 1 +
.../maven/model/transform/pull/XmlUtils.java | 1 +
.../model/transform/AbstractXMLFilterTests.java | 1 +
.../model/transform/CiFriendlyXMLFilterTest.java | 4 +--
.../model/transform/ConsumerPomXMLFilterTest.java | 5 +--
.../model/transform/ModulesXMLFilterTest.java | 4 +--
.../maven/model/transform/ParentXMLFilterTest.java | 5 +--
.../transform/ReactorDependencyXMLFilterTest.java | 5 +--
.../model/transform/RelativePathXMLFilterTest.java | 4 +--
.../maven/model/io/xpp3/MavenXpp3Reader.java | 1 +
.../maven/model/io/xpp3/MavenXpp3ReaderEx.java | 1 +
.../maven/model/io/xpp3/MavenXpp3Writer.java | 1 +
.../maven/model/io/xpp3/MavenXpp3WriterEx.java | 1 +
.../org/apache/maven/model/ActivationFileTest.java | 4 +--
.../org/apache/maven/model/ActivationOSTest.java | 4 +--
.../apache/maven/model/ActivationPropertyTest.java | 4 +--
.../org/apache/maven/model/ActivationTest.java | 4 +--
.../java/org/apache/maven/model/BuildTest.java | 4 +--
.../org/apache/maven/model/CiManagementTest.java | 4 +--
.../org/apache/maven/model/ContributorTest.java | 4 +--
.../maven/model/DependencyManagementTest.java | 4 +--
.../org/apache/maven/model/DependencyTest.java | 4 +--
.../maven/model/DeploymentRepositoryTest.java | 4 +--
.../java/org/apache/maven/model/DeveloperTest.java | 4 +--
.../maven/model/DistributionManagementTest.java | 4 +--
.../java/org/apache/maven/model/ExclusionTest.java | 4 +--
.../java/org/apache/maven/model/ExtensionTest.java | 4 +--
.../apache/maven/model/IssueManagementTest.java | 4 +--
.../java/org/apache/maven/model/LicenseTest.java | 4 +--
.../org/apache/maven/model/MailingListTest.java | 4 +--
.../java/org/apache/maven/model/ModelTest.java | 4 +--
.../java/org/apache/maven/model/NotifierTest.java | 4 +--
.../org/apache/maven/model/OrganizationTest.java | 4 +--
.../java/org/apache/maven/model/ParentTest.java | 4 +--
.../maven/model/PluginConfigurationTest.java | 4 +--
.../apache/maven/model/PluginContainerTest.java | 4 +--
.../apache/maven/model/PluginExecutionTest.java | 4 +--
.../apache/maven/model/PluginManagementTest.java | 4 +--
.../java/org/apache/maven/model/PluginTest.java | 4 +--
.../org/apache/maven/model/PrerequisitesTest.java | 4 +--
.../java/org/apache/maven/model/ProfileTest.java | 4 +--
.../org/apache/maven/model/RelocationTest.java | 4 +--
.../org/apache/maven/model/ReportPluginTest.java | 4 +--
.../java/org/apache/maven/model/ReportSetTest.java | 4 +--
.../java/org/apache/maven/model/ReportingTest.java | 4 +--
.../apache/maven/model/RepositoryPolicyTest.java | 4 +--
.../org/apache/maven/model/RepositoryTest.java | 4 +--
.../java/org/apache/maven/model/ResourceTest.java | 4 +--
.../test/java/org/apache/maven/model/ScmTest.java | 4 +--
.../org/apache/maven/model/SerializationTest.java | 5 +--
.../test/java/org/apache/maven/model/SiteTest.java | 4 +--
.../apache/maven/model/merge/MavenMergerTest.java | 9 +++---
.../org/apache/maven/model/v4/ModelXmlTest.java | 5 +--
.../java/org/apache/maven/plugin/AbstractMojo.java | 1 +
.../apache/maven/plugin/MojoNotFoundException.java | 1 +
.../maven/plugin/descriptor/MojoDescriptor.java | 1 +
.../maven/plugin/descriptor/PluginDescriptor.java | 1 +
.../plugin/descriptor/PluginDescriptorBuilder.java | 1 +
.../plugin/descriptor/MojoDescriptorTest.java | 4 +--
.../descriptor/PluginDescriptorBuilderTest.java | 13 ++++----
.../artifact/repository/metadata/MetadataTest.java | 9 +++---
.../internal/ArtifactDescriptorReaderDelegate.java | 1 +
.../internal/DefaultArtifactDescriptorReader.java | 8 +++--
.../repository/internal/DefaultModelCache.java | 1 +
.../internal/DefaultModelCacheFactory.java | 1 +
.../repository/internal/DefaultModelResolver.java | 1 +
.../internal/DefaultVersionRangeResolver.java | 8 +++--
.../internal/DefaultVersionResolver.java | 8 +++--
.../internal/DefaultVersionSchemeProvider.java | 1 +
.../repository/internal/LocalSnapshotMetadata.java | 1 +
.../internal/LocalSnapshotMetadataGenerator.java | 1 +
.../maven/repository/internal/MavenMetadata.java | 1 +
.../repository/internal/MavenResolverModule.java | 12 ++++---
.../repository/internal/MavenSnapshotMetadata.java | 1 +
.../maven/repository/internal/PluginsMetadata.java | 1 +
.../internal/PluginsMetadataGenerator.java | 1 +
.../internal/PluginsMetadataGeneratorFactory.java | 1 +
.../repository/internal/RelocatedArtifact.java | 1 +
.../internal/RemoteSnapshotMetadata.java | 1 +
.../internal/RemoteSnapshotMetadataGenerator.java | 1 +
.../internal/SnapshotMetadataGeneratorFactory.java | 1 +
.../repository/internal/VersionsMetadata.java | 1 +
.../internal/VersionsMetadataGenerator.java | 1 +
.../internal/VersionsMetadataGeneratorFactory.java | 1 +
.../internal/AbstractRepositoryTestCase.java | 6 ++--
.../DefaultArtifactDescriptorReaderTest.java | 11 ++++---
.../internal/DefaultModelResolverTest.java | 11 ++++---
.../internal/DefaultVersionResolverTest.java | 5 +--
.../internal/MavenRepositorySystemUtilsTest.java | 4 +--
.../internal/RemoteSnapshotMetadataTest.java | 5 +--
.../repository/internal/RepositorySystemTest.java | 13 ++++----
.../internal/util/ConsoleRepositoryListener.java | 1 +
.../internal/util/ConsoleTransferListener.java | 1 +
.../settings/building/DefaultSettingsBuilder.java | 8 +++--
.../building/DefaultSettingsBuildingResult.java | 1 +
.../building/DefaultSettingsProblemCollector.java | 1 +
.../settings/building/FileSettingsSource.java | 1 +
.../settings/building/SettingsBuildingResult.java | 1 +
.../maven/settings/building/UrlSettingsSource.java | 1 +
.../settings/crypto/DefaultSettingsDecrypter.java | 6 ++--
.../crypto/DefaultSettingsDecryptionRequest.java | 1 +
.../crypto/DefaultSettingsDecryptionResult.java | 1 +
.../crypto/MavenSecDispatcherProvider.java | 4 ++-
.../settings/crypto/SettingsDecryptionRequest.java | 1 +
.../settings/crypto/SettingsDecryptionResult.java | 1 +
.../maven/settings/io/DefaultSettingsReader.java | 6 ++--
.../maven/settings/io/DefaultSettingsWriter.java | 6 ++--
.../apache/maven/settings/io/SettingsReader.java | 1 +
.../apache/maven/settings/io/SettingsWriter.java | 1 +
.../maven/settings/merge/MavenSettingsMerger.java | 1 +
.../validation/DefaultSettingsValidator.java | 6 ++--
.../DefaultSettingsBuilderFactoryTest.java | 5 +--
.../validation/DefaultSettingsValidatorTest.java | 7 ++--
.../maven/settings/io/xpp3/SettingsXpp3Reader.java | 1 +
.../maven/settings/io/xpp3/SettingsXpp3Writer.java | 1 +
.../java/org/slf4j/impl/MavenLoggerFactory.java | 1 +
.../java/org/slf4j/impl/MavenSimpleLogger.java | 4 +--
.../org/slf4j/impl/MavenLoggerFactoryTest.java | 8 ++---
.../apache/maven/logwrapper/LogLevelRecorder.java | 1 +
.../maven/logwrapper/MavenSlf4jWrapperFactory.java | 1 +
.../maven/logwrapper/LogLevelRecorderTest.java | 6 ++--
.../building/DefaultToolchainsBuilder.java | 8 +++--
.../building/DefaultToolchainsBuildingResult.java | 1 +
.../building/ToolchainsBuildingException.java | 1 +
.../building/ToolchainsBuildingResult.java | 1 +
.../toolchain/io/DefaultToolchainsReader.java | 6 ++--
.../toolchain/io/DefaultToolchainsWriter.java | 6 ++--
.../maven/toolchain/io/ToolchainsReader.java | 1 +
.../maven/toolchain/io/ToolchainsWriter.java | 1 +
.../toolchain/merge/MavenToolchainMerger.java | 1 +
.../building/DefaultToolchainsBuilderTest.java | 13 ++++----
.../building/ToolchainsBuildingExceptionTest.java | 5 +--
.../toolchain/merge/MavenToolchainMergerTest.java | 5 +--
.../org/apache/maven/internal/xml/DomBuilder.java | 1 +
.../org/apache/maven/internal/xml/Xpp3Dom.java | 1 +
.../apache/maven/internal/xml/Xpp3DomBuilder.java | 1 +
.../apache/maven/internal/xml/Xpp3DomWriter.java | 1 +
.../java/org/codehaus/plexus/util/xml/Xpp3Dom.java | 1 +
.../codehaus/plexus/util/xml/Xpp3DomBuilder.java | 1 +
.../org/apache/maven/internal/xml/Xpp3DomTest.java | 5 +--
pom.xml | 2 +-
822 files changed, 2100 insertions(+), 1180 deletions(-)
diff --git a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
index fb7544ec1..0fc2a3c72 100644
--- a/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
+++ b/apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java
@@ -18,16 +18,17 @@
*/
package org.apache.maven.settings;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
+
import org.apache.maven.settings.v4.SettingsXpp3Reader;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Tests that the global settings.xml shipped with the distribution is in good state.
*
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/DependencyCoordinate.java b/api/maven-api-core/src/main/java/org/apache/maven/api/DependencyCoordinate.java
index c24cf191f..8142baf7d 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/DependencyCoordinate.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/DependencyCoordinate.java
@@ -19,6 +19,7 @@
package org.apache.maven.api;
import java.util.Collection;
+
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
import org.apache.maven.api.annotations.Nonnull;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Event.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Event.java
index a19479aa8..6952f8d1e 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Event.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Event.java
@@ -19,6 +19,7 @@
package org.apache.maven.api;
import java.util.Optional;
+
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/LocalRepository.java b/api/maven-api-core/src/main/java/org/apache/maven/api/LocalRepository.java
index 612b1ac94..7f0509be4 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/LocalRepository.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/LocalRepository.java
@@ -19,6 +19,7 @@
package org.apache.maven.api;
import java.nio.file.Path;
+
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
import org.apache.maven.api.annotations.Nonnull;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/MojoExecution.java b/api/maven-api-core/src/main/java/org/apache/maven/api/MojoExecution.java
index 0a8494f7c..ae078d96c 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/MojoExecution.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/MojoExecution.java
@@ -19,6 +19,7 @@
package org.apache.maven.api;
import java.util.Optional;
+
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.model.Plugin;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Node.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Node.java
index 13f77bb19..401563e61 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Node.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Node.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Optional;
import java.util.function.Predicate;
import java.util.stream.Stream;
+
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
import org.apache.maven.api.annotations.Nonnull;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Project.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Project.java
index f3c321857..2fe08b1b9 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Project.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Project.java
@@ -21,6 +21,7 @@ package org.apache.maven.api;
import java.nio.file.Path;
import java.util.List;
import java.util.Optional;
+
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.model.Build;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/ResolutionScope.java b/api/maven-api-core/src/main/java/org/apache/maven/api/ResolutionScope.java
index 8adccbb1a..4b2725220 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/ResolutionScope.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/ResolutionScope.java
@@ -26,6 +26,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import org.apache.maven.api.annotations.Experimental;
/**
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Scope.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Scope.java
index 186fb2a24..8edba0a24 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Scope.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Scope.java
@@ -19,6 +19,7 @@
package org.apache.maven.api;
import java.util.Locale;
+
import org.apache.maven.api.annotations.Experimental;
/**
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java
index 4ed8a3874..5bdc43485 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Optional;
+
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.ThreadSafe;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/SessionData.java b/api/maven-api-core/src/main/java/org/apache/maven/api/SessionData.java
index c8833519c..2f0a27857 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/SessionData.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/SessionData.java
@@ -19,6 +19,7 @@
package org.apache.maven.api;
import java.util.function.Supplier;
+
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.Nullable;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Toolchain.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Toolchain.java
index 92aca129f..c4c108723 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Toolchain.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Toolchain.java
@@ -19,6 +19,7 @@
package org.apache.maven.api;
import java.util.Map;
+
import org.apache.maven.api.annotations.Experimental;
/**
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Component.java b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Component.java
index 0459eda4b..ad3e593f4 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Component.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Component.java
@@ -24,6 +24,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+
import org.apache.maven.api.annotations.Experimental;
/**
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Execute.java b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Execute.java
index 07f33319c..ec4bde63b 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Execute.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Execute.java
@@ -24,6 +24,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+
import org.apache.maven.api.annotations.Experimental;
/**
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Mojo.java b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Mojo.java
index 415c6631e..07c9ec0f7 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Mojo.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Mojo.java
@@ -24,6 +24,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+
import org.apache.maven.api.ResolutionScope;
import org.apache.maven.api.annotations.Experimental;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Parameter.java b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Parameter.java
index df2d6c253..e6e7f81a0 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Parameter.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Parameter.java
@@ -24,6 +24,7 @@ import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+
import org.apache.maven.api.annotations.Experimental;
/**
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactoryRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactoryRequest.java
index 66f795afe..55acc2246 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactoryRequest.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactoryRequest.java
@@ -18,8 +18,6 @@
*/
package org.apache.maven.api.services;
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
import org.apache.maven.api.ArtifactCoordinate;
import org.apache.maven.api.Session;
import org.apache.maven.api.annotations.Experimental;
@@ -27,6 +25,8 @@ import org.apache.maven.api.annotations.Immutable;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.NotThreadSafe;
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
/**
* A request for creating a {@link ArtifactCoordinate} object.
*
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployer.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployer.java
index 349480479..8ecb7e13e 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployer.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployer.java
@@ -19,6 +19,7 @@
package org.apache.maven.api.services;
import java.util.Collection;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.RemoteRepository;
import org.apache.maven.api.Service;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java
index 8ed8ec6ec..1a92f6978 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java
@@ -18,9 +18,8 @@
*/
package org.apache.maven.api.services;
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
import java.util.Collection;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.RemoteRepository;
import org.apache.maven.api.Session;
@@ -28,6 +27,8 @@ import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
import org.apache.maven.api.annotations.Nonnull;
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
/**
* A request for deploying one or more artifacts to a remote repository.
*
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java
index e5e55ec3d..032ecb83a 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java
@@ -18,14 +18,14 @@
*/
package org.apache.maven.api.services;
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
import org.apache.maven.api.Session;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.NotThreadSafe;
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
/**
*
*
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstaller.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstaller.java
index 57fa2c4fd..f2d4668b8 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstaller.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstaller.java
@@ -20,6 +20,7 @@ package org.apache.maven.api.services;
import java.util.Collection;
import java.util.Collections;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.Service;
import org.apache.maven.api.Session;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java
index 9e33d2444..dab26c4ba 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java
@@ -18,10 +18,9 @@
*/
package org.apache.maven.api.services;
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
import java.util.Collection;
import java.util.Collections;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.Session;
import org.apache.maven.api.annotations.Experimental;
@@ -30,6 +29,8 @@ import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.NotThreadSafe;
import org.apache.maven.api.annotations.Nullable;
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
/**
* A request for installing one or more artifacts in the local repository.
*
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactManager.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactManager.java
index cf8a6624a..44c05251f 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactManager.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactManager.java
@@ -20,6 +20,7 @@ package org.apache.maven.api.services;
import java.nio.file.Path;
import java.util.Optional;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.Service;
import org.apache.maven.api.annotations.Experimental;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolver.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolver.java
index 3d3eadfc1..b73e59f45 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolver.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolver.java
@@ -19,6 +19,7 @@
package org.apache.maven.api.services;
import java.util.Collection;
+
import org.apache.maven.api.ArtifactCoordinate;
import org.apache.maven.api.Service;
import org.apache.maven.api.Session;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java
index 614ae8108..36c63d56d 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java
@@ -18,9 +18,8 @@
*/
package org.apache.maven.api.services;
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
import java.util.Collection;
+
import org.apache.maven.api.ArtifactCoordinate;
import org.apache.maven.api.Session;
import org.apache.maven.api.annotations.Experimental;
@@ -28,6 +27,8 @@ import org.apache.maven.api.annotations.Immutable;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.NotThreadSafe;
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
/**
* A request for resolving an artifact.
*
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverResult.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverResult.java
index 2a50239f8..928653bcf 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverResult.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverResult.java
@@ -20,6 +20,7 @@ package org.apache.maven.api.services;
import java.nio.file.Path;
import java.util.Map;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/BaseRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/BaseRequest.java
index e48f2b55e..119a3030e 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/BaseRequest.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/BaseRequest.java
@@ -21,6 +21,7 @@ package org.apache.maven.api.services;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+
import org.apache.maven.api.Session;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java
index 46c7ea372..62f87b7a5 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java
@@ -18,13 +18,12 @@
*/
package org.apache.maven.api.services;
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.DependencyCoordinate;
import org.apache.maven.api.Project;
@@ -35,6 +34,8 @@ import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.NotThreadSafe;
import org.apache.maven.api.annotations.Nullable;
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
/**
* A request to collect the transitive dependencies and to build a dependency graph from them. There are three ways to
* create a dependency graph. First, only the root dependency can be given. Second, a root dependency and direct
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorResult.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorResult.java
index 9f01ca7af..3e5f98094 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorResult.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorResult.java
@@ -19,6 +19,7 @@
package org.apache.maven.api.services;
import java.util.List;
+
import org.apache.maven.api.Node;
import org.apache.maven.api.annotations.Experimental;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactoryRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactoryRequest.java
index 583aa70d9..9c907e93a 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactoryRequest.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactoryRequest.java
@@ -18,11 +18,10 @@
*/
package org.apache.maven.api.services;
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+
import org.apache.maven.api.ArtifactCoordinate;
import org.apache.maven.api.Dependency;
import org.apache.maven.api.Exclusion;
@@ -32,6 +31,8 @@ import org.apache.maven.api.annotations.Immutable;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.NotThreadSafe;
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
/**
*
* @since 4.0
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/LocalRepositoryManager.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/LocalRepositoryManager.java
index ffc798b37..02da9ecac 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/LocalRepositoryManager.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/LocalRepositoryManager.java
@@ -19,6 +19,7 @@
package org.apache.maven.api.services;
import java.nio.file.Path;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.LocalRepository;
import org.apache.maven.api.RemoteRepository;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/Lookup.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/Lookup.java
index 3dc7e8a0b..07a0d4bca 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/Lookup.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/Lookup.java
@@ -20,6 +20,7 @@ package org.apache.maven.api.services;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.api.Service;
public interface Lookup extends Service {
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilder.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilder.java
index cfe7bed41..b7bea08d3 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilder.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilder.java
@@ -19,6 +19,7 @@
package org.apache.maven.api.services;
import java.nio.file.Path;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.ArtifactCoordinate;
import org.apache.maven.api.Service;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java
index 20b6969e5..f551f1379 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java
@@ -18,10 +18,9 @@
*/
package org.apache.maven.api.services;
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
import java.nio.file.Path;
import java.util.Optional;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.ArtifactCoordinate;
import org.apache.maven.api.Session;
@@ -31,6 +30,8 @@ import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.NotThreadSafe;
import org.apache.maven.api.annotations.Nullable;
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
/**
* Request used to build a {@link org.apache.maven.api.Project} using
* the {@link ProjectBuilder} service.
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java
index 4826fe46f..b243d0620 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java
@@ -21,6 +21,7 @@ package org.apache.maven.api.services;
import java.nio.file.Path;
import java.util.Collection;
import java.util.Optional;
+
import org.apache.maven.api.Project;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java
index e19d9f0d8..413db59d0 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java
@@ -22,6 +22,7 @@ import java.nio.file.Path;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.Node;
import org.apache.maven.api.Project;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/Prompter.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/Prompter.java
index 7e0d5c67f..53f02b415 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/Prompter.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/Prompter.java
@@ -19,6 +19,7 @@
package org.apache.maven.api.services;
import java.util.List;
+
import org.apache.maven.api.Service;
import org.apache.maven.api.annotations.Experimental;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/RepositoryFactory.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/RepositoryFactory.java
index e140b7edf..21019146d 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/RepositoryFactory.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/RepositoryFactory.java
@@ -19,6 +19,7 @@
package org.apache.maven.api.services;
import java.nio.file.Path;
+
import org.apache.maven.api.LocalRepository;
import org.apache.maven.api.RemoteRepository;
import org.apache.maven.api.Service;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilder.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilder.java
index dc3e25968..86568510a 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilder.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilder.java
@@ -19,6 +19,7 @@
package org.apache.maven.api.services;
import java.nio.file.Path;
+
import org.apache.maven.api.Service;
import org.apache.maven.api.Session;
import org.apache.maven.api.annotations.Nonnull;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderRequest.java
index b2c8bad7f..95923fab9 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderRequest.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderRequest.java
@@ -18,10 +18,9 @@
*/
package org.apache.maven.api.services;
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
import java.nio.file.Path;
import java.util.Optional;
+
import org.apache.maven.api.Session;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
@@ -29,6 +28,8 @@ import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.NotThreadSafe;
import org.apache.maven.api.annotations.Nullable;
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
/**
* Collects settings that control the building of effective settings.
*/
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderResult.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderResult.java
index 2b91d6299..201501ea5 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderResult.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderResult.java
@@ -19,6 +19,7 @@
package org.apache.maven.api.services;
import java.util.List;
+
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.settings.Settings;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/Source.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/Source.java
index 631e8c7d7..1f83f7665 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/Source.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/Source.java
@@ -20,6 +20,7 @@ package org.apache.maven.api.services;
import java.io.IOException;
import java.io.InputStream;
+
import org.apache.maven.api.annotations.Experimental;
/**
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainManager.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainManager.java
index d430a6a09..f79bea8b2 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainManager.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainManager.java
@@ -21,6 +21,7 @@ package org.apache.maven.api.services;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+
import org.apache.maven.api.Service;
import org.apache.maven.api.Session;
import org.apache.maven.api.Toolchain;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderRequest.java
index 963b94e8c..7999fe157 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderRequest.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderRequest.java
@@ -18,15 +18,16 @@
*/
package org.apache.maven.api.services;
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
import java.nio.file.Path;
import java.util.Optional;
+
import org.apache.maven.api.Session;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.NotThreadSafe;
import org.apache.maven.api.annotations.Nullable;
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
public interface ToolchainsBuilderRequest {
@Nonnull
Session getSession();
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderResult.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderResult.java
index 464542124..30ac872af 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderResult.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderResult.java
@@ -19,6 +19,7 @@
package org.apache.maven.api.services;
import java.util.List;
+
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.toolchain.PersistedToolchains;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/Transport.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/Transport.java
index 3db9d8592..2448ceeb6 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/Transport.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/Transport.java
@@ -24,6 +24,7 @@ import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.Optional;
+
import org.apache.maven.api.RemoteRepository;
import org.apache.maven.api.annotations.Consumer;
import org.apache.maven.api.annotations.Experimental;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlFactory.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlFactory.java
index 8ebc3ae5d..1e2708e4b 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlFactory.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlFactory.java
@@ -25,6 +25,7 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
import java.nio.file.Path;
+
import org.apache.maven.api.Service;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java
index e9df19e0a..e2863518b 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.io.Reader;
import java.net.URL;
import java.nio.file.Path;
+
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
import org.apache.maven.api.annotations.Nonnull;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlWriterRequest.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlWriterRequest.java
index 4cf92ffcd..9df83c9a3 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlWriterRequest.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlWriterRequest.java
@@ -21,6 +21,7 @@ package org.apache.maven.api.services.xml;
import java.io.OutputStream;
import java.io.Writer;
import java.nio.file.Path;
+
import org.apache.maven.api.annotations.Experimental;
/**
diff --git a/api/maven-api-xml/src/main/java/org/apache/maven/api/xml/Dom.java b/api/maven-api-xml/src/main/java/org/apache/maven/api/xml/Dom.java
index f72d05591..7a3822415 100644
--- a/api/maven-api-xml/src/main/java/org/apache/maven/api/xml/Dom.java
+++ b/api/maven-api-xml/src/main/java/org/apache/maven/api/xml/Dom.java
@@ -20,6 +20,7 @@ package org.apache.maven.api.xml;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
import org.apache.maven.api.annotations.Nonnull;
diff --git a/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/Helper.java b/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/Helper.java
index 70e0dd886..39e04e59b 100644
--- a/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/Helper.java
+++ b/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/Helper.java
@@ -21,6 +21,7 @@ package org.codehaus.modello.plugin.velocity;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
import org.codehaus.modello.ModelloRuntimeException;
import org.codehaus.modello.model.ModelAssociation;
import org.codehaus.modello.model.ModelClass;
diff --git a/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/ModelloVelocityMojo.java b/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/ModelloVelocityMojo.java
index 74739795d..2298252fe 100644
--- a/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/ModelloVelocityMojo.java
+++ b/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/ModelloVelocityMojo.java
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.stream.Collectors;
+
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
diff --git a/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java b/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java
index 40323e87e..132a77a3b 100644
--- a/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java
+++ b/api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java
@@ -27,6 +27,7 @@ import java.nio.file.Paths;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
+
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.runtime.RuntimeInstance;
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
index e85b7fa00..5d5463615 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.util.Collection;
import java.util.List;
import java.util.regex.Pattern;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
index 555375a92..2b44cf3f7 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
@@ -24,6 +24,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
+
import org.apache.commons.lang3.Validate;
import org.apache.maven.artifact.versioning.VersionRange;
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
index e7bf52b6e..dbf93e9fc 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
index 0c0a02d4a..cce830667 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.repository;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
index baca0e154..ae45a428d 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
@@ -20,6 +20,7 @@ package org.apache.maven.artifact.resolver;
import java.util.Iterator;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
index 8e4632e17..9fa973218 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.resolver;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
index c6fa72360..c3389fa49 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.resolver;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
index 1186af807..96d8c5036 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
@@ -20,6 +20,7 @@ package org.apache.maven.artifact.resolver;
import java.util.ArrayList;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
index d4d6aebc3..10da535c1 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
@@ -18,10 +18,10 @@
*/
package org.apache.maven.artifact.versioning;
-import static org.apache.commons.lang3.math.NumberUtils.isDigits;
-
import java.util.StringTokenizer;
+import static org.apache.commons.lang3.math.NumberUtils.isDigits;
+
/**
* Default implementation of artifact versioning.
*
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
index 52afaad0c..9b15eb382 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.versioning;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
index 20c06f3de..449aaf1d6 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.WeakHashMap;
+
import org.apache.maven.artifact.Artifact;
/**
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
index 98ccb948e..63c48a076 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java
@@ -18,17 +18,18 @@
*/
package org.apache.maven.artifact;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.artifact.versioning.VersionRange;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Tests {@link ArtifactUtils}.
*
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
index 1c068d404..e6c9c6f24 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
@@ -18,15 +18,15 @@
*/
package org.apache.maven.artifact;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.maven.artifact.handler.ArtifactHandlerMock;
import org.apache.maven.artifact.versioning.VersionRange;
import org.junit.jupiter.api.BeforeEach;
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.assertTrue;
+
public class DefaultArtifactTest {
private DefaultArtifact artifact;
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
index dd31f5bee..eaa403b83 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
@@ -18,8 +18,6 @@
*/
package org.apache.maven.artifact.versioning;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.file.FileVisitResult;
@@ -29,8 +27,11 @@ import java.nio.file.Paths;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.regex.Pattern;
+
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class ComparableVersionIT {
@Test
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
index da15aa822..5695a2b9a 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
@@ -18,12 +18,13 @@
*/
package org.apache.maven.artifact.versioning;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.util.Locale;
+
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Test ComparableVersion.
*
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
index b1de43b33..8f8e222ca 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.maven.artifact.versioning;
+import org.junit.jupiter.api.Test;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.jupiter.api.Test;
-
/**
* Test DefaultArtifactVersion.
*
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
index 6a11998cc..b4aa8d603 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.maven.artifact.versioning;
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+import org.junit.jupiter.api.Test;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -25,10 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.util.List;
-import org.apache.maven.artifact.Artifact;
-import org.junit.jupiter.api.Test;
-
/**
* Tests version range construction.
*
diff --git a/maven-bom/pom.xml b/maven-bom/pom.xml
index 60c602dbc..f3435eca0 100644
--- a/maven-bom/pom.xml
+++ b/maven-bom/pom.xml
@@ -23,7 +23,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>39</version>
- <relativePath/>
+ <relativePath />
</parent>
<artifactId>maven-bom</artifactId>
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
index 632ab6a31..9ff152c02 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java
@@ -18,13 +18,13 @@
*/
package org.apache.maven.building;
+import org.apache.maven.building.Problem.Severity;
+import org.junit.jupiter.api.Test;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-import org.apache.maven.building.Problem.Severity;
-import org.junit.jupiter.api.Test;
-
public class DefaultProblemCollectorTest {
@Test
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
index 857c222eb..4bbe56b89 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java
@@ -18,13 +18,13 @@
*/
package org.apache.maven.building;
+import org.apache.maven.building.Problem.Severity;
+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;
-import org.apache.maven.building.Problem.Severity;
-import org.junit.jupiter.api.Test;
-
public class DefaultProblemTest {
@Test
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java
index 320a2cd86..1b10a24af 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java
@@ -18,14 +18,15 @@
*/
package org.apache.maven.building;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import java.io.File;
import java.io.InputStream;
import java.util.Scanner;
+
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
public class FileSourceTest {
@Test
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
index 6bab9e6c6..cefd06c12 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
@@ -18,12 +18,13 @@
*/
package org.apache.maven.building;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-
import java.util.Collections;
+
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
public class ProblemCollectorFactoryTest {
@Test
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java
index 2c4716977..cfb6e0cbe 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java
@@ -18,12 +18,13 @@
*/
package org.apache.maven.building;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.io.InputStream;
import java.util.Scanner;
+
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class StringSourceTest {
@Test
public void testGetInputStream() throws Exception {
diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java b/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java
index 7ba2a647e..bb1455f98 100644
--- a/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java
+++ b/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java
@@ -18,15 +18,16 @@
*/
package org.apache.maven.building;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import java.io.File;
import java.io.InputStream;
import java.net.URL;
import java.util.Scanner;
+
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
public class UrlSourceTest {
@Test
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
index 739a742fe..758433992 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.deployer;
import java.io.File;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
index 2be72f8af..e64df5933 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
@@ -21,6 +21,7 @@ package org.apache.maven.artifact.deployer;
import java.io.File;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java b/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
index 40e43a433..d0d67b4a3 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.installer;
import java.io.File;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java b/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
index 2fd26e5f2..7101f7169 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.installer;
import java.io.File;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
index cc3ad612f..4a61ba760 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.manager;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
index ef7aa85fc..603501b90 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.manager;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.wagon.ResourceDoesNotExistException;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
index c0e19f4de..bd748b922 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
@@ -21,6 +21,7 @@ package org.apache.maven.artifact.repository;
import java.io.File;
import java.util.Collections;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
index ddc789c22..f5ae8ea4f 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
@@ -20,6 +20,7 @@ package org.apache.maven.artifact.repository;
import java.util.Arrays;
import java.util.List;
+
import org.apache.maven.artifact.UnknownRepositoryLayoutException;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.plugin.LegacySupport;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
index dc7c115c4..a1c482708 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
@@ -27,6 +27,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
index ff8683410..9a8eecab8 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
@@ -20,6 +20,7 @@ package org.apache.maven.artifact.repository.metadata;
import java.util.Iterator;
import java.util.List;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
/**
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
index 179273a20..fbe682a05 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
@@ -21,6 +21,7 @@ package org.apache.maven.artifact.repository.metadata;
import java.io.File;
import java.util.Collections;
import java.util.Map;
+
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
index 28d9438e0..7ce05c5e1 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java
@@ -20,6 +20,7 @@ package org.apache.maven.artifact.resolver;
import java.util.List;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
index 259535943..017d576df 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
@@ -21,6 +21,7 @@ package org.apache.maven.artifact.resolver;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
index 8e14e56d2..1f0d843d1 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
@@ -21,6 +21,7 @@ package org.apache.maven.artifact.resolver;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.versioning.VersionRange;
import org.codehaus.plexus.logging.Logger;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 5e7a32989..952382a23 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -35,6 +35,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Matcher;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java
index 9af55207b..8a3314f75 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.resolver;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
index 8529c1a8e..52d056dc8 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
@@ -21,6 +21,7 @@ package org.apache.maven.artifact.resolver.filter;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
/**
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java b/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
index 62738d50c..9e6b78eeb 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
@@ -21,6 +21,7 @@ package org.apache.maven.artifact.versioning;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
import org.apache.maven.artifact.Artifact;
/**
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
index 0ad8165c1..87c48f7da 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
+
import org.apache.maven.profiles.io.xpp3.ProfilesXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
index 59f40e4a4..e22923e22 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
@@ -23,6 +23,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+
import org.apache.maven.model.Activation;
import org.apache.maven.model.Profile;
import org.apache.maven.model.building.ModelProblem;
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java b/maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
index 2765fa68e..a6ad7b97a 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
@@ -20,6 +20,7 @@ package org.apache.maven.profiles;
import java.io.File;
import java.io.IOException;
+
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java b/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java
index 33aa6717e..3781be1c6 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java
@@ -21,6 +21,7 @@ package org.apache.maven.profiles;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+
import org.apache.maven.model.Profile;
import org.apache.maven.profiles.activation.ProfileActivationException;
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java b/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
index 27a90388f..e0e77d280 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
@@ -19,6 +19,7 @@
package org.apache.maven.profiles;
import java.util.List;
+
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationFile;
import org.apache.maven.model.ActivationProperty;
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java b/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
index eaa0ac3b0..ad5394a4e 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
@@ -19,6 +19,7 @@
package org.apache.maven.profiles.activation;
import java.io.IOException;
+
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationFile;
import org.apache.maven.model.Profile;
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java b/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java
index 356a3e4e1..b2365f70a 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java
@@ -19,6 +19,7 @@
package org.apache.maven.profiles.activation;
import java.util.Properties;
+
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Profile;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
index d59d8a4d1..85a28e32d 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java b/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
index b407bb469..e19fdec54 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
@@ -20,6 +20,7 @@ package org.apache.maven.project;
import java.util.Date;
import java.util.Properties;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.profiles.ProfileManager;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java b/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
index 9949071d4..b3c86d399 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
@@ -19,6 +19,7 @@
package org.apache.maven.project;
import java.io.File;
+
import org.apache.maven.project.validation.ModelValidationResult;
/**
diff --git a/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
index c23db02fe..c471a5c95 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
@@ -20,6 +20,7 @@ package org.apache.maven.project;
import java.io.File;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
index 7fa485368..baf054a48 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
@@ -19,6 +19,7 @@
package org.apache.maven.project;
import java.util.List;
+
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginContainer;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java b/maven-compat/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
index f8aefe722..e4b98e121 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
@@ -20,6 +20,7 @@ package org.apache.maven.project;
import java.util.Date;
import java.util.Properties;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.profiles.ProfileManager;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java b/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
index 73d39604a..15c215885 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
@@ -21,6 +21,7 @@ package org.apache.maven.project;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
index 124730876..7479f76c7 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
@@ -28,6 +28,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
index e416743e6..f2af8036a 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
@@ -20,6 +20,7 @@ package org.apache.maven.project.interpolation;
import java.text.SimpleDateFormat;
import java.util.Date;
+
import org.codehaus.plexus.interpolation.AbstractValueSource;
/**
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
index 6349f4a03..41a459d83 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
@@ -20,6 +20,7 @@ package org.apache.maven.project.interpolation;
import java.io.File;
import java.util.Map;
+
import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuilderConfiguration;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
index 0ab1738a8..c6651fbf7 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
@@ -20,6 +20,7 @@ package org.apache.maven.project.interpolation;
import java.io.File;
import java.util.List;
+
import org.apache.maven.project.path.PathTranslator;
import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
import org.codehaus.plexus.interpolation.util.ValueSourceUtils;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
index bb8831be6..5cb8c6074 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
@@ -20,6 +20,7 @@ package org.apache.maven.project.interpolation;
import java.io.IOException;
import java.util.Properties;
+
import org.apache.maven.project.path.PathTranslator;
import org.codehaus.plexus.interpolation.Interpolator;
import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
index f3eec8e15..259208e45 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
@@ -29,6 +29,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
+
import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.path.PathTranslator;
diff --git a/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java b/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
index 68e5880f4..6c9083fb4 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
@@ -21,6 +21,7 @@ package org.apache.maven.project.path;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
+
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.Reporting;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java b/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
index 697dd484b..e03a0f5de 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
@@ -21,6 +21,7 @@ package org.apache.maven.repository;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.settings.Mirror;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
index c44eafe2b..6e7b4e7db 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java
@@ -21,6 +21,7 @@ package org.apache.maven.repository;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
index d22c0a24a..1e8a20e75 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java b/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
index b5f0bb3db..e7a8cecdf 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository;
import java.util.List;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.settings.Mirror;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java b/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
index 3915ea196..ffc2be9c5 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository;
import java.io.File;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java b/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
index ba1165283..9cb5c144a 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository;
import java.io.File;
+
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Dependency;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
index e538c934e..6e2633cc1 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java
@@ -27,6 +27,7 @@ import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.util.Date;
import java.util.Properties;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
index 1fc946b99..3ffc399ed 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index 85bc5b355..695cff567 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
index af2439146..f03f13d4b 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
@@ -20,6 +20,7 @@ package org.apache.maven.repository.legacy;
import java.util.IdentityHashMap;
import java.util.Map;
+
import org.apache.maven.repository.ArtifactTransferEvent;
import org.apache.maven.repository.ArtifactTransferListener;
import org.apache.maven.repository.ArtifactTransferResource;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
index a22f03b87..a84448d9a 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository.legacy;
import java.io.File;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
index 165230552..8dd0f6c28 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
@@ -20,6 +20,7 @@ package org.apache.maven.repository.legacy;
import java.io.File;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
index 057085920..3c3de6587 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository.legacy.repository;
import java.util.Map;
+
import org.apache.maven.artifact.UnknownRepositoryLayoutException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
index 2bfbac0ac..e03a0e5d1 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
@@ -26,6 +26,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
index 6ce350d54..6df6a9a9b 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
@@ -21,6 +21,7 @@ package org.apache.maven.repository.legacy.resolver;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
index 1ef8a51a9..5d37d4d3e 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository.legacy.resolver.transform;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
index 39739f1c2..543531815 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository.legacy.resolver.transform;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
index 029497f06..0ef1c95ad 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository.legacy.resolver.transform;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
index d61b006b8..ca53d0672 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository.legacy.resolver.transform;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
index f5516e6dc..b06add804 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
@@ -23,6 +23,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.TimeZone;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeploymentException;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
index 8742973fa..972a0497f 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository.metadata;
import java.util.Collection;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactScopeEnum;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
index 6091e1a9f..e700f7f4f 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
@@ -21,6 +21,7 @@ package org.apache.maven.repository.metadata;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
import org.apache.maven.artifact.ArtifactScopeEnum;
/**
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
index 87e0b1da5..b7c3425fb 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java
@@ -21,6 +21,7 @@ package org.apache.maven.repository.metadata;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
import org.apache.maven.artifact.ArtifactScopeEnum;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
index 429635ca1..3bb1bd00b 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java
@@ -21,6 +21,7 @@ package org.apache.maven.repository.metadata;
import java.util.ArrayList;
import java.util.List;
import java.util.TreeSet;
+
import org.apache.maven.artifact.ArtifactScopeEnum;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
index 0bb441de7..0b6227cb2 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
+
import org.apache.maven.artifact.ArtifactScopeEnum;
/**
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
index 922399294..16f36e716 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository.metadata;
import java.util.Collection;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
/**
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
index 163dce602..0345228b8 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository.metadata;
import java.util.List;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
/** @author Oleg Gusakov */
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
index 69f14d970..34e238cbf 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository.metadata;
import java.util.List;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
/**
diff --git a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
index 00e104c80..810446186 100644
--- a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
+++ b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
@@ -29,6 +29,7 @@ import java.net.URLClassLoader;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.usability.plugin.io.xpp3.ParamdocXpp3Reader;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
index 9607560b2..7aaba7481 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java
@@ -18,9 +18,8 @@
*/
package org.apache.maven.artifact;
-import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
+import javax.inject.Named;
import java.io.File;
import java.io.FileOutputStream;
@@ -31,8 +30,7 @@ import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Named;
+
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
@@ -68,6 +66,10 @@ import org.eclipse.aether.util.graph.traverser.FatArtifactTraverser;
import org.eclipse.aether.util.repository.SimpleArtifactDescriptorPolicy;
import org.junit.jupiter.api.BeforeEach;
+import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl </a>
*/
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
index a9fa595ce..1d8278f44 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
@@ -18,13 +18,10 @@
*/
package org.apache.maven.artifact.deployer;
-import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
+import javax.inject.Inject;
import java.io.File;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -33,6 +30,11 @@ import org.apache.maven.session.scope.internal.SessionScope;
import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.Test;
+import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
*/
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java b/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java
index c658eb424..9b39ed06d 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java
@@ -18,10 +18,12 @@
*/
package org.apache.maven.artifact.deployer;
-import java.util.Collections;
-import java.util.List;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.Collections;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.ArtifactVersion;
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
index e0b841d85..216ea3780 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
@@ -18,14 +18,15 @@
*/
package org.apache.maven.artifact.factory;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import javax.inject.Inject;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.versioning.VersionRange;
import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
@PlexusTest
public class DefaultArtifactFactoryTest {
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
index 124df752e..2d1215176 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
@@ -18,17 +18,19 @@
*/
package org.apache.maven.artifact.installer;
-import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
-import static org.mockito.Mockito.mock;
+import javax.inject.Inject;
import java.io.File;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.session.scope.internal.SessionScope;
import org.junit.jupiter.api.Test;
+import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
+import static org.mockito.Mockito.mock;
+
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
*/
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java b/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java
index feae22a6e..516d0b9d7 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java
@@ -18,12 +18,14 @@
*/
package org.apache.maven.artifact.metadata;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
index fde9f90b1..77cf7236e 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java
@@ -18,11 +18,11 @@
*/
package org.apache.maven.artifact.repository;
+import org.junit.jupiter.api.Test;
+
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.jupiter.api.Test;
-
public class MavenArtifactRepositoryTest {
private static class MavenArtifactRepositorySubclass extends MavenArtifactRepository {
String id;
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
index edf3410a9..440e8c1a8 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java
@@ -18,12 +18,13 @@
*/
package org.apache.maven.artifact.resolver;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.util.Arrays;
import java.util.List;
+
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* Test the artifact resolution exception message
*
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
index 68c8c9955..0bd8f7665 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
@@ -18,9 +18,7 @@
*/
package org.apache.maven.artifact.resolver;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
import java.util.ArrayList;
import java.util.Collections;
@@ -29,7 +27,7 @@ import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -40,6 +38,10 @@ import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
// It would be cool if there was a hook that I could use to set up a test environment.
// I want to set up a local/remote repositories for testing but I don't want to have
// to change them when I change the layout of the repositories. So I want to generate
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
index 8eb2f2164..4ff3d02d1 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
@@ -18,16 +18,18 @@
*/
package org.apache.maven.artifact.resolver;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
import java.util.Collections;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.DefaultArtifactResolver.DaemonThreadCreator;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class DefaultArtifactResolverTest extends AbstractArtifactComponentTestCase {
@Inject
private ArtifactResolver artifactResolver;
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java
index 36c169cfd..5bc9eee9f 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java
@@ -20,6 +20,7 @@ package org.apache.maven.artifact.resolver;
import java.io.File;
import java.io.InputStream;
+
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.authorization.AuthorizationException;
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java
index 2201ecbe8..2709cc53b 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java
@@ -20,6 +20,7 @@ package org.apache.maven.artifact.resolver;
import java.util.ArrayList;
import java.util.List;
+
import org.apache.maven.wagon.observers.AbstractTransferListener;
public class TestTransferListener extends AbstractTransferListener {
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java
index 862b11f0f..f6738d701 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java
@@ -18,13 +18,14 @@
*/
package org.apache.maven.artifact.resolver.filter;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.util.Arrays;
-import org.junit.jupiter.api.Test;
-
/**
* Tests {@link AndArtifactFilter}.
*
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java
index bcf61ec27..704e6e977 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java
@@ -18,12 +18,13 @@
*/
package org.apache.maven.artifact.resolver.filter;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.util.Arrays;
import java.util.List;
+
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* @author Igor Fedorenko
*/
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java
index de4cdaf4d..87c15eced 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java
@@ -18,13 +18,14 @@
*/
package org.apache.maven.artifact.resolver.filter;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.util.Arrays;
-import org.junit.jupiter.api.Test;
-
/**
* Tests {@link OrArtifactFilter}.
*
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java
index 72fecbc41..08ff3157c 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java
@@ -18,13 +18,13 @@
*/
package org.apache.maven.artifact.resolver.filter;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Tests {@link ScopeArtifactFilter}.
*
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java b/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
index 7907a1a8a..c44eb7410 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
@@ -18,17 +18,18 @@
*/
package org.apache.maven.artifact.testutils;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
import org.codehaus.plexus.util.FileUtils;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class TestFileManager {
public static final String TEMP_DIR_PATH = System.getProperty("java.io.tmpdir");
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
index 888572972..f93e584d4 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
@@ -18,11 +18,10 @@
*/
package org.apache.maven.artifact.transform;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
import java.util.List;
-import javax.inject.Inject;
+
import org.apache.maven.repository.legacy.resolver.transform.ArtifactTransformation;
import org.apache.maven.repository.legacy.resolver.transform.ArtifactTransformationManager;
import org.apache.maven.repository.legacy.resolver.transform.LatestArtifactTransformation;
@@ -31,6 +30,9 @@ import org.apache.maven.repository.legacy.resolver.transform.SnapshotTransformat
import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/** @author Jason van Zyl */
@PlexusTest
public class TransformationManagerTest {
diff --git a/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java b/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
index cc619413f..e50b0d7ba 100644
--- a/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java
@@ -18,12 +18,11 @@
*/
package org.apache.maven.profiles.manager;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import javax.inject.Inject;
import java.util.List;
import java.util.Properties;
-import javax.inject.Inject;
+
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Profile;
@@ -34,6 +33,9 @@ import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
@PlexusTest
public class DefaultProfileManagerTest {
diff --git a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
index 5f524489e..183d7c645 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.project;
-import static org.junit.jupiter.api.Assertions.fail;
+import javax.inject.Inject;
import java.io.File;
import java.io.FileNotFoundException;
@@ -26,7 +26,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Arrays;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.model.building.ModelBuildingException;
@@ -38,6 +38,8 @@ import org.codehaus.plexus.testing.PlexusTest;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.junit.jupiter.api.BeforeEach;
+import static org.junit.jupiter.api.Assertions.fail;
+
/**
* @author Jason van Zyl
*/
diff --git a/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java b/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java
index cb98d394d..f22e33df3 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java
@@ -18,13 +18,15 @@
*/
package org.apache.maven.project;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.FileNotFoundException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.impl.ArtifactResolver;
diff --git a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
index 6a8e6c506..470e3e023 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.DefaultLifecycles;
import org.apache.maven.lifecycle.LifecycleExecutor;
diff --git a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
index 88686024c..cc99726b0 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
@@ -21,6 +21,7 @@ package org.apache.maven.project;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
+
import org.apache.maven.lifecycle.LifeCyclePluginAnalyzer;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
diff --git a/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java b/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
index e105e2cbd..8d6b22402 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
@@ -19,6 +19,7 @@
package org.apache.maven.project;
import java.io.File;
+
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.metadata.Metadata;
diff --git a/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java b/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
index 2e42f584e..d85bae13f 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
@@ -18,12 +18,9 @@
*/
package org.apache.maven.project;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
import java.io.File;
import java.lang.reflect.Field;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.repository.internal.DefaultArtifactDescriptorReader;
import org.eclipse.aether.impl.ArtifactDescriptorReader;
@@ -31,6 +28,10 @@ import org.eclipse.aether.impl.ArtifactResolver;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
public class ProjectClasspathTest extends AbstractMavenProjectTestCase {
static final String dir = "projects/scope/";
diff --git a/maven-compat/src/test/java/org/apache/maven/project/TestArtifactResolver.java b/maven-compat/src/test/java/org/apache/maven/project/TestArtifactResolver.java
index 52465152d..cd3060680 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/TestArtifactResolver.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/TestArtifactResolver.java
@@ -21,6 +21,7 @@ package org.apache.maven.project;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.resolver.DefaultArtifactResolver;
diff --git a/maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java b/maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
index 1b423c252..c79ee8692 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
@@ -21,6 +21,7 @@ package org.apache.maven.project;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.repository.legacy.LegacyRepositorySystem;
diff --git a/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java b/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java
index 2cabebe66..6a3f15509 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.project;
-import java.io.File;
-import java.util.Collections;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.io.File;
+import java.util.Collections;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.model.building.ModelBuilder;
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
index 9b843e9df..567dc64a7 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
@@ -18,11 +18,12 @@
*/
package org.apache.maven.project.inheritance;
-import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
-
import java.io.File;
+
import org.apache.maven.project.AbstractMavenProjectTestCase;
+import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
+
/**
* @author Jason van Zyl
*/
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
index eb0dd8a67..45830f0c8 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.maven.project.inheritance.t00;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* A test which demonstrates maven's recursive inheritance where
* a distinct value is taken from each parent contributing to
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
index e339609f2..4aa25efc3 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.maven.project.inheritance.t01;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* A test which demonstrates maven's recursive inheritance where
* we are testing to make sure that elements stated in a model are
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
index cec5d8eaf..850efcd66 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
@@ -18,14 +18,11 @@
*/
package org.apache.maven.project.inheritance.t02;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.model.Build;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
@@ -33,6 +30,10 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* A test which demonstrates maven's recursive inheritance where
* a distinct value is taken from each parent contributing to
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
index 4485561a7..90e62e53a 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
@@ -18,13 +18,14 @@
*/
package org.apache.maven.project.inheritance.t03;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.io.File;
+
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* A test which demonstrates maven's recursive inheritance where
* a distinct value is taken from each parent contributing to
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
index 1cb8c505c..0bb7cec02 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
@@ -18,17 +18,18 @@
*/
package org.apache.maven.project.inheritance.t04;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Verifies the version of a dependency listed in a parent's
* dependencyManagement section is chosen over another version of the same
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
index 14c8f2cfc..d8df6f97e 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
@@ -18,17 +18,18 @@
*/
package org.apache.maven.project.inheritance.t05;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* A test which demonstrates maven's dependency management
*
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
index 149c3a7d7..97ebf2892 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
@@ -18,18 +18,19 @@
*/
package org.apache.maven.project.inheritance.t06;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import java.util.Iterator;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* A test which demonstrates maven's dependency management
*
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
index 732e4f965..49a90dd18 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
@@ -18,18 +18,19 @@
*/
package org.apache.maven.project.inheritance.t07;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* A test which demonstrates maven's dependency management
*
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
index 830889fc5..eb993e12a 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
@@ -18,18 +18,19 @@
*/
package org.apache.maven.project.inheritance.t08;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import java.util.Iterator;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* A test which demonstrates maven's dependency management
*
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
index ac59e99a1..8de5dedc5 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
@@ -18,17 +18,18 @@
*/
package org.apache.maven.project.inheritance.t09;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import java.util.Map;
+
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Verifies exclusions listed in dependencyManagement are valid for
* transitive dependencies.
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
index a750730e5..5298cd590 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
@@ -18,17 +18,18 @@
*/
package org.apache.maven.project.inheritance.t10;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
import java.util.Map;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Verifies scope inheritance of direct and transitive dependencies.
*
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java
index f595ab880..0b1b0eea8 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java
@@ -18,14 +18,15 @@
*/
package org.apache.maven.project.inheritance.t11;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
import java.io.File;
+
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* Verifies scope of root project is preserved regardless of parent dependency management.
*
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
index 9fc1dc21e..1629df201 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
@@ -18,16 +18,17 @@
*/
package org.apache.maven.project.inheritance.t12;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
import java.io.File;
import java.util.Map;
+
import org.apache.maven.model.Plugin;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* Verifies that plugin execution sections in the parent POM that have
* inherit == false are not inherited to the child POM.
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
index 889778bc8..9c5c84aaa 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java
@@ -18,13 +18,14 @@
*/
package org.apache.maven.project.inheritance.t12scm;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.io.File;
+
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* Verifies SCM inheritance uses modules statement from parent.
*
diff --git a/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java b/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java
index 1224a90be..4f95c428a 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java
@@ -18,11 +18,12 @@
*/
package org.apache.maven.project.path;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.io.File;
+
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
@SuppressWarnings("deprecation")
public class DefaultPathTranslatorTest {
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
index 6b70b8cc2..ff7642149 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.maven.repository;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
public class DefaultMirrorSelectorTest {
@Test
public void testMirrorWithMirrorOfPatternContainingANegationIsNotSelected() {
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
index 0cf0ba8b2..4c4e82bb2 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
@@ -18,15 +18,12 @@
*/
package org.apache.maven.repository;
-import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
import java.io.File;
import java.util.Arrays;
import java.util.List;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
@@ -47,6 +44,11 @@ import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
import org.junit.jupiter.api.Test;
+import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Tests {@link LegacyRepositorySystem}.
*
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
index 6bb6ffff5..0535e8faa 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
@@ -18,14 +18,11 @@
*/
package org.apache.maven.repository;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
import java.util.Arrays;
import java.util.List;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
@@ -33,6 +30,11 @@ import org.apache.maven.settings.Mirror;
import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
@PlexusTest
public class MirrorProcessorTest {
@Inject
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
index c82bc13b5..2fac20e5d 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
@@ -18,14 +18,10 @@
*/
package org.apache.maven.repository.legacy;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
import java.io.File;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -37,6 +33,12 @@ import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class DefaultUpdateCheckManagerTest extends AbstractArtifactComponentTestCase {
@Inject
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
index 5e1e2a85e..164b1739b 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
@@ -18,19 +18,13 @@
*/
package org.apache.maven.repository.legacy;
-import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -54,6 +48,14 @@ import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
*/
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
index b983db1f9..6a60d4eb2 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
@@ -18,12 +18,11 @@
*/
package org.apache.maven.repository.legacy;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import javax.inject.Inject;
import java.io.File;
import java.util.Arrays;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.Authentication;
import org.apache.maven.repository.RepositorySystem;
@@ -31,6 +30,9 @@ import org.apache.maven.settings.Server;
import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* Tests {@link LegacyRepositorySystem}.
*
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
index 7955bb7ae..6e32a115d 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
@@ -18,13 +18,15 @@
*/
package org.apache.maven.repository.legacy;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.InputData;
import org.apache.maven.wagon.OutputData;
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
index bd1f570ef..07d9c7608 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
@@ -18,10 +18,7 @@
*/
package org.apache.maven.repository.legacy.resolver;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
import java.util.ArrayList;
import java.util.Arrays;
@@ -32,7 +29,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
@@ -56,6 +53,11 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
/**
* Test the default artifact collector.
*
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
index 2982e9992..6b58c397d 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
@@ -18,11 +18,10 @@
*/
package org.apache.maven.repository.legacy.resolver.conflict;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import javax.inject.Inject;
import java.util.Collections;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -33,6 +32,9 @@ import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.BeforeEach;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* Provides a basis for testing conflict resolvers.
*
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
index f09ae69ef..9c480d8fb 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
@@ -18,15 +18,16 @@
*/
package org.apache.maven.repository.metadata;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
import javax.inject.Inject;
+
import org.apache.maven.artifact.ArtifactScopeEnum;
import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
*
* @author <a href="mailto:oleg@codehaus.org">Oleg Gusakov</a>
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
index 6ab5acf51..865669c4a 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
@@ -18,11 +18,11 @@
*/
package org.apache.maven.repository.metadata;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
*
* @author <a href="mailto:oleg@codehaus.org">Oleg Gusakov</a>
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
index 536b4bb55..a4f3577f9 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
@@ -18,15 +18,16 @@
*/
package org.apache.maven.repository.metadata;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
import javax.inject.Inject;
+
import org.apache.maven.artifact.ArtifactScopeEnum;
import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
*
* @author <a href="mailto:oleg@codehaus.org">Oleg Gusakov</a>
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java
index d1d37f9bb..0fc6db43c 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java
@@ -18,12 +18,14 @@
*/
package org.apache.maven.repository.metadata;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 7983e1074..e2dd97ca3 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -225,7 +225,7 @@ under the License.
<configuration>
<version>1.1.0</version>
<!-- This is a required attribute and is intentionally left empty -->
- <models/>
+ <models />
</configuration>
<executions>
<execution>
diff --git a/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
index 8aa777486..e2476cea5 100644
--- a/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
+++ b/maven-core/src/main/java/org/apache/maven/ArtifactFilterManager.java
@@ -19,6 +19,7 @@
package org.apache.maven;
import java.util.Set;
+
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
index e9b693968..bf9ad700e 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
@@ -18,12 +18,14 @@
*/
package org.apache.maven;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
import org.apache.maven.extension.internal.CoreExports;
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 451f50dc5..c6658d2f3 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -18,7 +18,9 @@
*/
package org.apache.maven;
-import static java.util.stream.Collectors.toSet;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
import java.io.File;
import java.util.ArrayList;
@@ -34,9 +36,7 @@ import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Stream;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.Session;
import org.apache.maven.api.model.Model;
import org.apache.maven.api.model.Prerequisites;
@@ -79,6 +79,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.helpers.MessageFormatter;
+import static java.util.stream.Collectors.toSet;
+
/**
* @author Jason van Zyl
*/
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
index 3137e1da6..b2f705c74 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
@@ -18,15 +18,17 @@
*/
package org.apache.maven;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
diff --git a/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java b/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java
index 1288e4844..4325659d7 100644
--- a/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java
@@ -19,6 +19,7 @@
package org.apache.maven;
import java.io.File;
+
import org.apache.maven.project.ProjectBuildingException;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
index b6a077de8..e263c33a3 100644
--- a/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
@@ -20,6 +20,7 @@ package org.apache.maven;
import java.util.Collection;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
index ad7dcef4c..7e6551f40 100644
--- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java
+++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java
@@ -18,9 +18,8 @@
*/
package org.apache.maven;
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.toMap;
+import javax.inject.Inject;
+import javax.inject.Named;
import java.io.File;
import java.io.IOException;
@@ -40,8 +39,7 @@ import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.inject.Inject;
-import javax.inject.Named;
+
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
@@ -53,6 +51,10 @@ import org.eclipse.aether.util.artifact.ArtifactIdUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toMap;
+
/**
* An implementation of a workspace reader that knows how to search the Maven reactor for artifacts, either as packaged
* jar if it has been built, or only compile output directory if packaging hasn't happened yet.
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 5957f3986..3754de834 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
diff --git a/maven-core/src/main/java/org/apache/maven/SessionScoped.java b/maven-core/src/main/java/org/apache/maven/SessionScoped.java
index e19536bf0..a8d8722ee 100644
--- a/maven-core/src/main/java/org/apache/maven/SessionScoped.java
+++ b/maven-core/src/main/java/org/apache/maven/SessionScoped.java
@@ -18,13 +18,14 @@
*/
package org.apache.maven;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import com.google.inject.ScopeAnnotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import com.google.inject.ScopeAnnotation;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
/**
* Indicates that annotated component should be instantiated before session execution starts
* and discarded after session execution completes.
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java b/maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
index e2ae8e61a..d2594b953 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact;
import java.net.MalformedURLException;
+
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java b/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
index 5ee70e9eb..2bc70332f 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java
@@ -21,6 +21,7 @@ package org.apache.maven.artifact.factory;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java
index 2004f68a2..8c8002d78 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.handler.manager;
import java.util.Map;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
index 2c7efadc5..72f059832 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java
@@ -18,12 +18,14 @@
*/
package org.apache.maven.artifact.handler.manager;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/EarArtifactHandlerProvider.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/EarArtifactHandlerProvider.java
index df56cae91..49cd82af7 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/EarArtifactHandlerProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/EarArtifactHandlerProvider.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/EjbArtifactHandlerProvider.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/EjbArtifactHandlerProvider.java
index 6e558652c..5508586d6 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/EjbArtifactHandlerProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/EjbArtifactHandlerProvider.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/EjbClientArtifactHandlerProvider.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/EjbClientArtifactHandlerProvider.java
index 35702483c..4126d5ffd 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/EjbClientArtifactHandlerProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/EjbClientArtifactHandlerProvider.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/JarArtifactHandlerProvider.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/JarArtifactHandlerProvider.java
index f27dfcbca..9e71af46e 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/JarArtifactHandlerProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/JarArtifactHandlerProvider.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/JavaSourceArtifactHandlerProvider.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/JavaSourceArtifactHandlerProvider.java
index 2a66975dc..467be6da8 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/JavaSourceArtifactHandlerProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/JavaSourceArtifactHandlerProvider.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/JavadocArtifactHandlerProvider.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/JavadocArtifactHandlerProvider.java
index d0dd66e63..cdb3b08b6 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/JavadocArtifactHandlerProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/JavadocArtifactHandlerProvider.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/MavenPluginArtifactHandlerProvider.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/MavenPluginArtifactHandlerProvider.java
index d8159b36f..8eb28fad0 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/MavenPluginArtifactHandlerProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/MavenPluginArtifactHandlerProvider.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/PomArtifactHandlerProvider.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/PomArtifactHandlerProvider.java
index 04ecf3fb5..12d1107d5 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/PomArtifactHandlerProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/PomArtifactHandlerProvider.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/RarArtifactHandlerProvider.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/RarArtifactHandlerProvider.java
index d616227e1..00ff11c36 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/RarArtifactHandlerProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/RarArtifactHandlerProvider.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/TestJarArtifactHandlerProvider.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/TestJarArtifactHandlerProvider.java
index f9d2b7f93..160bc6783 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/TestJarArtifactHandlerProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/TestJarArtifactHandlerProvider.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/WarArtifactHandlerProvider.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/WarArtifactHandlerProvider.java
index 22e878f4c..853e3c810 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/WarArtifactHandlerProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/handler/providers/WarArtifactHandlerProvider.java
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java b/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
index 0bc65986c..771e4962b 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.metadata;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.ArtifactVersion;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java b/maven-core/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java
index 85a6df70b..25b5b657e 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java
@@ -21,6 +21,7 @@ package org.apache.maven.artifact.metadata;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java
index 0956291db..6aa29e377 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java
@@ -20,6 +20,7 @@ package org.apache.maven.artifact.repository;
import java.util.ArrayList;
import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
index 710984ef3..cd76c79d7 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
index 28701f551..dbd1f573f 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
index 8a4f9e29e..b7da363ec 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
@@ -20,6 +20,7 @@ package org.apache.maven.artifact.repository.layout;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
index da1406385..b9502a7f4 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
index d5ec0fad1..e49a52d41 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.repository.metadata;
import java.util.List;
+
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
index a70ddb716..cf5b28465 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -18,14 +18,16 @@
*/
package org.apache.maven.artifact.repository.metadata.io;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.util.Map;
import java.util.Objects;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.codehaus.plexus.util.ReaderFactory;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java
index 8537a0a1a..b7222463c 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.util.Map;
+
import org.apache.maven.artifact.repository.metadata.Metadata;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
index 27cfba2cf..dc6b05030 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryCache;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
index a7ff61e0f..a4a616cd1 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java
index d2632e3c3..d5f1af42e 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java
@@ -18,11 +18,12 @@
*/
package org.apache.maven.artifact.resolver;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.inject.Named;
-import javax.inject.Singleton;
/**
* @author Benjamin Bentmann
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
index 5bb1aa247..0ce3738f9 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
index c100358db..3e1c29bd0 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
@@ -23,6 +23,7 @@ import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java
index a26e83759..18a107ff6 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java
@@ -19,6 +19,7 @@
package org.apache.maven.artifact.resolver.filter;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java
index 6f981ccf4..c2d3ae159 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java
@@ -20,6 +20,7 @@ package org.apache.maven.artifact.resolver.filter;
import java.util.List;
import java.util.function.Predicate;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Exclusion;
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
index 409d1aa3c..efc51b90a 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
@@ -21,6 +21,7 @@ package org.apache.maven.artifact.resolver.filter;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
index 978d2113c..3deb5e423 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java
@@ -23,6 +23,7 @@ import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 1e326752f..7651d4c70 100644
--- a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++ b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -18,6 +18,10 @@
*/
package org.apache.maven.bridge;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
@@ -29,9 +33,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java b/maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java
index e4340f568..06c8140ec 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java
@@ -19,6 +19,7 @@
package org.apache.maven.classrealm;
import java.io.File;
+
import org.eclipse.aether.artifact.Artifact;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java
index 627ed8a06..0bb038427 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java
@@ -20,6 +20,7 @@ package org.apache.maven.classrealm;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index 6eb24613f..0b64e6213 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -18,6 +18,10 @@
*/
package org.apache.maven.classrealm;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.File;
import java.net.MalformedURLException;
import java.util.ArrayList;
@@ -29,9 +33,7 @@ import java.util.Objects;
import java.util.Random;
import java.util.Set;
import java.util.TreeMap;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.classrealm.ClassRealmRequest.RealmType;
import org.apache.maven.extension.internal.CoreExports;
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
index 14c08a2bd..705340980 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java
@@ -18,12 +18,14 @@
*/
package org.apache.maven.configuration.internal;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Objects;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.configuration.BeanConfigurationException;
import org.apache.maven.configuration.BeanConfigurationPathTranslator;
import org.apache.maven.configuration.BeanConfigurationRequest;
diff --git a/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedComponentConfigurator.java b/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedComponentConfigurator.java
index ba30ded3d..f41a1d64d 100644
--- a/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedComponentConfigurator.java
+++ b/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedComponentConfigurator.java
@@ -20,6 +20,7 @@ package org.apache.maven.configuration.internal;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.configurator.BasicComponentConfigurator;
import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java
index 65b1ca8c7..7b1d68207 100644
--- a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java
+++ b/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.eventspy.internal;
-import java.util.ArrayList;
-import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.eventspy.EventSpy;
import org.apache.maven.execution.ExecutionListener;
import org.eclipse.aether.RepositoryListener;
diff --git a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
index 4b52cb732..1b4567ca7 100644
--- a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
+++ b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
@@ -18,13 +18,15 @@
*/
package org.apache.maven.exception;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.IOException;
import java.net.ConnectException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblemUtils;
diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java b/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java
index 26cb661be..551eeb1b0 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java
@@ -19,6 +19,7 @@
package org.apache.maven.execution;
import java.util.Objects;
+
import org.apache.maven.project.MavenProject;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java
index 44e27abb5..0bc99bdb7 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.execution;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.project.MavenProject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java
index ea3fa84e2..a51878364 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java
@@ -18,6 +18,9 @@
*/
package org.apache.maven.execution;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
@@ -26,8 +29,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Properties;
import java.util.stream.Stream;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.project.MavenProject;
import org.slf4j.Logger;
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 2f4735990..cc5a45727 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.eventspy.internal.EventSpyDispatcher;
import org.apache.maven.model.Profile;
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
index de2e7103a..8177bcc87 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
@@ -18,15 +18,17 @@
*/
package org.apache.maven.execution;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.bridge.MavenRepositorySystem;
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
index 10481c797..65795358c 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
@@ -23,6 +23,7 @@ import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
+
import org.apache.maven.project.DependencyResolutionResult;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
index 66dd79961..e4a768aa1 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
@@ -23,6 +23,7 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.eventspy.internal.EventSpyDispatcher;
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
index f04a4b319..559b17bce 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
@@ -19,6 +19,7 @@
package org.apache.maven.execution;
import java.util.List;
+
import org.apache.maven.project.DependencyResolutionResult;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
index b50835569..bd4e34ad5 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
@@ -27,6 +27,7 @@ import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.stream.Collectors;
+
import org.apache.maven.api.Session;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryCache;
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java b/maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java
index 1672c8c17..cc6aecb3c 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java
@@ -18,8 +18,6 @@
*/
package org.apache.maven.execution;
-import static java.util.stream.Collectors.toSet;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -28,6 +26,8 @@ import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
+import static java.util.stream.Collectors.toSet;
+
/**
* Container for storing the request from the user to activate or de-activate certain profiles and optionally fail the
* build if those profiles do not exist.
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
index 8a197dc03..f5f91a4e4 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
@@ -18,8 +18,6 @@
*/
package org.apache.maven.execution;
-import static java.util.stream.Collectors.toSet;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -28,6 +26,8 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static java.util.stream.Collectors.toSet;
+
/**
* Container for storing the request from the user to activate or deactivate certain projects and optionally fail the
* build if those projects do not exist.
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
index 6f26ebc7a..2fa3e3b31 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
@@ -19,6 +19,7 @@
package org.apache.maven.execution;
import java.util.List;
+
import org.apache.maven.project.MavenProject;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java
index d19cb339c..257193de8 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java
@@ -19,6 +19,7 @@
package org.apache.maven.execution;
import java.util.List;
+
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
index 7ece350eb..e1f21c306 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.DuplicateProjectException;
diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java b/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java
index c7e84e8c6..7504c4b61 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java
@@ -18,13 +18,14 @@
*/
package org.apache.maven.execution.scope;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import com.google.inject.ScopeAnnotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import com.google.inject.ScopeAnnotation;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
/**
* Indicates that annotated component should be instantiated before mojo execution starts and discarded after mojo
* execution completes.
diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
index ef937e9ad..b650912f2 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java
@@ -18,16 +18,17 @@
*/
package org.apache.maven.execution.scope.internal;
-import com.google.inject.Key;
-import com.google.inject.OutOfScopeException;
-import com.google.inject.Provider;
-import com.google.inject.Scope;
-import com.google.inject.util.Providers;
import java.util.Collection;
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.LinkedList;
import java.util.Map;
+
+import com.google.inject.Key;
+import com.google.inject.OutOfScopeException;
+import com.google.inject.Provider;
+import com.google.inject.Scope;
+import com.google.inject.util.Providers;
import org.apache.maven.execution.MojoExecutionEvent;
import org.apache.maven.execution.MojoExecutionListener;
import org.apache.maven.execution.scope.WeakMojoExecutionListener;
diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java
index 1365a3ba7..cc3fd7aea 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java
@@ -20,6 +20,7 @@ package org.apache.maven.execution.scope.internal;
import javax.inject.Inject;
import javax.inject.Named;
+
import org.apache.maven.execution.MojoExecutionListener;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
index 4358d28d4..aec37e704 100644
--- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
+++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java
@@ -18,16 +18,17 @@
*/
package org.apache.maven.extension.internal;
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.collectingAndThen;
-import static java.util.stream.Collectors.toMap;
-
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+
import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.toMap;
+
/**
* Provides information about artifacts (identified by groupId:artifactId string key) and classpath elements exported by
* Maven core itself and loaded Maven core extensions.
diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java
index bb04a2ce2..9c9d64728 100644
--- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.extension.internal;
-import java.util.Objects;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
import javax.inject.Singleton;
+
+import java.util.Objects;
+
import org.codehaus.plexus.PlexusContainer;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java
index bac9136d3..f49b004d3 100644
--- a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java
+++ b/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java
@@ -28,6 +28,7 @@ import java.util.Enumeration;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
+
import org.apache.maven.project.ExtensionDescriptor;
import org.apache.maven.project.ExtensionDescriptorBuilder;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
index f342d0577..9d0683f22 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
@@ -18,7 +18,9 @@
*/
package org.apache.maven.graph;
-import static java.util.Comparator.comparing;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
import java.io.File;
import java.util.ArrayList;
@@ -29,9 +31,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.MavenExecutionException;
import org.apache.maven.ProjectCycleException;
import org.apache.maven.artifact.ArtifactUtils;
@@ -54,6 +54,8 @@ import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static java.util.Comparator.comparing;
+
/**
* Builds the {@link ProjectDependencyGraph inter-dependencies graph} between projects in the reactor.
*/
diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
index 3269b38b0..a4afc7943 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
+
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
index 7229506cd..a6f7fcbdf 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java
@@ -24,6 +24,7 @@ import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/graph/ProjectSelector.java b/maven-core/src/main/java/org/apache/maven/graph/ProjectSelector.java
index 7ee8cc691..f2ee85f73 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/ProjectSelector.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/ProjectSelector.java
@@ -25,6 +25,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
+
import org.apache.maven.MavenExecutionException;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformer.java b/maven-core/src/main/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformer.java
index e680b0de2..c07dcc0c7 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformer.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformer.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
+
import org.apache.maven.model.building.DefaultBuildPomXMLFilterFactory;
import org.apache.maven.model.building.TransformerContext;
import org.apache.maven.model.transform.RawToConsumerPomXMLFilterFactory;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index 276476616..4aca3d603 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -18,7 +18,8 @@
*/
package org.apache.maven.internal.aether;
-import static java.util.stream.Collectors.toList;
+import javax.inject.Inject;
+import javax.inject.Named;
import java.io.File;
import java.io.IOException;
@@ -33,8 +34,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.api.xml.Dom;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -83,6 +83,8 @@ import org.eclipse.sisu.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static java.util.stream.Collectors.toList;
+
/**
* @since 3.3.0
*/
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java b/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java
index 1066064b5..1aae6c25b 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java
@@ -19,6 +19,7 @@
package org.apache.maven.internal.aether;
import java.io.FileNotFoundException;
+
import org.eclipse.aether.AbstractRepositoryListener;
import org.eclipse.aether.RepositoryEvent;
import org.eclipse.aether.transfer.MetadataNotFoundException;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/MavenChainedWorkspaceReader.java b/maven-core/src/main/java/org/apache/maven/internal/aether/MavenChainedWorkspaceReader.java
index 05e3c781e..6cf9ed8b6 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/MavenChainedWorkspaceReader.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/MavenChainedWorkspaceReader.java
@@ -21,6 +21,7 @@ package org.apache.maven.internal.aether;
import java.io.File;
import java.util.Collection;
import java.util.List;
+
import org.apache.maven.model.Model;
import org.apache.maven.repository.internal.MavenWorkspaceReader;
import org.eclipse.aether.artifact.Artifact;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java b/maven-core/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java
index 8c3d99779..576e915a6 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java
@@ -18,15 +18,16 @@
*/
package org.apache.maven.internal.aether;
-import static java.util.Objects.requireNonNull;
-
import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Provider;
+
import org.eclipse.aether.RepositorySystem;
import org.eclipse.sisu.EagerSingleton;
+import static java.util.Objects.requireNonNull;
+
/**
* Maven internal component that bridges container "shut down" to {@link RepositorySystem#shutdown()}.
*
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java b/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java
index 773d2e16f..b75fdcd82 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java
@@ -18,8 +18,6 @@
*/
package org.apache.maven.internal.aether;
-import static java.util.Objects.requireNonNull;
-
import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.charset.StandardCharsets;
@@ -28,6 +26,7 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.ListIterator;
import java.util.Objects;
+
import org.eclipse.aether.AbstractRepositoryListener;
import org.eclipse.aether.RepositoryEvent;
import org.eclipse.aether.RepositorySystemSession;
@@ -37,6 +36,8 @@ import org.eclipse.aether.collection.CollectStepData;
import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.graph.DependencyNode;
+import static java.util.Objects.requireNonNull;
+
/**
* A class building reverse tree using {@link CollectStepData} trace data provided in {@link RepositoryEvent}
* events fired during collection.
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractNode.java b/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractNode.java
index fcbced951..f3e8987f1 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractNode.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractNode.java
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.List;
import java.util.function.Predicate;
import java.util.stream.Collectors;
+
import org.apache.maven.api.Node;
import org.apache.maven.api.NodeVisitor;
import org.eclipse.aether.artifact.Artifact;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractSession.java b/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
index 3a8a03523..619b56a15 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/AbstractSession.java
@@ -18,8 +18,6 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.nonNull;
-
import java.io.File;
import java.nio.file.Path;
import java.util.Arrays;
@@ -33,6 +31,7 @@ import java.util.WeakHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.ArtifactCoordinate;
import org.apache.maven.api.Dependency;
@@ -65,6 +64,8 @@ import org.apache.maven.api.services.VersionParser;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.MavenProject;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
public abstract class AbstractSession implements Session {
private final List<Listener> listeners = new CopyOnWriteArrayList<>();
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
index b68bbcd16..666e22722 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java
@@ -18,14 +18,15 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.nonNull;
-
import java.util.Objects;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.ArtifactCoordinate;
import org.apache.maven.api.Version;
import org.apache.maven.api.annotations.Nonnull;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
/**
* A wrapper class around a maven resolver artifact.
*/
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinate.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinate.java
index 3a5f69a3b..d76b16176 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinate.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinate.java
@@ -18,13 +18,14 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.nonNull;
-
import java.util.Objects;
+
import org.apache.maven.api.ArtifactCoordinate;
import org.apache.maven.api.VersionRange;
import org.apache.maven.api.annotations.Nonnull;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
/**
* A wrapper class around a maven resolver artifact.
*/
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinateFactory.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinateFactory.java
index b2ba486ef..77e385fec 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinateFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinateFactory.java
@@ -18,11 +18,9 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.cast;
-import static org.apache.maven.internal.impl.Utils.nonNull;
-
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.api.ArtifactCoordinate;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.services.ArtifactCoordinateFactory;
@@ -30,6 +28,9 @@ import org.apache.maven.api.services.ArtifactCoordinateFactoryRequest;
import org.apache.maven.shared.utils.StringUtils;
import org.eclipse.aether.artifact.ArtifactType;
+import static org.apache.maven.internal.impl.Utils.cast;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
@Named
@Singleton
public class DefaultArtifactCoordinateFactory implements ArtifactCoordinateFactory {
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java
index ee2379b37..1f48abc05 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java
@@ -18,13 +18,12 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.cast;
-import static org.apache.maven.internal.impl.Utils.nonNull;
-
-import java.util.Collection;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.Collection;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.RemoteRepository;
import org.apache.maven.api.annotations.Nonnull;
@@ -36,6 +35,9 @@ import org.eclipse.aether.deployment.DeployRequest;
import org.eclipse.aether.deployment.DeployResult;
import org.eclipse.aether.deployment.DeploymentException;
+import static org.apache.maven.internal.impl.Utils.cast;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
/**
* Implementation of {@link ArtifactDeployer} service.
*/
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactFactory.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactFactory.java
index 1c38e21c7..a54c26ce3 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactFactory.java
@@ -18,11 +18,9 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.cast;
-import static org.apache.maven.internal.impl.Utils.nonNull;
-
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.services.ArtifactFactory;
@@ -30,6 +28,9 @@ import org.apache.maven.api.services.ArtifactFactoryRequest;
import org.apache.maven.shared.utils.StringUtils;
import org.eclipse.aether.artifact.ArtifactType;
+import static org.apache.maven.internal.impl.Utils.cast;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
@Named
@Singleton
public class DefaultArtifactFactory implements ArtifactFactory {
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java
index 77e5152b5..58b7b7e37 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java
@@ -18,12 +18,10 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.cast;
-import static org.apache.maven.internal.impl.Utils.nonNull;
-
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.services.ArtifactInstaller;
import org.apache.maven.api.services.ArtifactInstallerException;
@@ -33,6 +31,9 @@ import org.eclipse.aether.installation.InstallRequest;
import org.eclipse.aether.installation.InstallResult;
import org.eclipse.aether.installation.InstallationException;
+import static org.apache.maven.internal.impl.Utils.cast;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
@Named
@Singleton
public class DefaultArtifactInstaller implements ArtifactInstaller {
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
index d9208455d..a80be4f29 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java
@@ -18,13 +18,15 @@
*/
package org.apache.maven.internal.impl;
+import javax.inject.Inject;
+import javax.inject.Named;
+
import java.io.File;
import java.nio.file.Path;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
-import javax.inject.Inject;
-import javax.inject.Named;
+
import org.apache.maven.SessionScoped;
import org.apache.maven.api.Artifact;
import org.apache.maven.api.annotations.Nonnull;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java
index 051794bb8..136655d4a 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java
@@ -18,17 +18,16 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.cast;
-import static org.apache.maven.internal.impl.Utils.nonNull;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.services.ArtifactManager;
@@ -42,6 +41,9 @@ import org.eclipse.aether.resolution.ArtifactRequest;
import org.eclipse.aether.resolution.ArtifactResolutionException;
import org.eclipse.aether.resolution.ArtifactResult;
+import static org.apache.maven.internal.impl.Utils.cast;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
@Named
@Singleton
public class DefaultArtifactResolver implements ArtifactResolver {
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java
index a4ad39299..8a67eb3e3 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java
@@ -18,9 +18,8 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.nonNull;
-
import java.util.Objects;
+
import org.apache.maven.api.Dependency;
import org.apache.maven.api.DependencyCoordinate;
import org.apache.maven.api.Scope;
@@ -31,6 +30,8 @@ import org.apache.maven.api.annotations.Nullable;
import org.apache.maven.api.services.TypeRegistry;
import org.eclipse.aether.artifact.ArtifactProperties;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
public class DefaultDependency implements Dependency {
private final AbstractSession session;
private final org.eclipse.aether.graph.Dependency dependency;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java
index 289593fcc..36f75fa68 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java
@@ -18,13 +18,12 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.cast;
-import static org.apache.maven.internal.impl.Utils.nonNull;
-
-import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.List;
+
import org.apache.maven.api.Node;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.services.DependencyCollector;
@@ -42,6 +41,9 @@ import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
import org.eclipse.aether.util.graph.transformer.ConflictResolver;
+import static org.apache.maven.internal.impl.Utils.cast;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
@Named
@Singleton
public class DefaultDependencyCollector implements DependencyCollector {
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinate.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinate.java
index 2b9d2af00..9d2bfaab3 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinate.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinate.java
@@ -18,9 +18,8 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.nonNull;
-
import java.util.Collection;
+
import org.apache.maven.api.DependencyCoordinate;
import org.apache.maven.api.Exclusion;
import org.apache.maven.api.Scope;
@@ -31,6 +30,8 @@ import org.apache.maven.api.annotations.Nullable;
import org.apache.maven.api.services.TypeRegistry;
import org.eclipse.aether.artifact.ArtifactProperties;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
public class DefaultDependencyCoordinate implements DependencyCoordinate {
private final AbstractSession session;
private final org.eclipse.aether.graph.Dependency dependency;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinateFactory.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinateFactory.java
index 743871905..11e94aa8c 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinateFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinateFactory.java
@@ -18,12 +18,11 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.cast;
-import static org.apache.maven.internal.impl.Utils.nonNull;
-
-import java.util.stream.Collectors;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.stream.Collectors;
+
import org.apache.maven.api.DependencyCoordinate;
import org.apache.maven.api.Exclusion;
import org.apache.maven.api.annotations.Nonnull;
@@ -31,6 +30,9 @@ import org.apache.maven.api.services.DependencyCoordinateFactory;
import org.apache.maven.api.services.DependencyCoordinateFactoryRequest;
import org.eclipse.aether.artifact.ArtifactType;
+import static org.apache.maven.internal.impl.Utils.cast;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
@Named
@Singleton
public class DefaultDependencyCoordinateFactory implements DependencyCoordinateFactory {
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultEvent.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultEvent.java
index bd1546e57..b8db69e1d 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultEvent.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultEvent.java
@@ -19,6 +19,7 @@
package org.apache.maven.internal.impl;
import java.util.Optional;
+
import org.apache.maven.api.Event;
import org.apache.maven.api.EventType;
import org.apache.maven.api.MojoExecution;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java
index 9d0eecfc6..dd1db21c4 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java
@@ -18,13 +18,15 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.nonNull;
+import javax.inject.Inject;
import java.nio.file.Path;
-import javax.inject.Inject;
+
import org.apache.maven.api.LocalRepository;
import org.apache.maven.api.annotations.Nonnull;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
public class DefaultLocalRepository implements LocalRepository {
private final @Nonnull org.eclipse.aether.repository.LocalRepository repository;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java
index de04cbe58..4217e4e68 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java
@@ -18,9 +18,11 @@
*/
package org.apache.maven.internal.impl;
-import java.nio.file.Path;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.nio.file.Path;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.LocalRepository;
import org.apache.maven.api.RemoteRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLog.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLog.java
index 180771641..c1a2d8d2e 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLog.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLog.java
@@ -18,12 +18,13 @@
*/
package org.apache.maven.internal.impl;
-import static java.util.Objects.requireNonNull;
-
import java.util.function.Supplier;
+
import org.apache.maven.api.plugin.Log;
import org.slf4j.Logger;
+import static java.util.Objects.requireNonNull;
+
public class DefaultLog implements Log {
private final Logger logger;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLookup.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLookup.java
index c91ac8a54..8acf1f0dd 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLookup.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLookup.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.internal.impl;
-import java.util.List;
-import java.util.Map;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.List;
+import java.util.Map;
+
import org.apache.maven.api.services.Lookup;
import org.apache.maven.api.services.LookupException;
import org.codehaus.plexus.PlexusContainer;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java
index e9b6578c4..c163f6b89 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java
@@ -18,9 +18,11 @@
*/
package org.apache.maven.internal.impl;
-import java.util.Objects;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.Objects;
+
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.services.MessageBuilder;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java
index 619d63d02..4b67fd4c2 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java
@@ -18,7 +18,8 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.nonNull;
+import javax.inject.Named;
+import javax.inject.Singleton;
import java.io.InputStream;
import java.io.OutputStream;
@@ -27,8 +28,7 @@ import java.io.Writer;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.model.InputSource;
import org.apache.maven.api.model.Model;
@@ -41,6 +41,8 @@ import org.apache.maven.model.v4.MavenXpp3ReaderEx;
import org.apache.maven.model.v4.MavenXpp3WriterEx;
import org.codehaus.plexus.util.ReaderFactory;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
@Named
@Singleton
public class DefaultModelXmlFactory implements ModelXmlFactory {
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMojoExecution.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMojoExecution.java
index a6910e1a4..52e0b2047 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMojoExecution.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMojoExecution.java
@@ -19,6 +19,7 @@
package org.apache.maven.internal.impl;
import java.util.Optional;
+
import org.apache.maven.api.MojoExecution;
import org.apache.maven.api.model.Plugin;
import org.apache.maven.api.xml.Dom;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultNode.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultNode.java
index ef3fc6ddc..7cd27ae90 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultNode.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultNode.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
+
import org.apache.maven.api.Dependency;
import org.apache.maven.api.Node;
import org.apache.maven.api.RemoteRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
index cf8bb874e..0951f26f8 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java
@@ -24,6 +24,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.api.Artifact;
import org.apache.maven.api.DependencyCoordinate;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java
index 466153d71..d006144e2 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java
@@ -18,6 +18,10 @@
*/
package org.apache.maven.internal.impl;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -25,9 +29,7 @@ import java.nio.file.Path;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.api.Artifact;
import org.apache.maven.api.ArtifactCoordinate;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
index 6e35e1e5c..c35c7717d 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java
@@ -18,6 +18,9 @@
*/
package org.apache.maven.internal.impl;
+import javax.inject.Inject;
+import javax.inject.Named;
+
import java.nio.file.Path;
import java.util.Collection;
import java.util.Collections;
@@ -25,8 +28,7 @@ import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.SessionScoped;
import org.apache.maven.api.Artifact;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPrompter.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPrompter.java
index 97b31397d..dc44da8e2 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPrompter.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPrompter.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.internal.impl;
-import java.lang.reflect.Method;
-import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
import org.apache.maven.api.services.Prompter;
import org.apache.maven.api.services.PrompterException;
import org.codehaus.plexus.PlexusContainer;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java
index 60852866c..9e6da6300 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java
@@ -18,10 +18,12 @@
*/
package org.apache.maven.internal.impl;
-import java.nio.file.Path;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.nio.file.Path;
+
import org.apache.maven.api.LocalRepository;
import org.apache.maven.api.RemoteRepository;
import org.apache.maven.api.model.Repository;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
index 0483f5b63..05a72ff97 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java
@@ -18,8 +18,6 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.nonNull;
-
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Instant;
@@ -31,6 +29,7 @@ import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.function.Supplier;
import java.util.stream.Collectors;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.api.DependencyCoordinate;
import org.apache.maven.api.LocalRepository;
@@ -56,6 +55,8 @@ import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
public class DefaultSession extends AbstractSession {
private final MavenSession mavenSession;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSessionFactory.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSessionFactory.java
index d2883d6fa..bbcd53f89 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSessionFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSessionFactory.java
@@ -21,6 +21,7 @@ package org.apache.maven.internal.impl;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.api.Session;
import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.execution.MavenSession;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java
index 533b2959c..ae3c0d0d3 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java
@@ -18,14 +18,16 @@
*/
package org.apache.maven.internal.impl;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.services.BuilderProblem;
import org.apache.maven.api.services.SettingsBuilder;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java
index 9b3dbe532..39303e9cd 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java
@@ -18,13 +18,15 @@
*/
package org.apache.maven.internal.impl;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import java.util.Objects;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.model.InputSource;
import org.apache.maven.api.services.xml.SettingsXmlFactory;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainManager.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainManager.java
index 1541e596e..2ccbbba29 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainManager.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainManager.java
@@ -18,13 +18,15 @@
*/
package org.apache.maven.internal.impl;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.Session;
import org.apache.maven.api.Toolchain;
import org.apache.maven.api.services.ToolchainManager;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java
index 076f0de85..81cda11c5 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java
@@ -18,14 +18,16 @@
*/
package org.apache.maven.internal.impl;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.services.BuilderProblem;
import org.apache.maven.api.services.Source;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java
index 2d1b80bff..e289cd208 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java
@@ -18,13 +18,15 @@
*/
package org.apache.maven.internal.impl;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import java.util.Objects;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.model.InputSource;
import org.apache.maven.api.services.xml.ToolchainsXmlFactory;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java
index 033056bb2..c8e692ce4 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java
@@ -18,7 +18,8 @@
*/
package org.apache.maven.internal.impl;
-import static java.util.Objects.requireNonNull;
+import javax.inject.Named;
+import javax.inject.Singleton;
import java.io.IOException;
import java.io.UncheckedIOException;
@@ -27,13 +28,14 @@ import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Optional;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.services.Transport;
import org.eclipse.aether.spi.connector.transport.GetTask;
import org.eclipse.aether.spi.connector.transport.PutTask;
import org.eclipse.aether.spi.connector.transport.Transporter;
+import static java.util.Objects.requireNonNull;
+
@Named
@Singleton
public class DefaultTransport implements Transport {
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java
index 4afec0f44..a7ab392c2 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java
@@ -18,13 +18,13 @@
*/
package org.apache.maven.internal.impl;
-import static java.util.Objects.requireNonNull;
-
-import java.net.URI;
-import java.net.URISyntaxException;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
import org.apache.maven.api.RemoteRepository;
import org.apache.maven.api.Session;
import org.apache.maven.api.services.Transport;
@@ -33,6 +33,8 @@ import org.apache.maven.api.services.TransportProviderException;
import org.eclipse.aether.spi.connector.transport.TransporterProvider;
import org.eclipse.aether.transfer.NoTransporterException;
+import static java.util.Objects.requireNonNull;
+
@Named
@Singleton
public class DefaultTransportProvider implements TransportProvider {
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java
index fc058ec30..abed7bea7 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java
@@ -18,17 +18,18 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.internal.impl.Utils.nonNull;
-
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.api.Type;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.services.TypeRegistry;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
@Named
@Singleton
public class DefaultTypeRegistry implements TypeRegistry {
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultVersionParser.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultVersionParser.java
index a3fd71983..28d6ca13c 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultVersionParser.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultVersionParser.java
@@ -18,13 +18,12 @@
*/
package org.apache.maven.internal.impl;
-import static org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec;
-import static org.apache.maven.internal.impl.Utils.nonNull;
+import javax.inject.Named;
+import javax.inject.Singleton;
import java.util.Objects;
import java.util.regex.Pattern;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.Version;
import org.apache.maven.api.VersionRange;
import org.apache.maven.api.services.VersionParser;
@@ -33,6 +32,9 @@ import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import static org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec;
+import static org.apache.maven.internal.impl.Utils.nonNull;
+
@Named
@Singleton
public class DefaultVersionParser implements VersionParser {
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/EventSpyImpl.java b/maven-core/src/main/java/org/apache/maven/internal/impl/EventSpyImpl.java
index 4edaef3ac..0cd80c60f 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/EventSpyImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/EventSpyImpl.java
@@ -18,10 +18,12 @@
*/
package org.apache.maven.internal.impl;
-import java.util.Collection;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.Collection;
+
import org.apache.maven.api.Event;
import org.apache.maven.api.Listener;
import org.apache.maven.eventspy.EventSpy;
diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/WrapperNode.java b/maven-core/src/main/java/org/apache/maven/internal/impl/WrapperNode.java
index 6f3cdb888..66ead7dd3 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/impl/WrapperNode.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/impl/WrapperNode.java
@@ -20,6 +20,7 @@ package org.apache.maven.internal.impl;
import java.util.List;
import java.util.Optional;
+
import org.apache.maven.api.Dependency;
import org.apache.maven.api.Node;
import org.apache.maven.api.RemoteRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
index 421be2887..570625ac5 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
@@ -18,13 +18,15 @@
*/
package org.apache.maven.lifecycle;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculator;
import org.apache.maven.lifecycle.internal.LifecycleStarter;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
index f3f90e4f7..d7812ed7a 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
@@ -18,6 +18,10 @@
*/
package org.apache.maven.lifecycle;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
@@ -25,9 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.slf4j.Logger;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
index d16e9a44e..561acab6c 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java
@@ -19,6 +19,7 @@
package org.apache.maven.lifecycle;
import java.util.Set;
+
import org.apache.maven.model.Plugin;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java b/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java
index 190071ba7..b3b63cbaa 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java
@@ -20,6 +20,7 @@ package org.apache.maven.lifecycle;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.lifecycle.mapping.LifecyclePhase;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
index 2bbc05042..c7b8c085e 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -18,12 +18,12 @@
*/
package org.apache.maven.lifecycle;
-import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
-
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.utils.logging.MessageBuilder;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
+
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
*/
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
index 88dea239a..a65041ad0 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
@@ -20,6 +20,7 @@ package org.apache.maven.lifecycle;
import java.util.List;
import java.util.Set;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.InvalidPluginDescriptorException;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
index e1ac0a8c0..c35f18c19 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java
@@ -20,6 +20,7 @@ package org.apache.maven.lifecycle;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.InvalidPluginDescriptorException;
import org.apache.maven.plugin.MojoExecution;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java b/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
index 8c3bcaf90..e3d14977e 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java
@@ -27,6 +27,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.maven.lifecycle.internal.ExecutionPlanItem;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecution;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java
index 36a23e1e9..6607c128d 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.lifecycle.internal;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.builder.BuilderCommon;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java
index 197c04f6d..515c53e90 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java
@@ -19,6 +19,7 @@
package org.apache.maven.lifecycle.internal;
import java.util.Collection;
+
import org.apache.maven.execution.ProjectExecutionEvent;
import org.apache.maven.execution.ProjectExecutionListener;
import org.apache.maven.lifecycle.LifecycleExecutionException;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java
index a90255ebc..f54e91a7c 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java
@@ -20,6 +20,7 @@ package org.apache.maven.lifecycle.internal;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.execution.ExecutionEvent;
import org.apache.maven.execution.ExecutionListener;
import org.apache.maven.execution.MavenSession;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
index e37da743f..d402c3ff4 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
@@ -18,6 +18,10 @@
*/
package org.apache.maven.lifecycle.internal;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -28,9 +32,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.xml.Dom;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.internal.xml.Xpp3Dom;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
index 2187a4ea8..96ba78ed3 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java
@@ -18,14 +18,16 @@
*/
package org.apache.maven.lifecycle.internal;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.Lifecycle;
import org.apache.maven.lifecycle.LifecycleMappingDelegate;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
index c71fe01f1..f1e53d7af 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
@@ -18,7 +18,9 @@
*/
package org.apache.maven.lifecycle.internal;
-import static java.util.Objects.requireNonNull;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -26,9 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.xml.Dom;
import org.apache.maven.lifecycle.DefaultLifecycles;
import org.apache.maven.lifecycle.LifeCyclePluginAnalyzer;
@@ -47,6 +47,8 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static java.util.Objects.requireNonNull;
+
/**
* <strong>NOTE:</strong> This class is not part of any public api and can be changed or deleted without prior notice.
*
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
index 83c73f61f..b0de2f672 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
@@ -18,12 +18,14 @@
*/
package org.apache.maven.lifecycle.internal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleNotFoundException;
import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java
index c9154146e..0fee4c78e 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java
@@ -18,14 +18,14 @@
*/
package org.apache.maven.lifecycle.internal;
-import static java.util.Arrays.stream;
+import javax.inject.Named;
+import javax.inject.Singleton;
import java.util.Collection;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.xml.Dom;
import org.apache.maven.internal.xml.Xpp3Dom;
import org.apache.maven.lifecycle.MojoExecutionConfigurator;
@@ -41,6 +41,8 @@ import org.codehaus.plexus.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static java.util.Arrays.stream;
+
/**
* @since 3.3.1, MNG-5753
*/
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java
index 1ce34fa78..ede5b4e09 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java
@@ -18,9 +18,11 @@
*/
package org.apache.maven.lifecycle.internal;
-import java.util.Set;
import javax.inject.Inject;
import javax.inject.Named;
+
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
index 734f8a8cf..6855ffe1e 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.TreeSet;
+
import org.apache.maven.project.MavenProject;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java
index 77816bbd9..3723828e8 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java
@@ -20,6 +20,7 @@ package org.apache.maven.lifecycle.internal;
import java.util.ArrayList;
import java.util.List;
+
import org.apache.maven.lifecycle.internal.builder.BuilderCommon;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecution;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java
index eddf9c52f..32b1a8b15 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java
@@ -18,13 +18,15 @@
*/
package org.apache.maven.lifecycle.internal;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.lifecycle.MavenExecutionPlan;
import org.apache.maven.lifecycle.internal.builder.BuilderCommon;
import org.apache.maven.plugin.MojoExecution;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
index 5a5db6e7f..c5073de83 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@ -18,6 +18,9 @@
*/
package org.apache.maven.lifecycle.internal;
+import javax.inject.Inject;
+import javax.inject.Named;
+
import java.io.File;
import java.util.Collection;
import java.util.Collections;
@@ -27,8 +30,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Named;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java
index 1a7f41d16..2224e6d83 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java
@@ -20,6 +20,7 @@ package org.apache.maven.lifecycle.internal;
import java.util.List;
import java.util.Set;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleNotFoundException;
import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
index 8e930e031..a210b07d9 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.lifecycle.internal;
-import java.util.HashSet;
-import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.HashSet;
+import java.util.List;
+
import org.apache.maven.execution.BuildSuccess;
import org.apache.maven.execution.ExecutionEvent;
import org.apache.maven.execution.MavenSession;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
index d06c0254a..d93e4b3a6 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.lifecycle.internal;
-import java.util.HashMap;
-import java.util.Map;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
index e16e0bada..0c6302c4a 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.lifecycle.internal;
-import java.util.List;
-import java.util.Map;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.List;
+import java.util.Map;
+
import org.apache.maven.execution.ExecutionEvent;
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.execution.MavenSession;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java
index d3e355097..d8e1a6216 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java
@@ -19,6 +19,7 @@
package org.apache.maven.lifecycle.internal;
import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleNotFoundException;
import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
index 3a0db94ab..1122f2c36 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
@@ -18,14 +18,16 @@
*/
package org.apache.maven.lifecycle.internal;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.xml.Dom;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.internal.xml.Xpp3Dom;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
index 62c0f95a5..ba049975d 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
@@ -18,6 +18,11 @@
*/
package org.apache.maven.lifecycle.internal;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -30,10 +35,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.CumulativeScopeArtifactFilter;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java
index d2ddd226b..8d9217d05 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java
@@ -19,6 +19,7 @@
package org.apache.maven.lifecycle.internal;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
index 92d18f2de..654c8ee14 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java
index da00908e1..372cbf1b4 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java
@@ -21,6 +21,7 @@ package org.apache.maven.lifecycle.internal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.lifecycle.internal.builder.BuilderCommon;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java
index 8b4d24460..d21d33c3c 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java
@@ -19,6 +19,7 @@
package org.apache.maven.lifecycle.internal;
import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java
index 5f9286ef9..fc47de620 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java
@@ -21,6 +21,7 @@ package org.apache.maven.lifecycle.internal;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
+
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.lifecycle.internal.builder.BuilderCommon;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java
index a173aa208..83e573162 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java
@@ -20,6 +20,7 @@ package org.apache.maven.lifecycle.internal.builder;
import java.util.List;
import java.util.concurrent.ExecutionException;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.ProjectBuildList;
import org.apache.maven.lifecycle.internal.ReactorBuildStatus;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
index 5fbc2a154..80779df1d 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java
@@ -18,14 +18,16 @@
*/
package org.apache.maven.lifecycle.internal.builder;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.List;
import java.util.Optional;
import java.util.Properties;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.BuildFailure;
import org.apache.maven.execution.ExecutionEvent;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java
index c8a3d0975..37c05e666 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.lifecycle.internal.ProjectBuildList;
import org.apache.maven.lifecycle.internal.ProjectSegment;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index b7038a5b5..12c7dbb0f 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -18,6 +18,10 @@
*/
package org.apache.maven.lifecycle.internal.builder.multithreaded;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -30,9 +34,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.BuildThreadFactory;
import org.apache.maven.lifecycle.internal.LifecycleModuleBuilder;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java
index 2898a5ca2..7b2279aca 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ThreadOutputMuxer.java
@@ -27,6 +27,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+
import org.apache.maven.lifecycle.internal.ProjectBuildList;
import org.apache.maven.lifecycle.internal.ProjectSegment;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java
index d4da91e58..fc814e72a 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java
@@ -18,10 +18,12 @@
*/
package org.apache.maven.lifecycle.internal.builder.singlethreaded;
-import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.LifecycleModuleBuilder;
import org.apache.maven.lifecycle.internal.ProjectBuildList;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
index 4ae3426e3..2a0149927 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
@@ -18,14 +18,14 @@
*/
package org.apache.maven.lifecycle.mapping;
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toMap;
-
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toMap;
+
/**
* DefaultLifecycleMapping
*/
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java
index a4761c29d..faa3a5cf4 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java
@@ -19,6 +19,7 @@
package org.apache.maven.lifecycle.mapping;
import java.util.List;
+
import org.apache.maven.api.xml.Dom;
import org.apache.maven.model.Dependency;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
index 6ab545d43..441e23bcb 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
import org.codehaus.plexus.util.StringUtils;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/AbstractLifecycleProvider.java b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/AbstractLifecycleProvider.java
index acdbe3725..0a48691a6 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/AbstractLifecycleProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/AbstractLifecycleProvider.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.lifecycle.providers;
+import javax.inject.Provider;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
-import javax.inject.Provider;
+
import org.apache.maven.lifecycle.Lifecycle;
import org.apache.maven.lifecycle.mapping.LifecyclePhase;
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java
index 6492934fc..bb749b514 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java
@@ -18,16 +18,18 @@
*/
package org.apache.maven.lifecycle.providers.packaging;
-import static java.util.Objects.requireNonNull;
+import javax.inject.Provider;
import java.util.Collections;
import java.util.HashMap;
-import javax.inject.Provider;
+
import org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping;
import org.apache.maven.lifecycle.mapping.Lifecycle;
import org.apache.maven.lifecycle.mapping.LifecycleMapping;
import org.apache.maven.lifecycle.mapping.LifecyclePhase;
+import static java.util.Objects.requireNonNull;
+
/**
* Base lifecycle mapping provider, ie per-packaging plugin bindings for {@code default} lifecycle.
*/
diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
index d548c2378..c5a34f3bb 100644
--- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
@@ -18,6 +18,10 @@
*/
package org.apache.maven.model.plugin;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -25,9 +29,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.model.Build;
import org.apache.maven.api.model.Model;
import org.apache.maven.api.model.Plugin;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/BuildPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/BuildPluginManager.java
index 9889234bd..65e713fa0 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/BuildPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/BuildPluginManager.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin;
import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java b/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java
index 54a9907f0..a34f3a143 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugin;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
+
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Plugin;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java b/maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java
index 691dd6880..f8f53fcf8 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin;
import java.util.Collection;
+
import org.apache.maven.execution.MojoExecutionEvent;
import org.apache.maven.execution.MojoExecutionListener;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java
index dd3edf617..aa60973c4 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin;
import java.lang.reflect.Array;
+
import org.codehaus.plexus.component.configurator.ConfigurationListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
index 4f7823fe5..a2cb6a5e7 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
@@ -18,12 +18,14 @@
*/
package org.apache.maven.plugin;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.List;
+
import org.apache.maven.api.Project;
import org.apache.maven.api.plugin.MojoException;
import org.apache.maven.execution.MavenSession;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
index 8385d9598..da83a9934 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java
@@ -18,14 +18,16 @@
*/
package org.apache.maven.plugin;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.ExtensionDescriptor;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultMojosExecutionStrategy.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultMojosExecutionStrategy.java
index 0156d66f7..828fe5a38 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultMojosExecutionStrategy.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultMojosExecutionStrategy.java
@@ -18,9 +18,11 @@
*/
package org.apache.maven.plugin;
-import java.util.List;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleExecutionException;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
index ae445936b..c3566486b 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java
@@ -18,14 +18,16 @@
*/
package org.apache.maven.plugin;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Plugin;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
index 021ac4f2a..57675f7f9 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java
@@ -18,13 +18,15 @@
*/
package org.apache.maven.plugin;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.model.Plugin;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
index 2e443ccfb..dfbee3900 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
@@ -18,14 +18,16 @@
*/
package org.apache.maven.plugin;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Plugin;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
index 44adc590d..022b99320 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.ExtensionDescriptor;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
index dec00d598..2dfed7c8d 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin;
import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginPrerequisitesChecker.java b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginPrerequisitesChecker.java
index 0387fb6df..48cdda59b 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginPrerequisitesChecker.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginPrerequisitesChecker.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin;
import java.util.function.Consumer;
+
import org.apache.maven.plugin.descriptor.PluginDescriptor;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
index b4beb7e53..d2a1c947c 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugin;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.api.xml.Dom;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MojosExecutionStrategy.java b/maven-core/src/main/java/org/apache/maven/plugin/MojosExecutionStrategy.java
index 025a6ee87..aa235eb5f 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MojosExecutionStrategy.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/MojosExecutionStrategy.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin;
import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleExecutionException;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
index 35382471e..b0c07ae9a 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Plugin;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java
index ed52a0143..410e1856a 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin;
import java.util.List;
+
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.eclipse.aether.RepositorySystemSession;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
index 6b1cd17e2..d13d668d1 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin;
import java.util.Map;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java
index 14f1b0d2b..e8f0618bb 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin;
import java.util.List;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
index f4bfc88fb..098064cd2 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
@@ -23,6 +23,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.codehaus.plexus.util.StringUtils;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
index 4cc7fba86..8a76960d2 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugin;
import java.io.File;
import java.util.Properties;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java
index 9e48efbee..488168985 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java
@@ -23,6 +23,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Optional;
import java.util.Properties;
+
import org.apache.maven.api.Project;
import org.apache.maven.api.Session;
import org.apache.maven.internal.impl.DefaultMojoExecution;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
index 3066f6dff..917f50d43 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugin;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Plugin;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginParametersValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginParametersValidator.java
index 60edaba7a..7a0f46c4e 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginParametersValidator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginParametersValidator.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.internal;
import java.util.Arrays;
import java.util.List;
+
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.shared.utils.logging.MessageBuilder;
import org.apache.maven.shared.utils.logging.MessageUtils;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
index c1525eb12..96538d37d 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
@@ -18,9 +18,11 @@
*/
package org.apache.maven.plugin.internal;
-import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.concurrent.atomic.AtomicReference;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.LegacySupport;
import org.eclipse.aether.RepositorySystemSession;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index 75745b9ef..af72b4422 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -18,6 +18,10 @@
*/
package org.apache.maven.plugin.internal;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -36,9 +40,7 @@ import java.util.Objects;
import java.util.jar.JarFile;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.api.xml.Dom;
import org.apache.maven.artifact.Artifact;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginValidator.java
index 66bf83c7f..4d7e40d34 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginValidator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginValidator.java
@@ -18,9 +18,11 @@
*/
package org.apache.maven.plugin.internal;
-import java.util.List;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index f3e7b142f..4b1120838 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -18,14 +18,16 @@
*/
package org.apache.maven.plugin.internal;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
index b98908b2b..1ae3a803e 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
@@ -18,10 +18,12 @@
*/
package org.apache.maven.plugin.internal;
-import java.util.Map;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.Map;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java
index 9027fce8b..4c421c979 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.internal;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.shared.utils.logging.MessageUtils;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteChecker.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteChecker.java
index d9984e13a..64406fe48 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteChecker.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteChecker.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.internal;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.plugin.MavenPluginPrerequisitesChecker;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.codehaus.plexus.util.StringUtils;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginMavenPrerequisiteChecker.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginMavenPrerequisiteChecker.java
index d350e4bc8..fbe23cc9b 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginMavenPrerequisiteChecker.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginMavenPrerequisiteChecker.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.internal;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.plugin.MavenPluginPrerequisitesChecker;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.rtinfo.RuntimeInformation;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginValidator.java
index 86e79d102..5333c560a 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginValidator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginValidator.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin.internal;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java
index 2b8b4bbe3..72b198b9e 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java
@@ -18,11 +18,11 @@
*/
package org.apache.maven.plugin.internal;
-import static java.util.Objects.requireNonNull;
-
import org.apache.maven.plugin.logging.Log;
import org.slf4j.Logger;
+import static java.util.Objects.requireNonNull;
+
/**
* @author jdcasey
*/
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java
index d76f60344..0f865df27 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin.internal;
import java.util.List;
+
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.PluginResolutionException;
import org.eclipse.aether.RepositorySystemSession;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/ReadOnlyPluginParametersValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/ReadOnlyPluginParametersValidator.java
index 07f0325a7..c90ac8bc1 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/ReadOnlyPluginParametersValidator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/ReadOnlyPluginParametersValidator.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.internal;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
index a4f4f4a04..e4f069b52 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.internal;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.codehaus.plexus.component.configurator.ConfigurationListener;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java
index 8113eb5f8..8cbcde879 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.prefix;
import java.util.Collections;
import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java
index 9a6d7e363..6dc620b98 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin.prefix;
import java.util.List;
+
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.RemoteRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java
index 93bd47a80..e3d60db7a 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin.prefix;
import java.util.List;
+
import org.apache.maven.model.Model;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RemoteRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
index 9e24594ee..674cfe4d4 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java
@@ -18,14 +18,16 @@
*/
package org.apache.maven.plugin.prefix.internal;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.io.MetadataReader;
import org.apache.maven.model.Build;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java
index af46eb18d..359ae0847 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.version;
import java.util.Collections;
import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java
index 4819de985..5651832d9 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin.version;
import java.util.List;
+
import org.apache.maven.model.Model;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RemoteRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
index bec5137b8..c9ad161ff 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java
@@ -19,6 +19,7 @@
package org.apache.maven.plugin.version;
import java.util.List;
+
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.RemoteRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
index 961310141..2b645bbb0 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
@@ -18,6 +18,10 @@
*/
package org.apache.maven.plugin.version.internal;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -28,9 +32,7 @@ import java.util.Objects;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.repository.metadata.io.MetadataReader;
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java b/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java
index 91bee1435..9e1525ea5 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
+
import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.graph.DependencyNode;
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
index 3d034e68c..b5ee23b4e 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.project;
-import java.io.File;
-import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
index f7c8357d9..13f914712 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
@@ -20,6 +20,7 @@ package org.apache.maven.project;
import java.util.List;
import java.util.Objects;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Model;
import org.apache.maven.model.building.AbstractModelBuildingListener;
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index efc9311d0..5bb9dab0f 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -18,6 +18,10 @@
*/
package org.apache.maven.project;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.File;
import java.io.IOException;
import java.util.AbstractMap;
@@ -32,9 +36,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidArtifactRTException;
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
index 60797d8fd..92cbd259f 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
@@ -18,6 +18,10 @@
*/
package org.apache.maven.project;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -27,9 +31,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
index 872c15b86..8f1843547 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java
@@ -23,6 +23,7 @@ import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.Properties;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Profile;
import org.apache.maven.model.building.ModelBuildingRequest;
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
index 199237bf9..375777ccc 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java
@@ -21,6 +21,7 @@ package org.apache.maven.project;
import java.io.File;
import java.util.Collections;
import java.util.List;
+
import org.apache.maven.model.building.ModelProblem;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index aa69f0123..0a8665dc2 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -18,14 +18,16 @@
*/
package org.apache.maven.project;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
index 8840d6f94..eff2288bc 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java
@@ -18,13 +18,15 @@
*/
package org.apache.maven.project;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable;
diff --git a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java
index a900c04a5..d8083a309 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java
@@ -19,6 +19,7 @@
package org.apache.maven.project;
import java.util.List;
+
import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.graph.DependencyNode;
diff --git a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java
index 963555ca3..8f33fc9b6 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
+
import org.apache.maven.api.xml.Dom;
import org.apache.maven.internal.xml.Xpp3DomBuilder;
import org.codehaus.plexus.util.ReaderFactory;
diff --git a/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java b/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
index e0689353c..07613e7d2 100644
--- a/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
+++ b/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
@@ -19,6 +19,7 @@
package org.apache.maven.project;
import java.io.File;
+
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index cbbbfd180..b024001bf 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -31,6 +31,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.Set;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
index 1b1a17371..8c71c4853 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java
@@ -20,6 +20,7 @@ package org.apache.maven.project;
import java.io.File;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.building.ModelSource;
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java
index efbdd3ffe..f0545487d 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java
@@ -19,6 +19,7 @@
package org.apache.maven.project;
import java.util.List;
+
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Model;
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
index 23f3838a8..7d3cae86a 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
@@ -21,6 +21,7 @@ package org.apache.maven.project;
import java.util.Date;
import java.util.List;
import java.util.Properties;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Profile;
import org.eclipse.aether.RepositorySystemSession;
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java
index 77e957ef7..4be11f3e8 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java
@@ -20,6 +20,7 @@ package org.apache.maven.project;
import java.io.File;
import java.util.List;
+
import org.apache.maven.model.building.ModelProblem;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
index a9e6b2518..3ca215292 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java
@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
+
import org.apache.maven.api.model.Dependency;
import org.apache.maven.api.model.Parent;
import org.apache.maven.api.model.Repository;
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
index 99a10aa03..241c86095 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java
@@ -19,6 +19,7 @@
package org.apache.maven.project;
import java.util.List;
+
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.eclipse.aether.graph.DependencyFilter;
diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
index 9b6933958..070c6a5d1 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+
import org.apache.maven.api.model.Build;
import org.apache.maven.api.model.Dependency;
import org.apache.maven.api.model.Extension;
diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
index 476132df4..305ec24ca 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
@@ -26,6 +26,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+
import org.apache.maven.model.Model;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
index be93dee2f..4c5400bbe 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
@@ -21,6 +21,7 @@ package org.apache.maven.project.artifact;
import java.io.File;
import java.util.Collection;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java
index 92543e42c..01806cae2 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java
@@ -19,6 +19,7 @@
package org.apache.maven.project.artifact;
import java.util.List;
+
import org.apache.maven.model.Dependency;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java b/maven-core/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java
index 10a7d9292..aa6a36c25 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java
@@ -21,6 +21,7 @@ package org.apache.maven.project.artifact;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.InvalidArtifactRTException;
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
index 61913ac7f..8141cc149 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
@@ -18,6 +18,9 @@
*/
package org.apache.maven.project.artifact;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
@@ -28,8 +31,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.metadata.ResolutionGroup;
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java
index 57d3c9d30..566dcb740 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java
@@ -21,6 +21,7 @@ package org.apache.maven.project.artifact;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
import org.apache.maven.plugin.LegacySupport;
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
index a13c057d8..4a2dd69e0 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java
@@ -18,6 +18,9 @@
*/
package org.apache.maven.project.artifact;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -28,8 +31,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.lifecycle.LifecycleExecutionException;
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java b/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java
index a214e2631..158493897 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java
@@ -19,6 +19,7 @@
package org.apache.maven.project.artifact;
import java.io.File;
+
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.model.Dependency;
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java
index 1b98b0749..8b759dbcb 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java
@@ -19,6 +19,7 @@
package org.apache.maven.project.artifact;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index aa86eaede..3b8023d44 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -18,6 +18,10 @@
*/
package org.apache.maven.project.artifact;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
@@ -30,9 +34,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java b/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
index 64deee8e2..d5bb91666 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java
@@ -20,6 +20,7 @@ package org.apache.maven.project.artifact;
import java.util.Collections;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
index 8225e6b7f..8d75eb76c 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java
@@ -20,6 +20,7 @@ package org.apache.maven.project.artifact;
import java.util.Collections;
import java.util.List;
+
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.model.Dependency;
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
index ec508224d..407168142 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
@@ -20,6 +20,7 @@ package org.apache.maven.project.artifact;
import java.io.File;
import java.io.IOException;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.AbstractArtifactMetadata;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
index 1b49e806e..025800698 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java
@@ -20,6 +20,7 @@ package org.apache.maven.project.artifact;
import java.util.Collection;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.project.MavenProject;
diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java b/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
index a6b6fa81e..98bd09b2c 100644
--- a/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
+++ b/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
@@ -18,12 +18,14 @@
*/
package org.apache.maven.project.collector;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblemUtils;
diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java b/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
index 23dc3e289..fa38120f4 100644
--- a/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
+++ b/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java
@@ -18,15 +18,17 @@
*/
package org.apache.maven.project.collector;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.function.Predicate;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.building.ModelProblem;
diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java b/maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java
index 44a8e9c14..bae54f3a5 100644
--- a/maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java
+++ b/maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.project.collector;
-import java.util.Arrays;
-import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.Arrays;
+import java.util.List;
+
import org.apache.maven.DefaultMaven;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.model.building.ModelSource;
diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/ProjectCollectionStrategy.java b/maven-core/src/main/java/org/apache/maven/project/collector/ProjectCollectionStrategy.java
index c377eeb04..d9bc2f16d 100644
--- a/maven-core/src/main/java/org/apache/maven/project/collector/ProjectCollectionStrategy.java
+++ b/maven-core/src/main/java/org/apache/maven/project/collector/ProjectCollectionStrategy.java
@@ -19,6 +19,7 @@
package org.apache.maven.project.collector;
import java.util.List;
+
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/ProjectsSelector.java b/maven-core/src/main/java/org/apache/maven/project/collector/ProjectsSelector.java
index 2cc7b846b..74425f914 100644
--- a/maven-core/src/main/java/org/apache/maven/project/collector/ProjectsSelector.java
+++ b/maven-core/src/main/java/org/apache/maven/project/collector/ProjectsSelector.java
@@ -20,6 +20,7 @@ package org.apache.maven.project.collector;
import java.io.File;
import java.util.List;
+
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java b/maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java
index c3436f02a..8ba724e8f 100644
--- a/maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java
+++ b/maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java
@@ -18,12 +18,14 @@
*/
package org.apache.maven.project.collector;
-import java.io.File;
-import java.util.Collections;
-import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
diff --git a/maven-core/src/main/java/org/apache/maven/project/path/PathTranslator.java b/maven-core/src/main/java/org/apache/maven/project/path/PathTranslator.java
index 8afcb9371..c32041af1 100644
--- a/maven-core/src/main/java/org/apache/maven/project/path/PathTranslator.java
+++ b/maven-core/src/main/java/org/apache/maven/project/path/PathTranslator.java
@@ -19,6 +19,7 @@
package org.apache.maven.project.path;
import java.io.File;
+
import org.apache.maven.model.Model;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java b/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java
index ddbd36624..a8fb0761f 100644
--- a/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java
@@ -21,6 +21,7 @@ package org.apache.maven.properties.internal;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
+
import org.codehaus.plexus.util.Os;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
index e30b5a375..306d61230 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
index 5c0f89a8e..ede7f869c 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
@@ -20,6 +20,7 @@ package org.apache.maven.repository;
import java.io.File;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java
index 2ef71a17f..be6db47d9 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository.legacy.metadata;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.versioning.ArtifactVersion;
diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java
index 6356b7889..58921df5c 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository.legacy.metadata;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java
index 734de97bd..bb4c8705e 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java
@@ -19,6 +19,7 @@
package org.apache.maven.repository.legacy.metadata;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
diff --git a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java
index ef51f63ee..5e4290535 100644
--- a/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java
+++ b/maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java
@@ -21,6 +21,7 @@ package org.apache.maven.repository.legacy.metadata;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
diff --git a/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java b/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java
index 3593aefd0..ac5d18d7c 100644
--- a/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java
+++ b/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java
@@ -18,12 +18,14 @@
*/
package org.apache.maven.rtinfo.internal;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import org.apache.maven.rtinfo.RuntimeInformation;
diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
index 546cc980e..320ab1a3a 100644
--- a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
+++ b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java
@@ -18,16 +18,17 @@
*/
package org.apache.maven.session.scope.internal;
-import com.google.inject.Key;
-import com.google.inject.OutOfScopeException;
-import com.google.inject.Provider;
-import com.google.inject.Scope;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
+import com.google.inject.Key;
+import com.google.inject.OutOfScopeException;
+import com.google.inject.Provider;
+import com.google.inject.Scope;
+
/**
* SessionScope
*/
diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java
index f2c2e0043..a677f09d2 100644
--- a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java
+++ b/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java
@@ -18,9 +18,10 @@
*/
package org.apache.maven.session.scope.internal;
-import com.google.inject.AbstractModule;
import javax.inject.Inject;
import javax.inject.Named;
+
+import com.google.inject.AbstractModule;
import org.apache.maven.SessionScoped;
import org.apache.maven.api.Session;
import org.apache.maven.execution.MavenSession;
diff --git a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 997b61bec..30bec8ab5 100644
--- a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.settings;
-import java.io.File;
-import java.io.IOException;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.io.File;
+import java.io.IOException;
+
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.properties.internal.SystemProperties;
import org.apache.maven.settings.building.DefaultSettingsBuildingRequest;
diff --git a/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java b/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
index 36d512d90..391719dd8 100644
--- a/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
@@ -20,6 +20,7 @@ package org.apache.maven.settings;
import java.io.File;
import java.io.IOException;
+
import org.apache.maven.execution.MavenExecutionRequest;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
diff --git a/maven-core/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java
index d271decb5..fe8904dea 100644
--- a/maven-core/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java
+++ b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java
@@ -41,6 +41,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
+
import org.apache.maven.api.model.ActivationFile;
import org.apache.maven.api.settings.Activation;
import org.apache.maven.api.settings.ActivationOS;
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
index ce93dfe7b..8453b4e7a 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
@@ -23,6 +23,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
+
import org.apache.maven.toolchain.model.ToolchainModel;
import org.slf4j.Logger;
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
index b6cc966ef..69331728f 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
@@ -18,16 +18,16 @@
*/
package org.apache.maven.toolchain;
-import static java.util.Objects.requireNonNull;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
@@ -35,6 +35,8 @@ import org.apache.maven.toolchain.model.ToolchainModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static java.util.Objects.requireNonNull;
+
/**
* @author mkleint
*/
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
index 28e382d3c..967f89e77 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
@@ -18,12 +18,14 @@
*/
package org.apache.maven.toolchain;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
import org.apache.maven.api.toolchain.ToolchainModel;
import org.apache.maven.execution.MavenSession;
import org.slf4j.Logger;
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
index e4e1f7599..848d78b27 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
@@ -18,10 +18,12 @@
*/
package org.apache.maven.toolchain;
-import java.io.File;
-import java.io.Reader;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.io.File;
+import java.io.Reader;
+
import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.v4.MavenToolchainsXpp3Reader;
import org.codehaus.plexus.util.ReaderFactory;
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
index ddd0adfd6..e760b6b9a 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
@@ -20,6 +20,7 @@ package org.apache.maven.toolchain;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.execution.MavenSession;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
index 53760b6c9..800ab2419 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
@@ -19,6 +19,7 @@
package org.apache.maven.toolchain;
import java.util.Map;
+
import org.apache.maven.toolchain.model.ToolchainModel;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
index 9f416ce45..43adef4d2 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
@@ -19,6 +19,7 @@
package org.apache.maven.toolchain;
import java.io.File;
+
import org.apache.maven.toolchain.model.PersistedToolchains;
/**
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
index f8eb2bd19..7e8a5ce99 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
@@ -18,11 +18,13 @@
*/
package org.apache.maven.toolchain.java;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.File;
import java.util.Map.Entry;
import java.util.Properties;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.toolchain.MisconfiguredToolchainException;
import org.apache.maven.toolchain.RequirementMatcher;
import org.apache.maven.toolchain.RequirementMatcherFactory;
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
index 1565f187f..4532fa3df 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
@@ -19,6 +19,7 @@
package org.apache.maven.toolchain.java;
import java.io.File;
+
import org.apache.maven.toolchain.DefaultToolchain;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.util.FileUtils;
diff --git a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
index cc25834e3..720729582 100644
--- a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
+++ b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
@@ -18,14 +18,14 @@
*/
package org.apache.maven;
-import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
+import javax.inject.Inject;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -54,6 +54,8 @@ import org.eclipse.aether.internal.impl.DefaultRepositorySystem;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
+import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
+
@PlexusTest
public abstract class AbstractCoreMavenComponentTestCase {
diff --git a/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java b/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java
index 0b9fe0b30..97c205629 100644
--- a/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java
+++ b/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java
@@ -18,17 +18,14 @@
*/
package org.apache.maven;
-import static java.util.Arrays.asList;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
import java.io.File;
import java.nio.file.Files;
import java.util.concurrent.atomic.AtomicReference;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -39,6 +36,11 @@ import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.repository.internal.MavenWorkspaceReader;
import org.junit.jupiter.api.Test;
+import static java.util.Arrays.asList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class DefaultMavenTest extends AbstractCoreMavenComponentTestCase {
@Singleton
@Named("WsrClassCatcher")
diff --git a/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java b/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java
index 9297c46d5..8d79489f5 100644
--- a/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java
+++ b/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java
@@ -18,14 +18,12 @@
*/
package org.apache.maven;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
@@ -36,6 +34,9 @@ import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.ComponentDescriptor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
public class MavenLifecycleParticipantTest extends AbstractCoreMavenComponentTestCase {
private static final String INJECTED_ARTIFACT_ID = "injected";
diff --git a/maven-core/src/test/java/org/apache/maven/MavenTest.java b/maven-core/src/test/java/org/apache/maven/MavenTest.java
index d9b5cdad0..920f40113 100644
--- a/maven-core/src/test/java/org/apache/maven/MavenTest.java
+++ b/maven-core/src/test/java/org/apache/maven/MavenTest.java
@@ -19,6 +19,7 @@
package org.apache.maven;
import javax.inject.Inject;
+
import org.apache.maven.exception.ExceptionHandler;
import org.junit.jupiter.api.Test;
diff --git a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
index ab9ef97fe..81a648dfe 100644
--- a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
+++ b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
@@ -18,22 +18,24 @@
*/
package org.apache.maven;
-import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.endsWith;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import javax.inject.Inject;
import java.io.File;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
import java.util.Set;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.junit.jupiter.api.Test;
+import static org.codehaus.plexus.testing.PlexusExtension.getBasedir;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.endsWith;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class ProjectDependenciesResolverTest extends AbstractCoreMavenComponentTestCase {
@Inject
private ProjectDependenciesResolver resolver;
diff --git a/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java b/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
index 055f1f471..5d64c32ef 100644
--- a/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
@@ -18,17 +18,19 @@
*/
package org.apache.maven.artifact.handler;
-import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import javax.inject.Inject;
import java.io.File;
import java.util.List;
-import javax.inject.Inject;
+
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.testing.PlexusTest;
import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.Test;
+import static org.codehaus.plexus.testing.PlexusExtension.getTestFile;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
@PlexusTest
public class ArtifactHandlerTest {
@Inject
diff --git a/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java b/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java
index 040c804d5..480e83bff 100644
--- a/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java
+++ b/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java
@@ -18,18 +18,19 @@
*/
package org.apache.maven.artifact.resolver.filter;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import java.util.Arrays;
import java.util.Collections;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Exclusion;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public class ExclusionArtifactFilterTest {
private Artifact artifact;
diff --git a/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorPathTest.java b/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorPathTest.java
index 878e2c507..fae3aafca 100644
--- a/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorPathTest.java
+++ b/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorPathTest.java
@@ -18,13 +18,12 @@
*/
package org.apache.maven.configuration;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.nio.file.Path;
import java.nio.file.Paths;
+
import org.apache.maven.configuration.internal.DefaultBeanConfigurator;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
@@ -33,6 +32,8 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* @author Benjamin Bentmann
*/
diff --git a/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java b/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java
index 9da160012..9c27076cc 100644
--- a/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java
@@ -18,11 +18,10 @@
*/
package org.apache.maven.configuration;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
+
import org.apache.maven.configuration.internal.DefaultBeanConfigurator;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
@@ -31,6 +30,8 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* @author Benjamin Bentmann
*/
diff --git a/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java b/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
index aa21d77a8..a3b78ca9f 100644
--- a/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
@@ -18,10 +18,9 @@
*/
package org.apache.maven.exception;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.io.IOException;
import java.net.ConnectException;
+
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;
@@ -31,6 +30,8 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* @author <a href="mailto:baerrach@apache.org">Barrie Treloar</a>
*/
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
index d08943f4d..bfba1d6e4 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java
@@ -18,18 +18,19 @@
*/
package org.apache.maven.execution;
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-
import java.util.Optional;
+
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
public class DefaultBuildResumptionAnalyzerTest {
private final DefaultBuildResumptionAnalyzer analyzer = new DefaultBuildResumptionAnalyzer();
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java
index 05fd948bf..e3be3c0cb 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java
@@ -18,19 +18,20 @@
*/
package org.apache.maven.execution;
-import static java.util.Collections.singleton;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.is;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+
import org.apache.maven.model.Build;
import org.apache.maven.project.MavenProject;
import org.junit.jupiter.api.Test;
+import static java.util.Collections.singleton;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+
public class DefaultBuildResumptionDataRepositoryTest {
private final DefaultBuildResumptionDataRepository repository = new DefaultBuildResumptionDataRepository();
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
index 804ff5235..4bf14d409 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java
@@ -18,10 +18,10 @@
*/
package org.apache.maven.execution;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import javax.inject.Inject;
import java.util.List;
-import javax.inject.Inject;
+
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.settings.Profile;
import org.apache.maven.settings.Repository;
@@ -29,6 +29,8 @@ import org.apache.maven.settings.Settings;
import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
@PlexusTest
public class DefaultMavenExecutionRequestPopulatorTest {
@Inject
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
index e07d1b9dd..f58efc44d 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
@@ -18,16 +18,17 @@
*/
package org.apache.maven.execution;
+import java.util.List;
+
+import org.apache.maven.project.MavenProject;
+import org.junit.jupiter.api.Test;
+
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotSame;
-import java.util.List;
-import org.apache.maven.project.MavenProject;
-import org.junit.jupiter.api.Test;
-
/**
* @author Benjamin Bentmann
*/
diff --git a/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java b/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java
index c5787d572..27f3abb6a 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java
@@ -18,17 +18,18 @@
*/
package org.apache.maven.execution.scope.internal;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.util.concurrent.atomic.AtomicInteger;
import com.google.inject.Key;
-import java.util.concurrent.atomic.AtomicInteger;
import org.apache.maven.execution.MojoExecutionEvent;
import org.apache.maven.execution.scope.WeakMojoExecutionListener;
import org.apache.maven.plugin.MojoExecutionException;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
public class MojoExecutionScopeTest {
@Test
public void testNestedEnter() throws Exception {
diff --git a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
index 5744ab74c..119e50cfc 100644
--- a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
@@ -18,22 +18,6 @@
*/
package org.apache.maven.graph;
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toList;
-import static org.apache.maven.execution.MavenExecutionRequest.REACTOR_MAKE_DOWNSTREAM;
-import static org.apache.maven.execution.MavenExecutionRequest.REACTOR_MAKE_UPSTREAM;
-import static org.apache.maven.graph.DefaultGraphBuilderTest.ScenarioBuilder.scenario;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
@@ -42,6 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import org.apache.maven.MavenExecutionException;
import org.apache.maven.execution.BuildResumptionDataRepository;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -68,6 +53,22 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toList;
+import static org.apache.maven.execution.MavenExecutionRequest.REACTOR_MAKE_DOWNSTREAM;
+import static org.apache.maven.execution.MavenExecutionRequest.REACTOR_MAKE_UPSTREAM;
+import static org.apache.maven.graph.DefaultGraphBuilderTest.ScenarioBuilder.scenario;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
class DefaultGraphBuilderTest {
/*
The multi-module structure in this project is displayed as follows:
diff --git a/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java b/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java
index 04d3c0886..e13283396 100644
--- a/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java
+++ b/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java
@@ -18,10 +18,9 @@
*/
package org.apache.maven.graph;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.util.Arrays;
import java.util.List;
+
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.DuplicateProjectException;
@@ -29,6 +28,8 @@ import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* @author Kristian Rosenvold
*/
diff --git a/maven-core/src/test/java/org/apache/maven/graph/ProjectSelectorTest.java b/maven-core/src/test/java/org/apache/maven/graph/ProjectSelectorTest.java
index 02cc39f6d..2cdeac39b 100644
--- a/maven-core/src/test/java/org/apache/maven/graph/ProjectSelectorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/graph/ProjectSelectorTest.java
@@ -18,16 +18,6 @@
*/
package org.apache.maven.graph;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -35,6 +25,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+
import org.apache.maven.MavenExecutionException;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.project.MavenProject;
@@ -44,6 +35,16 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EmptySource;
import org.junit.jupiter.params.provider.ValueSource;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
class ProjectSelectorTest {
private final ProjectSelector sut = new ProjectSelector();
private final MavenExecutionRequest mavenExecutionRequest = mock(MavenExecutionRequest.class);
diff --git a/maven-core/src/test/java/org/apache/maven/internal/MultilineMessageHelperTest.java b/maven-core/src/test/java/org/apache/maven/internal/MultilineMessageHelperTest.java
index 68d56ad34..7b922a843 100644
--- a/maven-core/src/test/java/org/apache/maven/internal/MultilineMessageHelperTest.java
+++ b/maven-core/src/test/java/org/apache/maven/internal/MultilineMessageHelperTest.java
@@ -18,12 +18,13 @@
*/
package org.apache.maven.internal;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.util.ArrayList;
import java.util.List;
+
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class MultilineMessageHelperTest {
@Test
diff --git a/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java b/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
index 0fe6adbe6..457cbed26 100644
--- a/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/internal/aether/ConsumerModelSourceTransformerTest.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+
import org.apache.maven.model.Model;
import org.apache.maven.model.building.TransformerContext;
import org.junit.jupiter.api.Test;
diff --git a/maven-core/src/test/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListenerTest.java b/maven-core/src/test/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListenerTest.java
index f7e68beba..d8c4033d3 100644
--- a/maven-core/src/test/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListenerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListenerTest.java
@@ -18,14 +18,8 @@
*/
package org.apache.maven.internal.aether;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import java.io.File;
+
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.RequestTrace;
import org.eclipse.aether.artifact.Artifact;
@@ -33,6 +27,13 @@ import org.eclipse.aether.collection.CollectStepData;
import org.eclipse.aether.repository.LocalRepository;
import org.junit.jupiter.api.Test;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
/**
* UT for {@link ReverseTreeRepositoryListener}.
*/
diff --git a/maven-core/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java b/maven-core/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java
index 914d6d5b9..2a0003d8c 100644
--- a/maven-core/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java
+++ b/maven-core/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java
@@ -18,19 +18,20 @@
*/
package org.apache.maven.internal.impl;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.NoSuchElementException;
import java.util.Properties;
import java.util.Set;
+
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class PropertiesAsMapTest {
@Test
diff --git a/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java b/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java
index 31a36dbf8..121a9a59c 100644
--- a/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java
+++ b/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java
@@ -18,13 +18,12 @@
*/
package org.apache.maven.internal.impl;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
import java.nio.file.Path;
import java.util.Collections;
import java.util.Optional;
-import javax.inject.Inject;
+
import org.apache.maven.api.Artifact;
import org.apache.maven.api.ArtifactCoordinate;
import org.apache.maven.api.Node;
@@ -52,6 +51,9 @@ import org.eclipse.aether.repository.RemoteRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
@PlexusTest
public class TestApi {
diff --git a/maven-core/src/test/java/org/apache/maven/internal/impl/TestRepositorySystem.java b/maven-core/src/test/java/org/apache/maven/internal/impl/TestRepositorySystem.java
index 856fb828b..f34eb51e6 100644
--- a/maven-core/src/test/java/org/apache/maven/internal/impl/TestRepositorySystem.java
+++ b/maven-core/src/test/java/org/apache/maven/internal/impl/TestRepositorySystem.java
@@ -18,15 +18,17 @@
*/
package org.apache.maven.internal.impl;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.api.model.Model;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java
index e820c3648..16f3cb26c 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java
@@ -18,12 +18,7 @@
*/
package org.apache.maven.lifecycle;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.arrayWithSize;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import javax.inject.Inject;
import java.util.ArrayList;
import java.util.Arrays;
@@ -31,12 +26,19 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.inject.Inject;
+
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.arrayWithSize;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
/**
* @author Kristian Rosenvold
*/
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java b/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java
index 9c7a742d0..843938f5a 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java
@@ -18,10 +18,12 @@
*/
package org.apache.maven.lifecycle;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
import org.apache.maven.execution.MojoExecutionEvent;
import org.apache.maven.execution.MojoExecutionListener;
import org.apache.maven.plugin.MojoExecutionException;
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java b/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java
index b0b192e7c..d90c37334 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java
@@ -18,10 +18,12 @@
*/
package org.apache.maven.lifecycle;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
import javax.inject.Named;
import javax.inject.Singleton;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
import org.apache.maven.execution.ProjectExecutionEvent;
import org.apache.maven.execution.ProjectExecutionListener;
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java b/maven-core/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java
index 3e0242f4d..ff43d7838 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java
@@ -21,6 +21,7 @@ package org.apache.maven.lifecycle;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
+
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
index cbf48525b..1758cd740 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
@@ -18,9 +18,8 @@
*/
package org.apache.maven.lifecycle;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
import javax.inject.Inject;
+
import org.apache.maven.AbstractCoreMavenComponentTestCase;
import org.apache.maven.exception.ExceptionHandler;
import org.apache.maven.lifecycle.internal.LifecycleDependencyResolver;
@@ -30,6 +29,8 @@ import org.apache.maven.lifecycle.internal.LifecycleTaskSegmentCalculator;
import org.apache.maven.lifecycle.internal.MojoExecutor;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* Just asserts that it's able to create those components. Handy when CDI container gets a nervous breakdown.
*
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
index 31698b09a..9850860fe 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
@@ -18,12 +18,7 @@
*/
package org.apache.maven.lifecycle;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasSize;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import javax.inject.Inject;
import java.io.File;
import java.util.ArrayList;
@@ -31,7 +26,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
-import javax.inject.Inject;
+
import org.apache.maven.AbstractCoreMavenComponentTestCase;
import org.apache.maven.api.xml.Dom;
import org.apache.maven.execution.MavenSession;
@@ -54,6 +49,13 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.project.MavenProject;
import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
public class LifecycleExecutorTest extends AbstractCoreMavenComponentTestCase {
@Inject
private DefaultLifecycleExecutor lifecycleExecutor;
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java
index d1dcd3944..28c15f6ad 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java
@@ -18,16 +18,17 @@
*/
package org.apache.maven.lifecycle;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
import java.util.Set;
+
import org.apache.maven.lifecycle.internal.ExecutionPlanItem;
import org.apache.maven.lifecycle.internal.stub.LifecycleExecutionPlanCalculatorStub;
import org.apache.maven.model.Plugin;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
* @author Kristian Rosenvold
*/
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/MojoExecutionXPathContainer.java b/maven-core/src/test/java/org/apache/maven/lifecycle/MojoExecutionXPathContainer.java
index 577579080..73d53bea5 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/MojoExecutionXPathContainer.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/MojoExecutionXPathContainer.java
@@ -20,6 +20,7 @@ package org.apache.maven.lifecycle;
import java.io.IOException;
import java.util.Iterator;
+
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathNotFoundException;
import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java
index f5e040ad2..e08ae48ab 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java
@@ -18,16 +18,17 @@
*/
package org.apache.maven.lifecycle.internal;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-
import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.stub.LifecycleTaskSegmentCalculatorStub;
import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
public class BuildListCalculatorTest {
@Test
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
index 98248c1f1..899505a92 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java
@@ -18,16 +18,8 @@
*/
package org.apache.maven.lifecycle.internal;
-import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.A;
-import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.B;
-import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.C;
-import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.X;
-import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.Y;
-import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.Z;
-import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.getProjectBuildList;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.lifecycle.LifecycleNotFoundException;
@@ -44,6 +36,15 @@ import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.project.MavenProject;
import org.junit.jupiter.api.Test;
+import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.A;
+import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.B;
+import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.C;
+import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.X;
+import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.Y;
+import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.Z;
+import static org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub.getProjectBuildList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* @author Kristian Rosenvold
*/
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java
index 5eeafb5db..d696e0f18 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java
@@ -18,8 +18,7 @@
*/
package org.apache.maven.lifecycle.internal;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import javax.inject.Inject;
import java.io.File;
import java.util.Collection;
@@ -27,13 +26,16 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
-import javax.inject.Inject;
+
import org.apache.maven.AbstractCoreMavenComponentTestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
public class LifecycleDependencyResolverTest extends AbstractCoreMavenComponentTestCase {
@Inject
private LifecycleDependencyResolver resolver;
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
index 2a9dc9642..8b7a64cb9 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java
@@ -18,8 +18,6 @@
*/
package org.apache.maven.lifecycle.internal;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
import org.apache.maven.AbstractCoreMavenComponentTestCase;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.MavenExecutionPlan;
@@ -31,6 +29,8 @@ import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* @author Kristian Rosenvold
*/
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilderTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilderTest.java
index 9c492a336..abda9fddd 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilderTest.java
@@ -18,14 +18,13 @@
*/
package org.apache.maven.lifecycle.internal;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import javax.inject.Inject;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import javax.inject.Inject;
+
import org.apache.maven.execution.AbstractExecutionListener;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
@@ -40,6 +39,9 @@ import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
@PlexusTest
public class LifecycleModuleBuilderTest {
@Inject
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java
index ce8d0454d..6270aeaab 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java
@@ -18,15 +18,16 @@
*/
package org.apache.maven.lifecycle.internal;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.stub.LifecycleTaskSegmentCalculatorStub;
import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* @author Kristian Rosenvold
*/
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java
index c2410fa7d..b402c5f1e 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java
@@ -18,16 +18,17 @@
*/
package org.apache.maven.lifecycle.internal;
... 5699 lines suppressed ...