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/11/22 13:26:09 UTC
[maven] branch master updated (b1c1f7556 -> 001eef845)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
from b1c1f7556 [MNG-7600] LocalRepositoryManager is created too early
new 49572e46c [MNG-7601] Upgrade Apache Maven parent POM to version 38
new de19cfcd2 [MNG-7601] Reformat sources
new 001eef845 [MNG-7601] Ignore reformat commit in blame
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../build.properties => .git-blame-ignore-revs | 5 +-
apache-maven/pom.xml | 52 +-
.../apache/maven/settings/GlobalSettingsTest.java | 27 +-
api/maven-api-core/pom.xml | 2 +-
.../main/java/org/apache/maven/api/Artifact.java | 23 +-
.../org/apache/maven/api/ArtifactCoordinate.java | 14 +-
.../main/java/org/apache/maven/api/Dependency.java | 9 +-
.../org/apache/maven/api/DependencyCoordinate.java | 12 +-
.../src/main/java/org/apache/maven/api/Event.java | 10 +-
.../main/java/org/apache/maven/api/EventType.java | 6 +-
.../main/java/org/apache/maven/api/Exclusion.java | 7 +-
.../java/org/apache/maven/api/JavaToolchain.java | 9 +-
.../main/java/org/apache/maven/api/Listener.java | 13 +-
.../java/org/apache/maven/api/LocalRepository.java | 8 +-
.../java/org/apache/maven/api/MetadataStorage.java | 6 +-
.../java/org/apache/maven/api/MojoExecution.java | 10 +-
.../src/main/java/org/apache/maven/api/Node.java | 25 +-
.../java/org/apache/maven/api/NodeVisitor.java | 17 +-
.../main/java/org/apache/maven/api/Project.java | 21 +-
.../org/apache/maven/api/RemoteRepository.java | 7 +-
.../main/java/org/apache/maven/api/Repository.java | 9 +-
.../java/org/apache/maven/api/ResolutionScope.java | 42 +-
.../src/main/java/org/apache/maven/api/Scope.java | 30 +-
.../main/java/org/apache/maven/api/Service.java | 11 +-
.../main/java/org/apache/maven/api/Session.java | 79 +-
.../java/org/apache/maven/api/SessionData.java | 35 +-
.../main/java/org/apache/maven/api/Toolchain.java | 15 +-
.../src/main/java/org/apache/maven/api/Type.java | 9 +-
.../main/java/org/apache/maven/api/Version.java | 10 +-
.../java/org/apache/maven/api/VersionRange.java | 10 +-
.../main/java/org/apache/maven/api/plugin/Log.java | 49 +-
.../java/org/apache/maven/api/plugin/Mojo.java | 12 +-
.../org/apache/maven/api/plugin/MojoException.java | 36 +-
.../maven/api/plugin/annotations/Component.java | 11 +-
.../maven/api/plugin/annotations/Execute.java | 11 +-
.../plugin/annotations/InstantiationStrategy.java | 20 +-
.../api/plugin/annotations/LifecyclePhase.java | 76 +-
.../apache/maven/api/plugin/annotations/Mojo.java | 14 +-
.../maven/api/plugin/annotations/Parameter.java | 15 +-
.../api/services/ArtifactCoordinateFactory.java | 45 +-
.../services/ArtifactCoordinateFactoryRequest.java | 146 +-
.../maven/api/services/ArtifactDeployer.java | 24 +-
.../api/services/ArtifactDeployerException.java | 17 +-
.../api/services/ArtifactDeployerRequest.java | 89 +-
.../apache/maven/api/services/ArtifactFactory.java | 31 +-
.../maven/api/services/ArtifactFactoryRequest.java | 131 +-
.../maven/api/services/ArtifactInstaller.java | 24 +-
.../api/services/ArtifactInstallerException.java | 17 +-
.../api/services/ArtifactInstallerRequest.java | 66 +-
.../apache/maven/api/services/ArtifactManager.java | 19 +-
.../maven/api/services/ArtifactResolver.java | 18 +-
.../api/services/ArtifactResolverException.java | 15 +-
.../api/services/ArtifactResolverRequest.java | 59 +-
.../maven/api/services/ArtifactResolverResult.java | 12 +-
.../org/apache/maven/api/services/BaseRequest.java | 36 +-
.../apache/maven/api/services/BuilderProblem.java | 11 +-
.../maven/api/services/DependencyCollector.java | 38 +-
.../api/services/DependencyCollectorException.java | 14 +-
.../api/services/DependencyCollectorRequest.java | 143 +-
.../api/services/DependencyCollectorResult.java | 34 +-
.../api/services/DependencyCoordinateFactory.java | 54 +-
.../DependencyCoordinateFactoryRequest.java | 196 +-
.../maven/api/services/LocalRepositoryManager.java | 14 +-
.../java/org/apache/maven/api/services/Lookup.java | 16 +-
.../apache/maven/api/services/LookupException.java | 20 +-
.../apache/maven/api/services/MavenException.java | 28 +-
.../apache/maven/api/services/MessageBuilder.java | 43 +-
.../maven/api/services/MessageBuilderFactory.java | 15 +-
.../apache/maven/api/services/ProjectBuilder.java | 37 +-
.../api/services/ProjectBuilderException.java | 15 +-
.../maven/api/services/ProjectBuilderRequest.java | 155 +-
.../maven/api/services/ProjectBuilderResult.java | 13 +-
.../apache/maven/api/services/ProjectManager.java | 59 +-
.../org/apache/maven/api/services/Prompter.java | 34 +-
.../maven/api/services/PrompterException.java | 15 +-
.../maven/api/services/RepositoryFactory.java | 16 +-
.../apache/maven/api/services/SettingsBuilder.java | 27 +-
.../api/services/SettingsBuilderException.java | 14 +-
.../maven/api/services/SettingsBuilderRequest.java | 106 +-
.../maven/api/services/SettingsBuilderResult.java | 10 +-
.../java/org/apache/maven/api/services/Source.java | 7 +-
.../maven/api/services/ToolchainFactory.java | 8 +-
.../maven/api/services/ToolchainManager.java | 19 +-
.../api/services/ToolchainManagerException.java | 15 +-
.../maven/api/services/ToolchainsBuilder.java | 12 +-
.../api/services/ToolchainsBuilderException.java | 14 +-
.../api/services/ToolchainsBuilderRequest.java | 106 +-
.../api/services/ToolchainsBuilderResult.java | 10 +-
.../apache/maven/api/services/TypeRegistry.java | 11 +-
.../apache/maven/api/services/VersionParser.java | 19 +-
.../maven/api/services/VersionParserException.java | 15 +-
.../maven/api/services/xml/ModelXmlFactory.java | 10 +-
.../maven/api/services/xml/SettingsXmlFactory.java | 10 +-
.../api/services/xml/ToolchainsXmlFactory.java | 10 +-
.../apache/maven/api/services/xml/XmlFactory.java | 84 +-
.../maven/api/services/xml/XmlReaderException.java | 15 +-
.../maven/api/services/xml/XmlReaderRequest.java | 102 +-
.../maven/api/services/xml/XmlWriterException.java | 15 +-
.../maven/api/services/xml/XmlWriterRequest.java | 50 +-
api/maven-api-meta/pom.xml | 2 +-
.../org/apache/maven/api/annotations/Consumer.java | 13 +-
.../apache/maven/api/annotations/Experimental.java | 11 +-
.../apache/maven/api/annotations/Generated.java | 13 +-
.../apache/maven/api/annotations/Immutable.java | 13 +-
.../org/apache/maven/api/annotations/Nonnull.java | 13 +-
.../maven/api/annotations/NotThreadSafe.java | 13 +-
.../org/apache/maven/api/annotations/Nullable.java | 11 +-
.../org/apache/maven/api/annotations/Provider.java | 13 +-
.../apache/maven/api/annotations/ThreadSafe.java | 13 +-
.../apache/maven/api/annotations/package-info.java | 20 -
api/maven-api-model/pom.xml | 2 -
.../maven/api/model/ImmutableCollections.java | 488 ++--
.../org/apache/maven/api/model/InputLocation.java | 134 +-
.../maven/api/model/InputLocationTracker.java | 9 +-
.../org/apache/maven/api/model/InputSource.java | 19 +-
.../org/apache/maven/api/model/package-info.java | 19 -
api/maven-api-settings/pom.xml | 2 -
.../maven/api/settings/ImmutableCollections.java | 488 ++--
api/maven-api-toolchain/pom.xml | 150 +-
.../maven/api/toolchain/ImmutableCollections.java | 488 ++--
api/maven-api-xml/pom.xml | 2 +-
.../main/java/org/apache/maven/api/xml/Dom.java | 38 +-
api/modello-plugin-velocity/pom.xml | 6 +-
.../codehaus/modello/plugin/velocity/Helper.java | 113 +-
.../plugin/velocity/ModelloVelocityMojo.java | 43 +-
.../modello/plugin/velocity/VelocityGenerator.java | 127 +-
api/pom.xml | 4 +-
maven-artifact/pom.xml | 2 -
.../java/org/apache/maven/artifact/Artifact.java | 61 +-
.../org/apache/maven/artifact/ArtifactUtils.java | 184 +-
.../org/apache/maven/artifact/DefaultArtifact.java | 453 ++--
.../maven/artifact/InvalidArtifactRTException.java | 49 +-
.../maven/artifact/handler/ArtifactHandler.java | 8 +-
.../maven/artifact/metadata/ArtifactMetadata.java | 11 +-
.../artifact/repository/ArtifactRepository.java | 40 +-
.../repository/ArtifactRepositoryPolicy.java | 161 +-
.../maven/artifact/repository/Authentication.java | 34 +-
.../layout/ArtifactRepositoryLayout.java | 14 +-
.../layout/ArtifactRepositoryLayout2.java | 13 +-
.../metadata/RepositoryMetadataStoreException.java | 20 +-
.../AbstractArtifactResolutionException.java | 384 ++--
.../resolver/ArtifactNotFoundException.java | 116 +-
.../resolver/ArtifactResolutionException.java | 64 +-
.../resolver/CyclicDependencyException.java | 18 +-
.../MultipleArtifactsNotFoundException.java | 85 +-
.../artifact/resolver/filter/ArtifactFilter.java | 10 +-
.../maven/artifact/versioning/ArtifactVersion.java | 11 +-
.../artifact/versioning/ComparableVersion.java | 526 ++---
.../versioning/DefaultArtifactVersion.java | 176 +-
.../InvalidVersionSpecificationException.java | 14 +-
.../OverConstrainedVersionException.java | 24 +-
.../maven/artifact/versioning/Restriction.java | 121 +-
.../maven/artifact/versioning/VersionRange.java | 446 ++--
.../java/org/apache/maven/repository/Proxy.java | 54 +-
.../legacy/metadata/ArtifactMetadata.java | 17 +-
.../apache/maven/artifact/ArtifactUtilsTest.java | 71 +-
.../apache/maven/artifact/DefaultArtifactTest.java | 141 +-
.../artifact/handler/ArtifactHandlerMock.java | 53 +-
.../artifact/versioning/ComparableVersionIT.java | 65 +-
.../artifact/versioning/ComparableVersionTest.java | 354 ++-
.../versioning/DefaultArtifactVersionTest.java | 288 ++-
.../artifact/versioning/VersionRangeTest.java | 1289 ++++++-----
maven-builder-support/pom.xml | 2 -
.../org/apache/maven/building/DefaultProblem.java | 97 +-
.../maven/building/DefaultProblemCollector.java | 26 +-
.../java/org/apache/maven/building/FileSource.java | 46 +-
.../java/org/apache/maven/building/Problem.java | 12 +-
.../apache/maven/building/ProblemCollector.java | 11 +-
.../maven/building/ProblemCollectorFactory.java | 12 +-
.../java/org/apache/maven/building/Source.java | 10 +-
.../org/apache/maven/building/StringSource.java | 51 +-
.../java/org/apache/maven/building/UrlSource.java | 44 +-
.../building/DefaultProblemCollectorTest.java | 68 +-
.../apache/maven/building/DefaultProblemTest.java | 133 +-
.../org/apache/maven/building/FileSourceTest.java | 56 +-
.../building/ProblemCollectorFactoryTest.java | 29 +-
.../apache/maven/building/StringSourceTest.java | 47 +-
.../org/apache/maven/building/UrlSourceTest.java | 48 +-
maven-compat/pom.xml | 2 -
.../apache/maven/artifact/ArtifactScopeEnum.java | 82 +-
.../org/apache/maven/artifact/ArtifactStatus.java | 56 +-
.../artifact/UnknownRepositoryLayoutException.java | 23 +-
.../maven/artifact/deployer/ArtifactDeployer.java | 25 +-
.../deployer/ArtifactDeploymentException.java | 25 +-
.../artifact/deployer/DefaultArtifactDeployer.java | 120 +-
.../installer/ArtifactInstallationException.java | 25 +-
.../artifact/installer/ArtifactInstaller.java | 17 +-
.../installer/DefaultArtifactInstaller.java | 89 +-
.../artifact/manager/DefaultWagonManager.java | 112 +-
.../manager/WagonConfigurationException.java | 17 +-
.../maven/artifact/manager/WagonManager.java | 25 +-
.../repository/ArtifactRepositoryFactory.java | 53 +-
.../repository/DefaultArtifactRepository.java | 172 +-
.../DefaultArtifactRepositoryFactory.java | 98 +-
.../repository/layout/FlatRepositoryLayout.java | 53 +-
.../metadata/DefaultRepositoryMetadataManager.java | 546 ++---
.../metadata/GroupRepositoryMetadata.java | 73 +-
.../repository/metadata/MetadataBridge.java | 104 +-
.../repository/metadata/MetadataUtils.java | 13 +-
.../metadata/RepositoryMetadataReadException.java | 20 +-
.../SnapshotArtifactRepositoryMetadata.java | 52 +-
.../maven/artifact/resolver/ArtifactCollector.java | 25 +-
.../maven/artifact/resolver/ArtifactResolver.java | 107 +-
.../artifact/resolver/DebugResolutionListener.java | 116 +-
.../resolver/DefaultArtifactCollector.java | 14 +-
.../artifact/resolver/DefaultArtifactResolver.java | 640 +++---
.../resolver/ResolutionListenerForDepMgmt.java | 17 +-
.../artifact/resolver/UnresolvedArtifacts.java | 24 +-
.../resolver/WarningResolutionListener.java | 62 +-
.../resolver/filter/InversionArtifactFilter.java | 32 +-
.../artifact/resolver/filter/OrArtifactFilter.java | 45 +-
.../resolver/filter/TypeArtifactFilter.java | 32 +-
.../artifact/versioning/ManagedVersionMap.java | 33 +-
.../maven/execution/DefaultRuntimeInformation.java | 26 +-
.../apache/maven/execution/RuntimeInformation.java | 8 +-
.../profiles/DefaultMavenProfilesBuilder.java | 64 +-
.../maven/profiles/DefaultProfileManager.java | 183 +-
.../maven/profiles/MavenProfilesBuilder.java | 14 +-
.../org/apache/maven/profiles/ProfileManager.java | 29 +-
.../maven/profiles/ProfilesConversionUtils.java | 112 +-
.../activation/DetectedProfileActivator.java | 17 +-
.../profiles/activation/FileProfileActivator.java | 69 +-
.../activation/JdkPrefixProfileActivator.java | 68 +-
.../OperatingSystemProfileActivator.java | 109 +-
.../activation/ProfileActivationException.java | 20 +-
.../profiles/activation/ProfileActivator.java | 14 +-
.../activation/SystemPropertyProfileActivator.java | 70 +-
.../maven/project/DefaultMavenProjectBuilder.java | 291 ++-
.../DefaultProjectBuilderConfiguration.java | 48 +-
.../project/InvalidProjectModelException.java | 38 +-
.../apache/maven/project/MavenProjectBuilder.java | 63 +-
.../project/MissingRepositoryElementException.java | 21 +-
.../java/org/apache/maven/project/ModelUtils.java | 27 +-
.../maven/project/ProjectBuilderConfiguration.java | 20 +-
.../org/apache/maven/project/ProjectUtils.java | 83 +-
.../DefaultModelInheritanceAssembler.java | 25 +-
.../inheritance/ModelInheritanceAssembler.java | 16 +-
.../AbstractStringBasedModelInterpolator.java | 350 ++-
.../interpolation/BuildTimestampValueSource.java | 27 +-
.../interpolation/ModelInterpolationException.java | 38 +-
.../project/interpolation/ModelInterpolator.java | 35 +-
.../PathTranslatingPostProcessor.java | 34 +-
.../interpolation/RegexBasedModelInterpolator.java | 29 +-
.../StringSearchModelInterpolator.java | 402 ++--
.../maven/project/path/DefaultPathTranslator.java | 185 +-
.../project/validation/DefaultModelValidator.java | 35 +-
.../project/validation/ModelValidationResult.java | 70 +-
.../maven/project/validation/ModelValidator.java | 11 +-
.../maven/reporting/MavenReportException.java | 18 +-
.../maven/repository/DefaultMirrorSelector.java | 139 +-
.../maven/repository/MavenArtifactMetadata.java | 56 +-
.../org/apache/maven/repository/MetadataGraph.java | 38 +-
.../apache/maven/repository/MetadataGraphNode.java | 52 +-
.../repository/MetadataResolutionRequest.java | 106 +-
.../maven/repository/MetadataResolutionResult.java | 209 +-
.../apache/maven/repository/MirrorSelector.java | 10 +-
.../repository/UserLocalArtifactRepository.java | 36 +-
.../maven/repository/VersionNotFoundException.java | 38 +-
.../repository/legacy/ChecksumFailedException.java | 20 +-
.../legacy/DefaultUpdateCheckManager.java | 366 ++-
.../repository/legacy/DefaultWagonManager.java | 826 +++----
.../repository/legacy/LegacyRepositorySystem.java | 813 +++----
.../maven/repository/legacy/MavenArtifact.java | 49 +-
.../repository/legacy/TransferListenerAdapter.java | 151 +-
.../repository/legacy/UpdateCheckManager.java | 20 +-
.../legacy/WagonConfigurationException.java | 29 +-
.../maven/repository/legacy/WagonManager.java | 65 +-
.../repository/ArtifactRepositoryFactory.java | 51 +-
.../DefaultArtifactRepositoryFactory.java | 121 +-
.../resolver/DefaultLegacyArtifactCollector.java | 773 +++----
.../legacy/resolver/LegacyArtifactCollector.java | 55 +-
.../legacy/resolver/conflict/ConflictResolver.java | 10 +-
.../resolver/conflict/ConflictResolverFactory.java | 11 +-
.../ConflictResolverNotFoundException.java | 14 +-
.../resolver/conflict/DefaultConflictResolver.java | 12 +-
.../conflict/DefaultConflictResolverFactory.java | 36 +-
.../conflict/FarthestConflictResolver.java | 20 +-
.../resolver/conflict/NearestConflictResolver.java | 20 +-
.../resolver/conflict/NewestConflictResolver.java | 29 +-
.../resolver/conflict/OldestConflictResolver.java | 29 +-
.../transform/AbstractVersionTransformation.java | 88 +-
.../resolver/transform/ArtifactTransformation.java | 33 +-
.../transform/ArtifactTransformationManager.java | 29 +-
.../DefaultArtifactTransformationManager.java | 63 +-
.../transform/LatestArtifactTransformation.java | 50 +-
.../transform/ReleaseArtifactTransformation.java | 70 +-
.../resolver/transform/SnapshotTransformation.java | 135 +-
.../repository/metadata/ArtifactMetadata.java | 265 ++-
.../repository/metadata/ClasspathContainer.java | 89 +-
.../metadata/ClasspathTransformation.java | 12 +-
.../metadata/DefaultClasspathTransformation.java | 158 +-
.../DefaultGraphConflictResolutionPolicy.java | 36 +-
.../metadata/DefaultGraphConflictResolver.java | 197 +-
.../metadata/GraphConflictResolutionException.java | 29 +-
.../metadata/GraphConflictResolutionPolicy.java | 11 +-
.../repository/metadata/GraphConflictResolver.java | 12 +-
.../maven/repository/metadata/MetadataGraph.java | 426 ++--
.../repository/metadata/MetadataGraphEdge.java | 128 +-
.../MetadataGraphTransformationException.java | 29 +-
.../repository/metadata/MetadataGraphVertex.java | 150 +-
.../repository/metadata/MetadataResolution.java | 41 +-
.../metadata/MetadataResolutionException.java | 28 +-
.../metadata/MetadataResolutionRequest.java | 46 +-
.../MetadataResolutionRequestTypeEnum.java | 29 +-
.../metadata/MetadataResolutionResult.java | 141 +-
.../metadata/MetadataRetrievalException.java | 34 +-
.../maven/repository/metadata/MetadataSource.java | 17 +-
.../repository/metadata/MetadataTreeNode.java | 95 +-
.../plugin/ExpressionDocumentationException.java | 20 +-
.../usability/plugin/ExpressionDocumenter.java | 104 +-
.../AbstractArtifactComponentTestCase.java | 271 +--
.../artifact/deployer/ArtifactDeployerTest.java | 55 +-
.../deployer/SimpleArtifactMetadataSource.java | 45 +-
.../factory/DefaultArtifactFactoryTest.java | 56 +-
.../artifact/installer/ArtifactInstallerTest.java | 45 +-
.../artifact/metadata/TestMetadataSource.java | 89 +-
.../repository/MavenArtifactRepositoryTest.java | 41 +-
.../resolver/ArtifactResolutionExceptionTest.java | 29 +-
.../artifact/resolver/ArtifactResolverTest.java | 236 +-
.../resolver/DefaultArtifactResolverTest.java | 65 +-
.../maven/artifact/resolver/TestFileWagon.java | 64 +-
.../artifact/resolver/TestTransferListener.java | 19 +-
.../resolver/filter/AndArtifactFilterTest.java | 32 +-
.../resolver/filter/FilterHashEqualsTest.java | 32 +-
.../resolver/filter/OrArtifactFilterTest.java | 32 +-
.../resolver/filter/ScopeArtifactFilterTest.java | 103 +-
.../maven/artifact/testutils/TestFileManager.java | 157 +-
.../transform/TransformationManagerTest.java | 58 +-
.../manager/DefaultProfileManagerTest.java | 148 +-
.../project/AbstractMavenProjectTestCase.java | 139 +-
.../maven/project/ClasspathArtifactResolver.java | 66 +-
.../maven/project/EmptyLifecycleExecutor.java | 68 +-
.../project/EmptyLifecyclePluginAnalyzer.java | 47 +-
.../project/LegacyLocalRepositoryManager.java | 138 +-
.../apache/maven/project/ProjectClasspathTest.java | 155 +-
.../apache/maven/project/TestArtifactResolver.java | 40 +-
.../maven/project/TestMavenRepositorySystem.java | 38 +-
.../apache/maven/project/TestProjectBuilder.java | 77 +-
.../AbstractProjectInheritanceTestCase.java | 34 +-
.../inheritance/t00/ProjectInheritanceTest.java | 33 +-
.../inheritance/t01/ProjectInheritanceTest.java | 37 +-
.../inheritance/t02/ProjectInheritanceTest.java | 88 +-
.../inheritance/t03/ProjectInheritanceTest.java | 28 +-
.../inheritance/t04/ProjectInheritanceTest.java | 55 +-
.../inheritance/t05/ProjectInheritanceTest.java | 49 +-
.../inheritance/t06/ProjectInheritanceTest.java | 50 +-
.../inheritance/t07/ProjectInheritanceTest.java | 54 +-
.../inheritance/t08/ProjectInheritanceTest.java | 51 +-
.../inheritance/t09/ProjectInheritanceTest.java | 77 +-
.../inheritance/t10/ProjectInheritanceTest.java | 51 +-
.../inheritance/t11/ProjectInheritanceTest.java | 35 +-
.../inheritance/t12/ProjectInheritanceTest.java | 39 +-
.../inheritance/t12scm/ProjectInheritanceTest.java | 130 +-
.../project/path/DefaultPathTranslatorTest.java | 42 +-
.../repository/DefaultMirrorSelectorTest.java | 19 +-
.../repository/LegacyRepositorySystemTest.java | 193 +-
.../maven/repository/MirrorProcessorTest.java | 267 ++-
.../legacy/DefaultUpdateCheckManagerTest.java | 200 +-
.../repository/legacy/DefaultWagonManagerTest.java | 321 ++-
.../legacy/LegacyRepositorySystemTest.java | 70 +-
.../maven/repository/legacy/PerLookupWagon.java | 17 +-
.../maven/repository/legacy/StringWagon.java | 68 +-
.../org/apache/maven/repository/legacy/WagonA.java | 16 +-
.../org/apache/maven/repository/legacy/WagonB.java | 16 +-
.../org/apache/maven/repository/legacy/WagonC.java | 16 +-
.../apache/maven/repository/legacy/WagonMock.java | 16 +-
.../resolver/DefaultArtifactCollectorTest.java | 1109 +++++----
.../conflict/AbstractConflictResolverTest.java | 86 +-
.../conflict/FarthestConflictResolverTest.java | 53 +-
.../conflict/NearestConflictResolverTest.java | 53 +-
.../conflict/NewestConflictResolverTest.java | 53 +-
.../conflict/OldestConflictResolverTest.java | 54 +-
.../DefaultClasspathTransformationTest.java | 124 +-
.../DefaultGraphConflictResolutionPolicyTest.java | 72 +-
.../metadata/DefaultGraphConflictResolverTest.java | 249 ++-
.../repository/metadata/TestMetadataSource.java | 79 +-
maven-core/pom.xml | 8 +-
.../maven/AbstractMavenLifecycleParticipant.java | 20 +-
.../org/apache/maven/ArtifactFilterManager.java | 12 +-
.../maven/ArtifactFilterManagerDelegate.java | 13 +-
.../src/main/java/org/apache/maven/BuildAbort.java | 18 +-
.../org/apache/maven/BuildFailureException.java | 19 +-
.../apache/maven/DefaultArtifactFilterManager.java | 58 +-
.../main/java/org/apache/maven/DefaultMaven.java | 646 +++---
.../maven/DefaultProjectDependenciesResolver.java | 172 +-
.../apache/maven/DuplicateProjectException.java | 18 +-
.../org/apache/maven/InternalErrorException.java | 13 +-
.../src/main/java/org/apache/maven/Maven.java | 14 +-
.../org/apache/maven/MavenExecutionException.java | 28 +-
.../org/apache/maven/MissingModuleException.java | 21 +-
.../org/apache/maven/MissingProfilesException.java | 14 +-
.../apache/maven/ProjectBuildFailureException.java | 20 +-
.../org/apache/maven/ProjectCycleException.java | 19 +-
.../apache/maven/ProjectDependenciesResolver.java | 36 +-
.../main/java/org/apache/maven/ReactorReader.java | 281 +--
.../java/org/apache/maven/RepositoryUtils.java | 388 ++--
.../main/java/org/apache/maven/SessionScoped.java | 14 +-
.../DependencyResolutionRequiredException.java | 14 +-
.../maven/artifact/InvalidRepositoryException.java | 33 +-
.../maven/artifact/factory/ArtifactFactory.java | 63 +-
.../artifact/factory/DefaultArtifactFactory.java | 187 +-
.../artifact/handler/DefaultArtifactHandler.java | 109 +-
.../handler/manager/ArtifactHandlerManager.java | 13 +-
.../manager/DefaultArtifactHandlerManager.java | 44 +-
.../providers/EarArtifactHandlerProvider.java | 29 +-
.../providers/EjbArtifactHandlerProvider.java | 29 +-
.../EjbClientArtifactHandlerProvider.java | 30 +-
.../providers/JarArtifactHandlerProvider.java | 29 +-
.../JavaSourceArtifactHandlerProvider.java | 30 +-
.../providers/JavadocArtifactHandlerProvider.java | 29 +-
.../MavenPluginArtifactHandlerProvider.java | 29 +-
.../providers/PomArtifactHandlerProvider.java | 29 +-
.../providers/RarArtifactHandlerProvider.java | 29 +-
.../providers/TestJarArtifactHandlerProvider.java | 29 +-
.../providers/WarArtifactHandlerProvider.java | 29 +-
.../metadata/AbstractArtifactMetadata.java | 15 +-
.../ArtifactMetadataRetrievalException.java | 29 +-
.../artifact/metadata/ArtifactMetadataSource.java | 38 +-
.../maven/artifact/metadata/ResolutionGroup.java | 29 +-
.../repository/DefaultRepositoryRequest.java | 64 +-
.../repository/LegacyLocalRepositoryManager.java | 302 +--
.../repository/MavenArtifactRepository.java | 281 +--
.../maven/artifact/repository/RepositoryCache.java | 11 +-
.../artifact/repository/RepositoryRequest.java | 15 +-
.../repository/layout/DefaultRepositoryLayout.java | 78 +-
.../metadata/AbstractRepositoryMetadata.java | 174 +-
.../metadata/ArtifactRepositoryMetadata.java | 68 +-
.../repository/metadata/RepositoryMetadata.java | 16 +-
.../RepositoryMetadataDeploymentException.java | 20 +-
.../RepositoryMetadataInstallationException.java | 20 +-
.../metadata/RepositoryMetadataManager.java | 36 +-
.../RepositoryMetadataResolutionException.java | 20 +-
.../metadata/io/DefaultMetadataReader.java | 59 +-
.../metadata/io/MetadataParseException.java | 26 +-
.../repository/metadata/io/MetadataReader.java | 17 +-
.../resolver/ArtifactResolutionRequest.java | 151 +-
.../resolver/ArtifactResolutionResult.java | 215 +-
.../resolver/DefaultResolutionErrorHandler.java | 59 +-
.../artifact/resolver/ResolutionErrorHandler.java | 11 +-
.../artifact/resolver/ResolutionListener.java | 40 +-
.../maven/artifact/resolver/ResolutionNode.java | 156 +-
.../filter/AbstractScopeArtifactFilter.java | 58 +-
.../resolver/filter/AndArtifactFilter.java | 51 +-
.../filter/CumulativeScopeArtifactFilter.java | 61 +-
.../resolver/filter/ExcludesArtifactFilter.java | 20 +-
.../resolver/filter/ExclusionArtifactFilter.java | 42 +-
.../resolver/filter/ExclusionSetFilter.java | 41 +-
.../resolver/filter/IncludesArtifactFilter.java | 43 +-
.../resolver/filter/ScopeArtifactFilter.java | 34 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 803 +++----
.../classrealm/ArtifactClassRealmConstituent.java | 33 +-
.../maven/classrealm/ClassRealmConstituent.java | 7 +-
.../apache/maven/classrealm/ClassRealmManager.java | 20 +-
.../classrealm/ClassRealmManagerDelegate.java | 10 +-
.../apache/maven/classrealm/ClassRealmRequest.java | 10 +-
.../maven/classrealm/DefaultClassRealmManager.java | 323 ++-
.../maven/classrealm/DefaultClassRealmRequest.java | 35 +-
.../BasedirBeanConfigurationPathTranslator.java | 30 +-
.../configuration/BeanConfigurationException.java | 18 +-
.../BeanConfigurationPathTranslator.java | 9 +-
.../configuration/BeanConfigurationRequest.java | 19 +-
.../BeanConfigurationValuePreprocessor.java | 10 +-
.../maven/configuration/BeanConfigurator.java | 10 +-
.../DefaultBeanConfigurationRequest.java | 101 +-
.../internal/DefaultBeanConfigurator.java | 137 +-
.../internal/EnhancedComponentConfigurator.java | 45 +-
.../internal/EnhancedConfigurationConverter.java | 114 +-
.../internal/EnhancedConverterLookup.java | 26 +-
.../apache/maven/eventspy/AbstractEventSpy.java | 23 +-
.../java/org/apache/maven/eventspy/EventSpy.java | 20 +-
.../eventspy/internal/EventSpyDispatcher.java | 104 +-
.../internal/EventSpyExecutionListener.java | 130 +-
.../internal/EventSpyRepositoryListener.java | 144 +-
.../maven/exception/DefaultExceptionHandler.java | 223 +-
.../apache/maven/exception/ExceptionHandler.java | 10 +-
.../apache/maven/exception/ExceptionSummary.java | 38 +-
.../maven/execution/AbstractExecutionListener.java | 59 +-
.../apache/maven/execution/ActivationSettings.java | 29 +-
.../org/apache/maven/execution/BuildFailure.java | 16 +-
.../maven/execution/BuildResumptionAnalyzer.java | 8 +-
.../maven/execution/BuildResumptionData.java | 13 +-
.../execution/BuildResumptionDataRepository.java | 13 +-
.../BuildResumptionPersistenceException.java | 11 +-
.../org/apache/maven/execution/BuildSuccess.java | 13 +-
.../org/apache/maven/execution/BuildSummary.java | 19 +-
.../execution/DefaultBuildResumptionAnalyzer.java | 48 +-
.../DefaultBuildResumptionDataRepository.java | 115 +-
.../execution/DefaultMavenExecutionRequest.java | 713 +++---
.../DefaultMavenExecutionRequestPopulator.java | 223 +-
.../execution/DefaultMavenExecutionResult.java | 63 +-
.../org/apache/maven/execution/ExecutionEvent.java | 10 +-
.../apache/maven/execution/ExecutionListener.java | 41 +-
.../maven/execution/MavenExecutionRequest.java | 135 +-
.../MavenExecutionRequestPopulationException.java | 25 +-
.../execution/MavenExecutionRequestPopulator.java | 20 +-
.../maven/execution/MavenExecutionResult.java | 25 +-
.../org/apache/maven/execution/MavenSession.java | 318 ++-
.../apache/maven/execution/MojoExecutionEvent.java | 31 +-
.../maven/execution/MojoExecutionListener.java | 14 +-
.../apache/maven/execution/ProfileActivation.java | 92 +-
.../apache/maven/execution/ProjectActivation.java | 109 +-
.../maven/execution/ProjectDependencyGraph.java | 12 +-
.../maven/execution/ProjectExecutionEvent.java | 40 +-
.../maven/execution/ProjectExecutionListener.java | 17 +-
.../org/apache/maven/execution/ReactorManager.java | 134 +-
.../maven/execution/scope/MojoExecutionScoped.java | 14 +-
.../execution/scope/WeakMojoExecutionListener.java | 14 +-
.../scope/internal/MojoExecutionScope.java | 133 +-
.../internal/MojoExecutionScopeCoreModule.java | 21 +-
.../scope/internal/MojoExecutionScopeModule.java | 45 +-
.../maven/extension/internal/CoreExports.java | 35 +-
.../extension/internal/CoreExportsProvider.java | 21 +-
.../extension/internal/CoreExtensionEntry.java | 82 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 348 ++-
.../maven/graph/DefaultProjectDependencyGraph.java | 97 +-
.../graph/FilteredProjectDependencyGraph.java | 60 +-
.../java/org/apache/maven/graph/GraphBuilder.java | 10 +-
.../org/apache/maven/graph/ProjectSelector.java | 126 +-
.../maven/internal/MultilineMessageHelper.java | 73 +-
.../aether/ConsumerModelSourceTransformer.java | 24 +-
.../DefaultRepositorySystemSessionFactory.java | 292 ++-
.../internal/aether/LoggingRepositoryListener.java | 121 +-
.../aether/MavenChainedWorkspaceReader.java | 53 +-
.../apache/maven/internal/impl/AbstractNode.java | 46 +-
.../maven/internal/impl/AbstractSession.java | 387 ++--
.../maven/internal/impl/DefaultArtifact.java | 76 +-
.../internal/impl/DefaultArtifactCoordinate.java | 67 +-
.../impl/DefaultArtifactCoordinateFactory.java | 51 +-
.../internal/impl/DefaultArtifactDeployer.java | 57 +-
.../internal/impl/DefaultArtifactFactory.java | 52 +-
.../internal/impl/DefaultArtifactInstaller.java | 46 +-
.../internal/impl/DefaultArtifactManager.java | 86 +-
.../internal/impl/DefaultArtifactResolver.java | 71 +-
.../maven/internal/impl/DefaultDependency.java | 96 +-
.../internal/impl/DefaultDependencyCollector.java | 82 +-
.../internal/impl/DefaultDependencyCoordinate.java | 77 +-
.../impl/DefaultDependencyCoordinateFactory.java | 44 +-
.../apache/maven/internal/impl/DefaultEvent.java | 33 +-
.../internal/impl/DefaultLocalRepository.java | 34 +-
.../impl/DefaultLocalRepositoryManager.java | 43 +-
.../org/apache/maven/internal/impl/DefaultLog.java | 158 +-
.../apache/maven/internal/impl/DefaultLookup.java | 73 +-
.../maven/internal/impl/DefaultMessageBuilder.java | 77 +-
.../impl/DefaultMessageBuilderFactory.java | 29 +-
.../internal/impl/DefaultModelXmlFactory.java | 114 +-
.../maven/internal/impl/DefaultMojoExecution.java | 33 +-
.../apache/maven/internal/impl/DefaultNode.java | 132 +-
.../apache/maven/internal/impl/DefaultProject.java | 147 +-
.../maven/internal/impl/DefaultProjectBuilder.java | 213 +-
.../maven/internal/impl/DefaultProjectManager.java | 132 +-
.../maven/internal/impl/DefaultPrompter.java | 77 +-
.../internal/impl/DefaultRemoteRepository.java | 29 +-
.../internal/impl/DefaultRepositoryFactory.java | 58 +-
.../apache/maven/internal/impl/DefaultSession.java | 255 +--
.../maven/internal/impl/DefaultSessionFactory.java | 32 +-
.../internal/impl/DefaultSettingsBuilder.java | 120 +-
.../internal/impl/DefaultSettingsXmlFactory.java | 86 +-
.../internal/impl/DefaultToolchainManager.java | 94 +-
.../internal/impl/DefaultToolchainsBuilder.java | 127 +-
.../internal/impl/DefaultToolchainsXmlFactory.java | 87 +-
.../maven/internal/impl/DefaultTypeRegistry.java | 42 +-
.../maven/internal/impl/DefaultVersionParser.java | 117 +-
.../apache/maven/internal/impl/EventSpyImpl.java | 42 +-
.../maven/internal/impl/MappedCollection.java | 28 +-
.../org/apache/maven/internal/impl/MappedList.java | 19 +-
.../maven/internal/impl/PropertiesAsMap.java | 68 +-
.../java/org/apache/maven/internal/impl/Utils.java | 33 +-
.../apache/maven/internal/impl/WrapperNode.java | 34 +-
.../maven/lifecycle/DefaultLifecycleExecutor.java | 83 +-
.../apache/maven/lifecycle/DefaultLifecycles.java | 104 +-
.../maven/lifecycle/LifeCyclePluginAnalyzer.java | 10 +-
.../java/org/apache/maven/lifecycle/Lifecycle.java | 34 +-
.../lifecycle/LifecycleExecutionException.java | 87 +-
.../apache/maven/lifecycle/LifecycleExecutor.java | 49 +-
.../maven/lifecycle/LifecycleMappingDelegate.java | 17 +-
.../lifecycle/LifecycleNotFoundException.java | 18 +-
.../lifecycle/LifecyclePhaseNotFoundException.java | 18 +-
.../apache/maven/lifecycle/MavenExecutionPlan.java | 124 +-
.../maven/lifecycle/MissingProjectException.java | 13 +-
.../maven/lifecycle/MojoExecutionConfigurator.java | 8 +-
.../maven/lifecycle/NoGoalSpecifiedException.java | 13 +-
.../lifecycle/internal/BuildListCalculator.java | 47 +-
.../lifecycle/internal/BuildThreadFactory.java | 12 +-
.../internal/CompoundProjectExecutionListener.java | 48 +-
.../lifecycle/internal/DefaultExecutionEvent.java | 26 +-
.../internal/DefaultExecutionEventCatapult.java | 63 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 555 ++---
.../internal/DefaultLifecycleMappingDelegate.java | 104 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 212 +-
.../DefaultLifecycleTaskSegmentCalculator.java | 95 +-
.../internal/DefaultMojoExecutionConfigurator.java | 160 +-
.../internal/DefaultProjectArtifactFactory.java | 24 +-
.../lifecycle/internal/DependencyContext.java | 57 +-
.../lifecycle/internal/ExecutionEventCatapult.java | 11 +-
.../lifecycle/internal/ExecutionPlanItem.java | 44 +-
.../apache/maven/lifecycle/internal/GoalTask.java | 14 +-
.../lifecycle/internal/LifecycleDebugLogger.java | 125 +-
.../internal/LifecycleDependencyResolver.java | 354 ++-
.../internal/LifecycleExecutionPlanCalculator.java | 53 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 89 +-
.../internal/LifecyclePluginResolver.java | 57 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 99 +-
.../maven/lifecycle/internal/LifecycleTask.java | 17 +-
.../internal/LifecycleTaskSegmentCalculator.java | 30 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 192 +-
.../maven/lifecycle/internal/MojoExecutor.java | 454 ++--
.../maven/lifecycle/internal/PhaseRecorder.java | 42 +-
.../lifecycle/internal/ProjectArtifactFactory.java | 12 +-
.../maven/lifecycle/internal/ProjectBuildList.java | 91 +-
.../maven/lifecycle/internal/ProjectIndex.java | 37 +-
.../maven/lifecycle/internal/ProjectSegment.java | 36 +-
.../lifecycle/internal/ReactorBuildStatus.java | 48 +-
.../maven/lifecycle/internal/ReactorContext.java | 29 +-
.../maven/lifecycle/internal/TaskSegment.java | 25 +-
.../maven/lifecycle/internal/builder/Builder.java | 19 +-
.../lifecycle/internal/builder/BuilderCommon.java | 179 +-
.../internal/builder/BuilderNotFoundException.java | 14 +-
.../multithreaded/ConcurrencyDependencyGraph.java | 84 +-
.../multithreaded/MultiThreadedBuilder.java | 194 +-
.../builder/multithreaded/ThreadOutputMuxer.java | 341 ++-
.../singlethreaded/SingleThreadedBuilder.java | 45 +-
.../lifecycle/mapping/DefaultLifecycleMapping.java | 88 +-
.../apache/maven/lifecycle/mapping/Lifecycle.java | 44 +-
.../maven/lifecycle/mapping/LifecycleMapping.java | 13 +-
.../maven/lifecycle/mapping/LifecycleMojo.java | 27 +-
.../maven/lifecycle/mapping/LifecyclePhase.java | 74 +-
.../providers/AbstractLifecycleProvider.java | 39 +-
.../providers/CleanLifecycleProvider.java | 22 +-
.../providers/DefaultLifecycleProvider.java | 23 +-
.../lifecycle/providers/SiteLifecycleProvider.java | 25 +-
.../providers/WrapperLifecycleProvider.java | 25 +-
.../AbstractLifecycleMappingProvider.java | 41 +-
.../packaging/EarLifecycleMappingProvider.java | 33 +-
.../packaging/EjbLifecycleMappingProvider.java | 41 +-
.../packaging/JarLifecycleMappingProvider.java | 41 +-
.../MavenPluginLifecycleMappingProvider.java | 47 +-
.../packaging/PomLifecycleMappingProvider.java | 25 +-
.../packaging/RarLifecycleMappingProvider.java | 41 +-
.../packaging/WarLifecycleMappingProvider.java | 41 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 158 +-
.../maven/monitor/event/EventDispatcher.java | 19 +-
.../apache/maven/monitor/event/EventMonitor.java | 17 +-
.../apache/maven/plugin/BuildPluginManager.java | 32 +-
.../java/org/apache/maven/plugin/CacheUtils.java | 110 +-
.../plugin/CompoundMojoExecutionListener.java | 40 +-
.../CycleDetectedInPluginGraphException.java | 17 +-
.../maven/plugin/DebugConfigurationListener.java | 60 +-
.../maven/plugin/DefaultBuildPluginManager.java | 226 +-
.../maven/plugin/DefaultExtensionRealmCache.java | 108 +-
.../plugin/DefaultMojosExecutionStrategy.java | 24 +-
.../maven/plugin/DefaultPluginArtifactsCache.java | 141 +-
.../maven/plugin/DefaultPluginDescriptorCache.java | 181 +-
.../maven/plugin/DefaultPluginRealmCache.java | 184 +-
.../apache/maven/plugin/ExtensionRealmCache.java | 36 +-
.../plugin/InvalidPluginDescriptorException.java | 25 +-
.../maven/plugin/InvalidPluginException.java | 25 +-
.../org/apache/maven/plugin/LegacySupport.java | 9 +-
.../apache/maven/plugin/MavenPluginManager.java | 46 +-
.../plugin/MavenPluginPrerequisitesChecker.java | 13 +-
.../org/apache/maven/plugin/MojoExecution.java | 121 +-
.../apache/maven/plugin/MojoExecutionRunner.java | 8 +-
.../maven/plugin/MojosExecutionStrategy.java | 12 +-
.../apache/maven/plugin/PluginArtifactsCache.java | 41 +-
.../maven/plugin/PluginConfigurationException.java | 40 +-
.../maven/plugin/PluginContainerException.java | 45 +-
.../apache/maven/plugin/PluginDescriptorCache.java | 22 +-
.../plugin/PluginDescriptorParsingException.java | 27 +-
.../maven/plugin/PluginExecutionException.java | 59 +-
.../maven/plugin/PluginIncompatibleException.java | 19 +-
.../apache/maven/plugin/PluginLoaderException.java | 78 +-
.../org/apache/maven/plugin/PluginManager.java | 56 +-
.../maven/plugin/PluginManagerException.java | 90 +-
.../maven/plugin/PluginNotFoundException.java | 44 +-
.../maven/plugin/PluginParameterException.java | 200 +-
.../plugin/PluginParameterExpressionEvaluator.java | 393 ++--
.../PluginParameterExpressionEvaluatorV4.java | 412 ++--
.../org/apache/maven/plugin/PluginRealmCache.java | 45 +-
.../maven/plugin/PluginResolutionException.java | 21 +-
.../AbstractMavenPluginParametersValidator.java | 108 +-
.../plugin/internal/DefaultLegacySupport.java | 38 +-
.../plugin/internal/DefaultMavenPluginManager.java | 915 ++++----
.../internal/DefaultMavenPluginValidator.java | 33 +-
.../DefaultPluginDependenciesResolver.java | 291 ++-
.../plugin/internal/DefaultPluginManager.java | 201 +-
.../plugin/internal/DeprecatedPluginValidator.java | 67 +-
.../MavenPluginConfigurationValidator.java | 15 +-
.../MavenPluginJavaPrerequisiteChecker.java | 27 +-
.../MavenPluginMavenPrerequisiteChecker.java | 46 +-
.../plugin/internal/MavenPluginValidator.java | 11 +-
.../maven/plugin/internal/MojoLogWrapper.java | 100 +-
.../internal/PluginDependenciesResolver.java | 22 +-
.../ReadOnlyPluginParametersValidator.java | 44 +-
.../internal/ValidatingConfigurationListener.java | 55 +-
.../plugin/prefix/DefaultPluginPrefixRequest.java | 77 +-
.../prefix/NoPluginFoundForPrefixException.java | 54 +-
.../maven/plugin/prefix/PluginPrefixRequest.java | 18 +-
.../maven/plugin/prefix/PluginPrefixResolver.java | 10 +-
.../maven/plugin/prefix/PluginPrefixResult.java | 9 +-
.../internal/DefaultPluginPrefixResolver.java | 239 +-
.../prefix/internal/DefaultPluginPrefixResult.java | 35 +-
.../version/DefaultPluginVersionRequest.java | 79 +-
.../version/PluginVersionNotFoundException.java | 21 +-
.../maven/plugin/version/PluginVersionRequest.java | 18 +-
.../version/PluginVersionResolutionException.java | 74 +-
.../plugin/version/PluginVersionResolver.java | 10 +-
.../maven/plugin/version/PluginVersionResult.java | 7 +-
.../internal/DefaultPluginVersionResolver.java | 393 ++--
.../internal/DefaultPluginVersionResult.java | 26 +-
.../DefaultDependencyResolutionRequest.java | 36 +-
.../project/DefaultDependencyResolutionResult.java | 63 +-
.../maven/project/DefaultMavenProjectHelper.java | 99 +-
.../project/DefaultModelBuildingListener.java | 97 +-
.../maven/project/DefaultProjectBuilder.java | 991 ++++-----
.../project/DefaultProjectBuildingHelper.java | 184 +-
.../project/DefaultProjectBuildingRequest.java | 219 +-
.../project/DefaultProjectBuildingResult.java | 45 +-
.../DefaultProjectDependenciesResolver.java | 299 +--
.../maven/project/DefaultProjectRealmCache.java | 86 +-
.../project/DependencyResolutionException.java | 16 +-
.../maven/project/DependencyResolutionRequest.java | 13 +-
.../maven/project/DependencyResolutionResult.java | 10 +-
.../DuplicateArtifactAttachmentException.java | 23 +-
.../maven/project/DuplicateProjectException.java | 35 +-
.../apache/maven/project/ExtensionDescriptor.java | 46 +-
.../maven/project/ExtensionDescriptorBuilder.java | 98 +-
.../project/InvalidProjectVersionException.java | 38 +-
.../org/apache/maven/project/MavenProject.java | 1308 +++++------
.../apache/maven/project/MavenProjectHelper.java | 20 +-
.../org/apache/maven/project/ProjectBuilder.java | 29 +-
.../maven/project/ProjectBuildingException.java | 63 +-
.../maven/project/ProjectBuildingHelper.java | 24 +-
.../maven/project/ProjectBuildingRequest.java | 47 +-
.../maven/project/ProjectBuildingResult.java | 8 +-
.../maven/project/ProjectDependenciesResolver.java | 10 +-
.../apache/maven/project/ProjectModelResolver.java | 286 +--
.../apache/maven/project/ProjectRealmCache.java | 32 +-
.../org/apache/maven/project/ProjectSorter.java | 269 +--
.../org/apache/maven/project/ReactorModelPool.java | 97 +-
.../maven/project/RepositorySessionDecorator.java | 8 +-
.../project/artifact/ActiveProjectArtifact.java | 251 +--
.../project/artifact/ArtifactWithDependencies.java | 10 +-
.../maven/project/artifact/AttachedArtifact.java | 153 +-
.../artifact/DefaultMavenMetadataCache.java | 287 ++-
.../project/artifact/DefaultMetadataSource.java | 18 +-
.../artifact/DefaultProjectArtifactsCache.java | 181 +-
.../InvalidDependencyVersionException.java | 25 +-
.../maven/project/artifact/MavenMetadataCache.java | 26 +-
.../project/artifact/MavenMetadataSource.java | 641 +++---
.../maven/project/artifact/PluginArtifact.java | 59 +-
.../maven/project/artifact/ProjectArtifact.java | 67 +-
.../project/artifact/ProjectArtifactMetadata.java | 78 +-
.../project/artifact/ProjectArtifactsCache.java | 43 +-
.../project/collector/DefaultProjectsSelector.java | 72 +-
.../collector/MultiModuleCollectionStrategy.java | 174 +-
.../collector/PomlessCollectionStrategy.java | 38 +-
.../collector/ProjectCollectionStrategy.java | 12 +-
.../maven/project/collector/ProjectsSelector.java | 14 +-
.../collector/RequestPomCollectionStrategy.java | 31 +-
.../apache/maven/project/path/PathTranslator.java | 17 +-
.../properties/internal/EnvironmentUtils.java | 30 +-
.../properties/internal/SystemProperties.java | 25 +-
.../repository/ArtifactDoesNotExistException.java | 17 +-
.../maven/repository/ArtifactTransferEvent.java | 166 +-
.../ArtifactTransferFailedException.java | 18 +-
.../maven/repository/ArtifactTransferListener.java | 19 +-
.../maven/repository/ArtifactTransferResource.java | 7 +-
.../DelegatingLocalArtifactRepository.java | 118 +-
.../maven/repository/LocalArtifactRepository.java | 9 +-
.../LocalRepositoryNotAccessibleException.java | 20 +-
.../apache/maven/repository/RepositorySystem.java | 90 +-
.../legacy/metadata/AbstractArtifactMetadata.java | 34 +-
.../ArtifactMetadataRetrievalException.java | 35 +-
.../legacy/metadata/ArtifactMetadataSource.java | 34 +-
.../metadata/DefaultMetadataResolutionRequest.java | 66 +-
.../legacy/metadata/MetadataResolutionRequest.java | 19 +-
.../legacy/metadata/ResolutionGroup.java | 41 +-
.../apache/maven/rtinfo/RuntimeInformation.java | 9 +-
.../rtinfo/internal/DefaultRuntimeInformation.java | 108 +-
.../maven/session/scope/internal/SessionScope.java | 103 +-
.../session/scope/internal/SessionScopeModule.java | 40 +-
.../settings/DefaultMavenSettingsBuilder.java | 109 +-
.../maven/settings/MavenSettingsBuilder.java | 25 +-
.../settings/SettingsConfigurationException.java | 37 +-
.../org/apache/maven/settings/SettingsUtils.java | 242 +-
.../apache/maven/toolchain/DefaultToolchain.java | 100 +-
.../maven/toolchain/DefaultToolchainManager.java | 114 +-
.../toolchain/DefaultToolchainManagerPrivate.java | 68 +-
.../maven/toolchain/DefaultToolchainsBuilder.java | 46 +-
.../toolchain/MisconfiguredToolchainException.java | 21 +-
.../apache/maven/toolchain/RequirementMatcher.java | 12 +-
.../maven/toolchain/RequirementMatcherFactory.java | 76 +-
.../java/org/apache/maven/toolchain/Toolchain.java | 12 +-
.../apache/maven/toolchain/ToolchainFactory.java | 14 +-
.../apache/maven/toolchain/ToolchainManager.java | 14 +-
.../maven/toolchain/ToolchainManagerPrivate.java | 14 +-
.../apache/maven/toolchain/ToolchainPrivate.java | 15 +-
.../apache/maven/toolchain/ToolchainsBuilder.java | 11 +-
.../maven/toolchain/java/DefaultJavaToolChain.java | 25 +-
.../apache/maven/toolchain/java/JavaToolchain.java | 75 +-
.../maven/toolchain/java/JavaToolchainFactory.java | 86 +-
.../maven/toolchain/java/JavaToolchainImpl.java | 52 +-
.../DefaultConsumerPomXMLFilterFactory.java | 13 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 285 +--
.../java/org/apache/maven/DefaultMavenTest.java | 90 +-
.../maven/MavenLifecycleParticipantTest.java | 172 +-
.../src/test/java/org/apache/maven/MavenTest.java | 66 +-
.../maven/ProjectDependenciesResolverTest.java | 87 +-
.../artifact/handler/ArtifactHandlerTest.java | 105 +-
.../filter/ExclusionArtifactFilterTest.java | 142 +-
.../DefaultBeanConfiguratorPathTest.java | 87 +-
.../configuration/DefaultBeanConfiguratorTest.java | 86 +-
.../exception/DefaultExceptionHandlerTest.java | 56 +-
.../DefaultBuildResumptionAnalyzerTest.java | 149 +-
.../DefaultBuildResumptionDataRepositoryTest.java | 78 +-
.../DefaultMavenExecutionRequestPopulatorTest.java | 38 +-
.../maven/execution/DefaultMavenExecutionTest.java | 32 +-
.../scope/internal/MojoExecutionScopeTest.java | 95 +-
.../maven/graph/DefaultGraphBuilderTest.java | 601 ++---
.../graph/DefaultProjectDependencyGraphTest.java | 183 +-
.../apache/maven/graph/ProjectSelectorTest.java | 215 +-
.../maven/internal/MultilineMessageHelperTest.java | 72 +-
.../aether/ConsumerModelSourceTransformerTest.java | 40 +-
.../maven/internal/impl/PropertiesAsMapTest.java | 48 +-
.../org/apache/maven/internal/impl/TestApi.java | 85 +-
.../maven/internal/impl/TestArtifactHandler.java | 37 +-
.../maven/internal/impl/TestRepositorySystem.java | 313 ++-
.../maven/lifecycle/DefaultLifecyclesTest.java | 138 +-
.../lifecycle/DelegatingMojoExecutionListener.java | 48 +-
.../DelegatingProjectExecutionListener.java | 56 +-
.../lifecycle/EmptyLifecyclePluginAnalyzer.java | 47 +-
.../lifecycle/LifecycleExecutorSubModulesTest.java | 65 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 733 +++---
.../maven/lifecycle/MavenExecutionPlanTest.java | 73 +-
.../lifecycle/MojoExecutionXPathContainer.java | 48 +-
.../internal/BuildListCalculatorTest.java | 68 +-
.../internal/ConcurrencyDependencyGraphTest.java | 110 +-
.../internal/LifecycleDependencyResolverTest.java | 61 +-
.../LifecycleExecutionPlanCalculatorTest.java | 97 +-
.../internal/LifecycleModuleBuilderTest.java | 94 +-
.../LifecycleTaskSegmentCalculatorImplTest.java | 40 +-
.../lifecycle/internal/PhaseRecorderTest.java | 55 +-
.../lifecycle/internal/ProjectBuildListTest.java | 52 +-
.../internal/builder/BuilderCommonTest.java | 116 +-
.../ConcurrencyDependencyGraphTest.java | 86 +-
.../multithreaded/ThreadOutputMuxerTest.java | 142 +-
.../internal/stub/BuildPluginManagerStub.java | 50 +-
.../internal/stub/CompletionServiceStub.java | 73 +-
.../internal/stub/DefaultLifecyclesStub.java | 90 +-
.../internal/stub/ExecutionEventCatapultStub.java | 18 +-
.../internal/stub/LifeCyclePluginAnalyzerStub.java | 75 +-
.../stub/LifecycleExecutionPlanCalculatorStub.java | 275 ++-
.../stub/LifecycleTaskSegmentCalculatorStub.java | 83 +-
.../lifecycle/internal/stub/MojoExecutorStub.java | 79 +-
.../internal/stub/PluginPrefixResolverStub.java | 46 +-
.../internal/stub/PluginVersionResolverStub.java | 43 +-
.../stub/ProjectDependenciesResolverStub.java | 102 +-
.../internal/stub/ProjectDependencyGraphStub.java | 198 +-
.../stub/ProjectDependencyGraphStubTest.java | 72 +-
.../lifecycle/mapping/LifecyclePhaseTest.java | 75 +-
.../org/apache/maven/plugin/PluginManagerTest.java | 223 +-
.../maven/plugin/PluginParameterExceptionTest.java | 192 +-
.../PluginParameterExpressionEvaluatorTest.java | 369 ++-
.../plugin/internal/DefaultLegacySupportTest.java | 20 +-
.../plugin/internal/MavenPluginValidatorTest.java | 110 +-
.../project/AbstractMavenProjectTestCase.java | 144 +-
.../project/DefaultMavenProjectBuilderTest.java | 415 ++--
.../maven/project/EmptyLifecycleExecutor.java | 68 +-
.../maven/project/EmptyProjectBuildingHelper.java | 35 +-
.../project/ExtensionDescriptorBuilderTest.java | 64 +-
.../project/LegacyLocalRepositoryManager.java | 138 +-
.../org/apache/maven/project/MavenProjectTest.java | 211 +-
.../apache/maven/project/PomConstructionTest.java | 2343 +++++++++-----------
.../apache/maven/project/ProjectBuilderTest.java | 398 ++--
.../ProjectBuildingResultWithLocationMatcher.java | 62 +-
...ectBuildingResultWithProblemMessageMatcher.java | 56 +-
.../maven/project/ProjectModelResolverTest.java | 214 +-
.../apache/maven/project/ProjectSorterTest.java | 348 ++-
.../apache/maven/project/TestMetadataSource.java | 38 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 55 +-
.../artifact/DefaultProjectArtifactsCacheTest.java | 57 +-
.../project/artifact/MavenMetadataSourceTest.java | 24 +-
.../canonical/CanonicalProjectBuilderTest.java | 58 +-
.../maven/project/harness/PomTestWrapper.java | 70 +-
.../project/harness/Xpp3DomAttributeIterator.java | 38 +-
.../project/harness/Xpp3DomAttributePointer.java | 48 +-
.../maven/project/harness/Xpp3DomNodeIterator.java | 83 +-
.../maven/project/harness/Xpp3DomNodePointer.java | 89 +-
.../project/harness/Xpp3DomPointerFactory.java | 40 +-
.../maven/repository/TestArtifactHandler.java | 37 +-
.../maven/repository/TestRepositoryConnector.java | 128 +-
.../repository/TestRepositoryConnectorFactory.java | 21 +-
.../maven/repository/TestRepositorySystem.java | 311 ++-
.../internal/DefaultRuntimeInformationTest.java | 44 +-
.../settings/PomConstructionWithSettingsTest.java | 98 +-
.../apache/maven/settings/SettingsUtilsTest.java | 156 +-
.../DefaultToolchainManagerPrivateTest.java | 104 +-
.../toolchain/DefaultToolchainManagerTest.java | 111 +-
.../maven/toolchain/DefaultToolchainTest.java | 129 +-
.../toolchain/RequirementMatcherFactoryTest.java | 50 +-
maven-embedder/pom.xml | 2 -
.../main/java/org/apache/maven/embedder/App.java | 15 -
.../java/org/apache/maven/embedder/AppTest.java | 15 -
.../main/java/org/apache/maven/cli/CLIManager.java | 258 ++-
.../org/apache/maven/cli/CLIReportingUtils.java | 167 +-
.../java/org/apache/maven/cli/CleanArgument.java | 80 +-
.../main/java/org/apache/maven/cli/CliRequest.java | 50 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 1672 ++++++--------
.../java/org/apache/maven/cli/ResolveFile.java | 28 +-
.../cli/configuration/ConfigurationProcessor.java | 9 +-
.../SettingsXmlConfigurationProcessor.java | 199 +-
.../maven/cli/event/DefaultEventSpyContext.java | 12 +-
.../maven/cli/event/ExecutionEventLogger.java | 460 ++--
.../internal/BootstrapCoreExtensionManager.java | 177 +-
.../cli/internal/ExtensionResolutionException.java | 22 +-
.../maven/cli/logging/BaseSlf4jConfiguration.java | 19 +-
.../maven/cli/logging/Slf4jConfiguration.java | 15 +-
.../cli/logging/Slf4jConfigurationFactory.java | 36 +-
.../org/apache/maven/cli/logging/Slf4jLogger.java | 89 +-
.../maven/cli/logging/Slf4jLoggerManager.java | 47 +-
.../maven/cli/logging/Slf4jStdoutLogger.java | 253 +--
.../cli/logging/impl/Log4j2Configuration.java | 18 +-
.../cli/logging/impl/LogbackConfiguration.java | 18 +-
.../cli/logging/impl/Slf4jSimpleConfiguration.java | 18 +-
.../impl/UnsupportedSlf4jBindingConfiguration.java | 32 +-
.../transfer/AbstractMavenTransferListener.java | 200 +-
.../transfer/BatchModeMavenTransferListener.java | 15 +-
.../cli/transfer/ConsoleMavenTransferListener.java | 127 +-
.../cli/transfer/QuietMavenTransferListener.java | 11 +-
.../cli/transfer/Slf4jMavenTransferListener.java | 68 +-
.../sisu/plexus/PlexusXmlBeanConverter.java | 359 ++-
.../src/main/java/org/slf4j/MavenSlf4jFriend.java | 9 +-
.../org/slf4j/impl/MavenSlf4jSimpleFriend.java | 14 +-
.../maven/cli/CLIManagerDocumentationTest.java | 93 +-
.../apache/maven/cli/CLIReportingUtilsTest.java | 31 +-
.../org/apache/maven/cli/CleanArgumentTest.java | 44 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 520 ++---
.../maven/cli/event/ExecutionEventLoggerTest.java | 300 ++-
.../maven/cli/transfer/FileSizeFormatTest.java | 342 ++-
maven-model-builder/pom.xml | 2 -
.../java/org/apache/maven/feature/Features.java | 33 +-
.../building/AbstractModelBuildingListener.java | 11 +-
.../building/AbstractModelSourceTransformer.java | 11 +-
.../maven/model/building/ArtifactModelSource.java | 44 +-
.../building/BuildModelSourceTransformer.java | 18 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 61 +-
.../maven/model/building/DefaultModelBuilder.java | 2065 ++++++++---------
.../model/building/DefaultModelBuilderFactory.java | 187 +-
.../model/building/DefaultModelBuildingEvent.java | 20 +-
.../building/DefaultModelBuildingRequest.java | 239 +-
.../model/building/DefaultModelBuildingResult.java | 118 +-
.../maven/model/building/DefaultModelProblem.java | 110 +-
.../building/DefaultModelProblemCollector.java | 131 +-
.../model/building/DefaultModelProcessor.java | 40 +-
.../building/DefaultModelSourceTransformer.java | 13 +-
.../model/building/DefaultTransformerContext.java | 88 +-
.../maven/model/building/FileModelSource.java | 55 +-
.../maven/model/building/FileToRawModelMerger.java | 192 +-
.../model/building/FilterModelBuildingRequest.java | 165 +-
.../apache/maven/model/building/ModelBuilder.java | 16 +-
.../maven/model/building/ModelBuildingEvent.java | 7 +-
.../model/building/ModelBuildingEventCatapult.java | 9 +-
.../model/building/ModelBuildingException.java | 111 +-
.../model/building/ModelBuildingListener.java | 9 +-
.../maven/model/building/ModelBuildingRequest.java | 46 +-
.../maven/model/building/ModelBuildingResult.java | 12 +-
.../apache/maven/model/building/ModelCache.java | 41 +-
.../apache/maven/model/building/ModelCacheTag.java | 57 +-
.../org/apache/maven/model/building/ModelData.java | 45 +-
.../apache/maven/model/building/ModelProblem.java | 17 +-
.../model/building/ModelProblemCollector.java | 9 +-
.../model/building/ModelProblemCollectorExt.java | 7 +-
.../building/ModelProblemCollectorRequest.java | 38 +-
.../maven/model/building/ModelProblemUtils.java | 113 +-
.../maven/model/building/ModelProcessor.java | 10 +-
.../apache/maven/model/building/ModelSource.java | 8 +-
.../apache/maven/model/building/ModelSource2.java | 9 +-
.../model/building/ModelSourceTransformer.java | 11 +-
.../org/apache/maven/model/building/Result.java | 146 +-
.../maven/model/building/StringModelSource.java | 17 +-
.../maven/model/building/TransformerContext.java | 13 +-
.../model/building/TransformerContextBuilder.java | 8 +-
.../maven/model/building/TransformerException.java | 19 +-
.../maven/model/building/UrlModelSource.java | 13 +-
.../DefaultDependencyManagementImporter.java | 44 +-
.../composition/DependencyManagementImporter.java | 15 +-
.../inheritance/DefaultInheritanceAssembler.java | 317 ++-
.../model/inheritance/InheritanceAssembler.java | 11 +-
.../AbstractStringBasedModelInterpolator.java | 160 +-
.../interpolation/BuildTimestampValueSource.java | 23 +-
.../DefaultModelVersionProcessor.java | 39 +-
.../model/interpolation/MavenBuildTimestamp.java | 50 +-
.../model/interpolation/ModelInterpolator.java | 22 +-
.../model/interpolation/ModelVersionProcessor.java | 14 +-
.../PathTranslatingPostProcessor.java | 38 +-
.../StringVisitorModelInterpolator.java | 86 +-
.../interpolation/UrlNormalizingPostProcessor.java | 35 +-
.../apache/maven/model/io/DefaultModelReader.java | 136 +-
.../apache/maven/model/io/DefaultModelWriter.java | 67 +-
.../apache/maven/model/io/ModelParseException.java | 26 +-
.../org/apache/maven/model/io/ModelReader.java | 17 +-
.../org/apache/maven/model/io/ModelWriter.java | 26 +-
.../maven/model/locator/DefaultModelLocator.java | 14 +-
.../apache/maven/model/locator/ModelLocator.java | 9 +-
.../DefaultDependencyManagementInjector.java | 95 +-
.../DefaultPluginManagementInjector.java | 103 +-
.../management/DependencyManagementInjector.java | 9 +-
.../model/management/PluginManagementInjector.java | 9 +-
.../apache/maven/model/merge/MavenModelMerger.java | 671 +++---
.../normalization/DefaultModelNormalizer.java | 114 +-
.../maven/model/normalization/ModelNormalizer.java | 11 +-
.../model/path/DefaultModelPathTranslator.java | 105 +-
.../model/path/DefaultModelUrlNormalizer.java | 46 +-
.../maven/model/path/DefaultPathTranslator.java | 34 +-
.../maven/model/path/DefaultUrlNormalizer.java | 46 +-
.../maven/model/path/ModelPathTranslator.java | 12 +-
.../maven/model/path/ModelUrlNormalizer.java | 11 +-
.../apache/maven/model/path/PathTranslator.java | 11 +-
.../ProfileActivationFilePathInterpolator.java | 54 +-
.../org/apache/maven/model/path/UrlNormalizer.java | 11 +-
.../plugin/DefaultPluginConfigurationExpander.java | 41 +-
.../plugin/DefaultReportConfigurationExpander.java | 30 +-
.../model/plugin/DefaultReportingConverter.java | 218 +-
.../model/plugin/LifecycleBindingsInjector.java | 9 +-
.../model/plugin/PluginConfigurationExpander.java | 9 +-
.../model/plugin/ReportConfigurationExpander.java | 9 +-
.../maven/model/plugin/ReportingConverter.java | 9 +-
.../profile/DefaultProfileActivationContext.java | 128 +-
.../model/profile/DefaultProfileInjector.java | 240 +-
.../model/profile/DefaultProfileSelector.java | 104 +-
.../model/profile/ProfileActivationContext.java | 9 +-
.../maven/model/profile/ProfileInjector.java | 9 +-
.../maven/model/profile/ProfileSelector.java | 12 +-
.../profile/activation/FileProfileActivator.java | 68 +-
.../activation/JdkVersionProfileActivator.java | 170 +-
.../OperatingSystemProfileActivator.java | 91 +-
.../model/profile/activation/ProfileActivator.java | 11 +-
.../activation/PropertyProfileActivator.java | 65 +-
.../resolution/InvalidRepositoryException.java | 21 +-
.../maven/model/resolution/ModelResolver.java | 62 +-
.../resolution/UnresolvableModelException.java | 46 +-
.../model/resolution/WorkspaceModelResolver.java | 19 +-
.../model/superpom/DefaultSuperPomProvider.java | 55 +-
.../maven/model/superpom/SuperPomProvider.java | 9 +-
.../model/validation/DefaultModelValidator.java | 1938 +++++++++-------
.../maven/model/validation/ModelValidator.java | 16 +-
.../model/building/ComplexActivationTest.java | 49 +-
.../building/DefaultModelBuilderFactoryTest.java | 94 +-
.../model/building/DefaultModelBuilderTest.java | 174 +-
.../maven/model/building/FileModelSourceTest.java | 54 +-
.../model/building/FileToRawModelMergerTest.java | 71 +-
.../model/building/SimpleProblemCollector.java | 42 +-
.../DefaultInheritanceAssemblerTest.java | 180 +-
.../AbstractModelInterpolatorTest.java | 421 ++--
.../interpolation/MavenBuildTimestampTest.java | 23 +-
.../StringVisitorModelInterpolatorTest.java | 13 +-
.../maven/model/merge/MavenModelMergerTest.java | 103 +-
.../maven/model/path/DefaultUrlNormalizerTest.java | 69 +-
.../activation/AbstractProfileActivatorTest.java | 29 +-
.../activation/FileProfileActivatorTest.java | 102 +-
.../activation/JdkVersionProfileActivatorTest.java | 214 +-
.../activation/PropertyProfileActivatorTest.java | 150 +-
.../validation/DefaultModelValidatorTest.java | 939 ++++----
maven-model-transform/pom.xml | 4 +-
.../transform/BuildToRawPomXMLFilterFactory.java | 57 +-
.../maven/model/transform/CiFriendlyXMLFilter.java | 47 +-
.../maven/model/transform/FastForwardFilter.java | 58 +-
.../maven/model/transform/ModulesXMLFilter.java | 17 +-
.../maven/model/transform/ParentXMLFilter.java | 125 +-
.../RawToConsumerPomXMLFilterFactory.java | 22 +-
.../transform/ReactorDependencyXMLFilter.java | 79 +-
.../model/transform/RelativePathXMLFilter.java | 40 +-
.../maven/model/transform/RelativeProject.java | 18 +-
.../model/transform/pull/BufferingParser.java | 410 ++--
.../model/transform/pull/NodeBufferingParser.java | 41 +-
.../maven/model/transform/pull/XmlUtils.java | 97 +-
.../model/transform/AbstractXMLFilterTests.java | 29 +-
.../model/transform/CiFriendlyXMLFilterTest.java | 37 +-
.../model/transform/ConsumerPomXMLFilterTest.java | 333 ++-
.../model/transform/ModulesXMLFilterTest.java | 93 +-
.../maven/model/transform/ParentXMLFilterTest.java | 392 ++--
.../transform/ReactorDependencyXMLFilterTest.java | 164 +-
.../model/transform/RelativePathXMLFilterTest.java | 155 +-
maven-model/pom.xml | 6 +-
.../java/org/apache/maven/model/BaseObject.java | 41 +-
.../java/org/apache/maven/model/InputLocation.java | 357 ++-
.../apache/maven/model/InputLocationTracker.java | 26 +-
.../java/org/apache/maven/model/InputSource.java | 112 +-
.../java/org/apache/maven/model/WrapperList.java | 108 +-
.../org/apache/maven/model/WrapperProperties.java | 309 +--
.../maven/model/io/xpp3/MavenXpp3Reader.java | 84 +-
.../maven/model/io/xpp3/MavenXpp3ReaderEx.java | 86 +-
.../maven/model/io/xpp3/MavenXpp3Writer.java | 47 +-
.../maven/model/io/xpp3/MavenXpp3WriterEx.java | 70 +-
.../apache/maven/model/io/xpp3/package-info.java | 19 -
.../org/apache/maven/model/merge/package-info.java | 19 -
.../org/apache/maven/model/ActivationFileTest.java | 31 +-
.../org/apache/maven/model/ActivationOSTest.java | 31 +-
.../apache/maven/model/ActivationPropertyTest.java | 31 +-
.../org/apache/maven/model/ActivationTest.java | 31 +-
.../java/org/apache/maven/model/BuildTest.java | 31 +-
.../org/apache/maven/model/CiManagementTest.java | 31 +-
.../org/apache/maven/model/ContributorTest.java | 31 +-
.../maven/model/DependencyManagementTest.java | 31 +-
.../org/apache/maven/model/DependencyTest.java | 31 +-
.../maven/model/DeploymentRepositoryTest.java | 31 +-
.../java/org/apache/maven/model/DeveloperTest.java | 31 +-
.../maven/model/DistributionManagementTest.java | 31 +-
.../java/org/apache/maven/model/ExclusionTest.java | 31 +-
.../java/org/apache/maven/model/ExtensionTest.java | 31 +-
.../apache/maven/model/IssueManagementTest.java | 31 +-
.../java/org/apache/maven/model/LicenseTest.java | 31 +-
.../org/apache/maven/model/MailingListTest.java | 31 +-
.../java/org/apache/maven/model/ModelTest.java | 31 +-
.../java/org/apache/maven/model/NotifierTest.java | 31 +-
.../org/apache/maven/model/OrganizationTest.java | 31 +-
.../java/org/apache/maven/model/ParentTest.java | 31 +-
.../maven/model/PluginConfigurationTest.java | 31 +-
.../apache/maven/model/PluginContainerTest.java | 31 +-
.../apache/maven/model/PluginExecutionTest.java | 31 +-
.../apache/maven/model/PluginManagementTest.java | 31 +-
.../java/org/apache/maven/model/PluginTest.java | 31 +-
.../org/apache/maven/model/PrerequisitesTest.java | 31 +-
.../java/org/apache/maven/model/ProfileTest.java | 31 +-
.../org/apache/maven/model/RelocationTest.java | 31 +-
.../org/apache/maven/model/ReportPluginTest.java | 31 +-
.../java/org/apache/maven/model/ReportSetTest.java | 31 +-
.../java/org/apache/maven/model/ReportingTest.java | 31 +-
.../apache/maven/model/RepositoryPolicyTest.java | 31 +-
.../org/apache/maven/model/RepositoryTest.java | 31 +-
.../java/org/apache/maven/model/ResourceTest.java | 31 +-
.../test/java/org/apache/maven/model/ScmTest.java | 31 +-
.../org/apache/maven/model/SerializationTest.java | 33 +-
.../test/java/org/apache/maven/model/SiteTest.java | 31 +-
.../apache/maven/model/merge/MavenMergerTest.java | 65 +-
.../org/apache/maven/model/v4/ModelXmlTest.java | 49 +-
maven-plugin-api/pom.xml | 4 +-
.../java/org/apache/maven/plugin/AbstractMojo.java | 25 +-
.../plugin/AbstractMojoExecutionException.java | 30 +-
.../org/apache/maven/plugin/ContextEnabled.java | 10 +-
.../main/java/org/apache/maven/plugin/Mojo.java | 13 +-
.../maven/plugin/MojoExecutionException.java | 35 +-
.../apache/maven/plugin/MojoFailureException.java | 30 +-
.../apache/maven/plugin/MojoNotFoundException.java | 50 +-
.../DuplicateMojoDescriptorException.java | 21 +-
.../descriptor/DuplicateParameterException.java | 15 +-
.../descriptor/InvalidParameterException.java | 21 +-
.../InvalidPluginDescriptorException.java | 20 +-
.../maven/plugin/descriptor/MojoDescriptor.java | 253 +--
.../apache/maven/plugin/descriptor/Parameter.java | 105 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 291 +--
.../plugin/descriptor/PluginDescriptorBuilder.java | 373 ++--
.../maven/plugin/descriptor/Requirement.java | 34 +-
.../plugin/lifecycle/ImmutableCollections.java | 488 ++--
.../java/org/apache/maven/plugin/logging/Log.java | 32 +-
.../maven/plugin/logging/SystemStreamLog.java | 116 +-
.../plugin/descriptor/MojoDescriptorTest.java | 47 +-
.../descriptor/PluginDescriptorBuilderTest.java | 192 +-
maven-repository-metadata/pom.xml | 2 -
.../artifact/repository/metadata/MetadataTest.java | 291 ++-
maven-resolver-provider/pom.xml | 3 -
.../internal/ArtifactDescriptorReaderDelegate.java | 120 +-
.../internal/ArtifactDescriptorUtils.java | 49 +-
.../internal/DefaultArtifactDescriptorReader.java | 289 ++-
.../repository/internal/DefaultModelCache.java | 147 +-
.../internal/DefaultModelCacheFactory.java | 13 +-
.../repository/internal/DefaultModelResolver.java | 257 +--
.../internal/DefaultVersionRangeResolver.java | 264 +--
.../internal/DefaultVersionResolver.java | 514 ++---
.../internal/DefaultVersionSchemeProvider.java | 18 +-
.../repository/internal/LocalSnapshotMetadata.java | 108 +-
.../internal/LocalSnapshotMetadataGenerator.java | 44 +-
.../maven/repository/internal/MavenMetadata.java | 93 +-
.../internal/MavenRepositorySystemUtils.java | 64 +-
.../repository/internal/MavenResolverModule.java | 58 +-
.../repository/internal/MavenSnapshotMetadata.java | 53 +-
.../repository/internal/MavenWorkspaceReader.java | 12 +-
.../repository/internal/ModelCacheFactory.java | 9 +-
.../maven/repository/internal/PluginsMetadata.java | 64 +-
.../internal/PluginsMetadataGenerator.java | 108 +-
.../internal/PluginsMetadataGeneratorFactory.java | 25 +-
.../repository/internal/RelocatedArtifact.java | 106 +-
.../internal/RemoteSnapshotMetadata.java | 104 +-
.../internal/RemoteSnapshotMetadataGenerator.java | 64 +-
.../internal/SnapshotMetadataGeneratorFactory.java | 25 +-
.../repository/internal/VersionsMetadata.java | 88 +-
.../internal/VersionsMetadataGenerator.java | 58 +-
.../internal/VersionsMetadataGeneratorFactory.java | 25 +-
.../maven/repository/internal/package-info.java | 19 -
.../internal/AbstractRepositoryTestCase.java | 40 +-
.../DefaultArtifactDescriptorReaderTest.java | 58 +-
.../internal/DefaultModelResolverTest.java | 204 +-
.../internal/DefaultVersionResolverTest.java | 62 +-
.../internal/MavenRepositorySystemUtilsTest.java | 16 +-
.../internal/RemoteSnapshotMetadataTest.java | 47 +-
.../repository/internal/RepositorySystemTest.java | 237 +-
.../internal/util/ConsoleRepositoryListener.java | 110 +-
.../internal/util/ConsoleTransferListener.java | 154 +-
maven-settings-builder/pom.xml | 2 -
.../settings/building/DefaultSettingsBuilder.java | 229 +-
.../building/DefaultSettingsBuilderFactory.java | 23 +-
.../building/DefaultSettingsBuildingRequest.java | 72 +-
.../building/DefaultSettingsBuildingResult.java | 20 +-
.../settings/building/DefaultSettingsProblem.java | 98 +-
.../building/DefaultSettingsProblemCollector.java | 30 +-
.../settings/building/FileSettingsSource.java | 16 +-
.../maven/settings/building/SettingsBuilder.java | 10 +-
.../building/SettingsBuildingException.java | 52 +-
.../settings/building/SettingsBuildingRequest.java | 19 +-
.../settings/building/SettingsBuildingResult.java | 8 +-
.../maven/settings/building/SettingsProblem.java | 12 +-
.../building/SettingsProblemCollector.java | 9 +-
.../maven/settings/building/SettingsSource.java | 8 +-
.../settings/building/StringSettingsSource.java | 21 +-
.../maven/settings/building/UrlSettingsSource.java | 17 +-
.../settings/crypto/DefaultSettingsDecrypter.java | 88 +-
.../crypto/DefaultSettingsDecryptionRequest.java | 47 +-
.../crypto/DefaultSettingsDecryptionResult.java | 37 +-
.../crypto/MavenSecDispatcherProvider.java | 25 +-
.../maven/settings/crypto/SettingsDecrypter.java | 9 +-
.../settings/crypto/SettingsDecryptionRequest.java | 12 +-
.../settings/crypto/SettingsDecryptionResult.java | 8 +-
.../maven/settings/io/DefaultSettingsReader.java | 59 +-
.../maven/settings/io/DefaultSettingsWriter.java | 49 +-
.../maven/settings/io/SettingsParseException.java | 26 +-
.../apache/maven/settings/io/SettingsReader.java | 17 +-
.../apache/maven/settings/io/SettingsWriter.java | 17 +-
.../maven/settings/merge/MavenSettingsMerger.java | 84 +-
.../validation/DefaultSettingsValidator.java | 272 +--
.../settings/validation/SettingsValidator.java | 11 +-
.../DefaultSettingsBuilderFactoryTest.java | 33 +-
.../validation/DefaultSettingsValidatorTest.java | 261 ++-
maven-settings/pom.xml | 6 +-
.../org/apache/maven/settings/WrapperList.java | 108 +-
.../apache/maven/settings/WrapperProperties.java | 307 +--
.../maven/settings/io/xpp3/SettingsXpp3Reader.java | 85 +-
.../maven/settings/io/xpp3/SettingsXpp3Writer.java | 48 +-
maven-slf4j-provider/pom.xml | 10 +-
.../org/slf4j/impl/MavenFailOnSeverityLogger.java | 81 +-
.../java/org/slf4j/impl/MavenLoggerFactory.java | 52 +-
.../java/org/slf4j/impl/MavenSimpleLogger.java | 92 +-
.../java/org/slf4j/impl/StaticLoggerBinder.java | 21 +-
.../org/slf4j/impl/MavenLoggerFactoryTest.java | 78 +-
maven-slf4j-wrapper/pom.xml | 8 +-
.../apache/maven/logwrapper/LogLevelRecorder.java | 46 +-
.../maven/logwrapper/MavenSlf4jWrapperFactory.java | 12 +-
.../maven/logwrapper/LogLevelRecorderTest.java | 52 +-
maven-toolchain-builder/pom.xml | 6 +-
.../building/DefaultToolchainsBuilder.java | 197 +-
.../building/DefaultToolchainsBuildingRequest.java | 20 +-
.../building/DefaultToolchainsBuildingResult.java | 20 +-
.../toolchain/building/ToolchainsBuilder.java | 10 +-
.../building/ToolchainsBuildingException.java | 52 +-
.../building/ToolchainsBuildingRequest.java | 10 +-
.../building/ToolchainsBuildingResult.java | 8 +-
.../toolchain/io/DefaultToolchainsReader.java | 59 +-
.../toolchain/io/DefaultToolchainsWriter.java | 29 +-
.../toolchain/io/ToolchainsParseException.java | 26 +-
.../maven/toolchain/io/ToolchainsReader.java | 17 +-
.../maven/toolchain/io/ToolchainsWriter.java | 14 +-
.../toolchain/merge/MavenToolchainMerger.java | 71 +-
.../building/DefaultToolchainsBuilderTest.java | 377 ++--
.../building/ToolchainsBuildingExceptionTest.java | 69 +-
.../toolchain/merge/MavenToolchainMergerTest.java | 165 +-
maven-toolchain-model/pom.xml | 172 +-
.../apache/maven/toolchain/model/WrapperList.java | 108 +-
.../maven/toolchain/model/WrapperProperties.java | 307 +--
maven-xml-impl/pom.xml | 58 +-
.../org/apache/maven/internal/xml/DomBuilder.java | 67 +-
.../maven/internal/xml/MavenXmlException.java | 30 +-
.../maven/internal/xml/XmlPlexusConfiguration.java | 59 +-
.../org/apache/maven/internal/xml/Xpp3Dom.java | 311 +--
.../apache/maven/internal/xml/Xpp3DomBuilder.java | 143 +-
.../apache/maven/internal/xml/Xpp3DomWriter.java | 52 +-
.../apache/maven/internal/xml/package-info.java | 19 -
.../java/org/codehaus/plexus/util/xml/Xpp3Dom.java | 282 +--
.../codehaus/plexus/util/xml/Xpp3DomBuilder.java | 74 +-
.../org/codehaus/plexus/util/xml/package-info.java | 19 -
plexus-utils/pom.xml | 282 ++-
pom.xml | 211 +-
1279 files changed, 48367 insertions(+), 67332 deletions(-)
copy maven-core/src/test/resources/projects/build.properties => .git-blame-ignore-revs (91%)
[maven] 03/03: [MNG-7601] Ignore reformat commit in blame
Posted by gn...@apache.org.
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 001eef8452b38110a2557446aa81b8fb1ff35f92
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Nov 22 11:30:09 2022 +0100
[MNG-7601] Ignore reformat commit in blame
---
.git-blame-ignore-revs | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 000000000..264248387
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Change maven code style
+bafe1c615c0f4044cb58dba7be29769c13581984
[maven] 01/03: [MNG-7601] Upgrade Apache Maven parent POM to version 38
Posted by gn...@apache.org.
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 49572e46c99f2b28d32e91754ec717c0abac26ea
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Nov 22 11:20:44 2022 +0100
[MNG-7601] Upgrade Apache Maven parent POM to version 38
---
pom.xml | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2ccd6b9c6..e41c2c08d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>37</version>
+ <version>38</version>
<relativePath />
</parent>
@@ -504,23 +504,6 @@ under the License.
<artifactId>modello-plugin-velocity</artifactId>
<version>${project.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.2</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>8.41.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-resources</artifactId>
- <version>3</version>
- </dependency>
- </dependencies>
- </plugin>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
@@ -670,15 +653,6 @@ under the License.
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <violationSeverity>info</violationSeverity>
- <violationIgnore>JavadocVariable,JavadocMethod,HiddenField</violationIgnore>
-<!-- <suppressionsLocation>${maven.multiModuleProjectDirectory}/build/checkstyle-suppressions.xml</suppressionsLocation>-->
- </configuration>
- </plugin>
</plugins>
</build>
[maven] 02/03: [MNG-7601] Reformat sources
Posted by gn...@apache.org.
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 de19cfcd2bc8e774818d87472e8e64dc37c0b93d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Nov 22 11:21:12 2022 +0100
[MNG-7601] Reformat sources
---
apache-maven/pom.xml | 52 +-
.../apache/maven/settings/GlobalSettingsTest.java | 27 +-
api/maven-api-core/pom.xml | 2 +-
.../main/java/org/apache/maven/api/Artifact.java | 23 +-
.../org/apache/maven/api/ArtifactCoordinate.java | 14 +-
.../main/java/org/apache/maven/api/Dependency.java | 9 +-
.../org/apache/maven/api/DependencyCoordinate.java | 12 +-
.../src/main/java/org/apache/maven/api/Event.java | 10 +-
.../main/java/org/apache/maven/api/EventType.java | 6 +-
.../main/java/org/apache/maven/api/Exclusion.java | 7 +-
.../java/org/apache/maven/api/JavaToolchain.java | 9 +-
.../main/java/org/apache/maven/api/Listener.java | 13 +-
.../java/org/apache/maven/api/LocalRepository.java | 8 +-
.../java/org/apache/maven/api/MetadataStorage.java | 6 +-
.../java/org/apache/maven/api/MojoExecution.java | 10 +-
.../src/main/java/org/apache/maven/api/Node.java | 25 +-
.../java/org/apache/maven/api/NodeVisitor.java | 17 +-
.../main/java/org/apache/maven/api/Project.java | 21 +-
.../org/apache/maven/api/RemoteRepository.java | 7 +-
.../main/java/org/apache/maven/api/Repository.java | 9 +-
.../java/org/apache/maven/api/ResolutionScope.java | 42 +-
.../src/main/java/org/apache/maven/api/Scope.java | 30 +-
.../main/java/org/apache/maven/api/Service.java | 11 +-
.../main/java/org/apache/maven/api/Session.java | 79 +-
.../java/org/apache/maven/api/SessionData.java | 35 +-
.../main/java/org/apache/maven/api/Toolchain.java | 15 +-
.../src/main/java/org/apache/maven/api/Type.java | 9 +-
.../main/java/org/apache/maven/api/Version.java | 10 +-
.../java/org/apache/maven/api/VersionRange.java | 10 +-
.../main/java/org/apache/maven/api/plugin/Log.java | 49 +-
.../java/org/apache/maven/api/plugin/Mojo.java | 12 +-
.../org/apache/maven/api/plugin/MojoException.java | 36 +-
.../maven/api/plugin/annotations/Component.java | 11 +-
.../maven/api/plugin/annotations/Execute.java | 11 +-
.../plugin/annotations/InstantiationStrategy.java | 20 +-
.../api/plugin/annotations/LifecyclePhase.java | 76 +-
.../apache/maven/api/plugin/annotations/Mojo.java | 14 +-
.../maven/api/plugin/annotations/Parameter.java | 15 +-
.../api/services/ArtifactCoordinateFactory.java | 45 +-
.../services/ArtifactCoordinateFactoryRequest.java | 146 +-
.../maven/api/services/ArtifactDeployer.java | 24 +-
.../api/services/ArtifactDeployerException.java | 17 +-
.../api/services/ArtifactDeployerRequest.java | 89 +-
.../apache/maven/api/services/ArtifactFactory.java | 31 +-
.../maven/api/services/ArtifactFactoryRequest.java | 131 +-
.../maven/api/services/ArtifactInstaller.java | 24 +-
.../api/services/ArtifactInstallerException.java | 17 +-
.../api/services/ArtifactInstallerRequest.java | 66 +-
.../apache/maven/api/services/ArtifactManager.java | 19 +-
.../maven/api/services/ArtifactResolver.java | 18 +-
.../api/services/ArtifactResolverException.java | 15 +-
.../api/services/ArtifactResolverRequest.java | 59 +-
.../maven/api/services/ArtifactResolverResult.java | 12 +-
.../org/apache/maven/api/services/BaseRequest.java | 36 +-
.../apache/maven/api/services/BuilderProblem.java | 11 +-
.../maven/api/services/DependencyCollector.java | 38 +-
.../api/services/DependencyCollectorException.java | 14 +-
.../api/services/DependencyCollectorRequest.java | 143 +-
.../api/services/DependencyCollectorResult.java | 34 +-
.../api/services/DependencyCoordinateFactory.java | 54 +-
.../DependencyCoordinateFactoryRequest.java | 196 +-
.../maven/api/services/LocalRepositoryManager.java | 14 +-
.../java/org/apache/maven/api/services/Lookup.java | 16 +-
.../apache/maven/api/services/LookupException.java | 20 +-
.../apache/maven/api/services/MavenException.java | 28 +-
.../apache/maven/api/services/MessageBuilder.java | 43 +-
.../maven/api/services/MessageBuilderFactory.java | 15 +-
.../apache/maven/api/services/ProjectBuilder.java | 37 +-
.../api/services/ProjectBuilderException.java | 15 +-
.../maven/api/services/ProjectBuilderRequest.java | 155 +-
.../maven/api/services/ProjectBuilderResult.java | 13 +-
.../apache/maven/api/services/ProjectManager.java | 59 +-
.../org/apache/maven/api/services/Prompter.java | 34 +-
.../maven/api/services/PrompterException.java | 15 +-
.../maven/api/services/RepositoryFactory.java | 16 +-
.../apache/maven/api/services/SettingsBuilder.java | 27 +-
.../api/services/SettingsBuilderException.java | 14 +-
.../maven/api/services/SettingsBuilderRequest.java | 106 +-
.../maven/api/services/SettingsBuilderResult.java | 10 +-
.../java/org/apache/maven/api/services/Source.java | 7 +-
.../maven/api/services/ToolchainFactory.java | 8 +-
.../maven/api/services/ToolchainManager.java | 19 +-
.../api/services/ToolchainManagerException.java | 15 +-
.../maven/api/services/ToolchainsBuilder.java | 12 +-
.../api/services/ToolchainsBuilderException.java | 14 +-
.../api/services/ToolchainsBuilderRequest.java | 106 +-
.../api/services/ToolchainsBuilderResult.java | 10 +-
.../apache/maven/api/services/TypeRegistry.java | 11 +-
.../apache/maven/api/services/VersionParser.java | 19 +-
.../maven/api/services/VersionParserException.java | 15 +-
.../maven/api/services/xml/ModelXmlFactory.java | 10 +-
.../maven/api/services/xml/SettingsXmlFactory.java | 10 +-
.../api/services/xml/ToolchainsXmlFactory.java | 10 +-
.../apache/maven/api/services/xml/XmlFactory.java | 84 +-
.../maven/api/services/xml/XmlReaderException.java | 15 +-
.../maven/api/services/xml/XmlReaderRequest.java | 102 +-
.../maven/api/services/xml/XmlWriterException.java | 15 +-
.../maven/api/services/xml/XmlWriterRequest.java | 50 +-
api/maven-api-meta/pom.xml | 2 +-
.../org/apache/maven/api/annotations/Consumer.java | 13 +-
.../apache/maven/api/annotations/Experimental.java | 11 +-
.../apache/maven/api/annotations/Generated.java | 13 +-
.../apache/maven/api/annotations/Immutable.java | 13 +-
.../org/apache/maven/api/annotations/Nonnull.java | 13 +-
.../maven/api/annotations/NotThreadSafe.java | 13 +-
.../org/apache/maven/api/annotations/Nullable.java | 11 +-
.../org/apache/maven/api/annotations/Provider.java | 13 +-
.../apache/maven/api/annotations/ThreadSafe.java | 13 +-
.../apache/maven/api/annotations/package-info.java | 20 -
api/maven-api-model/pom.xml | 2 -
.../maven/api/model/ImmutableCollections.java | 488 ++--
.../org/apache/maven/api/model/InputLocation.java | 134 +-
.../maven/api/model/InputLocationTracker.java | 9 +-
.../org/apache/maven/api/model/InputSource.java | 19 +-
.../org/apache/maven/api/model/package-info.java | 19 -
api/maven-api-settings/pom.xml | 2 -
.../maven/api/settings/ImmutableCollections.java | 488 ++--
api/maven-api-toolchain/pom.xml | 150 +-
.../maven/api/toolchain/ImmutableCollections.java | 488 ++--
api/maven-api-xml/pom.xml | 2 +-
.../main/java/org/apache/maven/api/xml/Dom.java | 38 +-
api/modello-plugin-velocity/pom.xml | 6 +-
.../codehaus/modello/plugin/velocity/Helper.java | 113 +-
.../plugin/velocity/ModelloVelocityMojo.java | 43 +-
.../modello/plugin/velocity/VelocityGenerator.java | 127 +-
api/pom.xml | 4 +-
maven-artifact/pom.xml | 2 -
.../java/org/apache/maven/artifact/Artifact.java | 61 +-
.../org/apache/maven/artifact/ArtifactUtils.java | 184 +-
.../org/apache/maven/artifact/DefaultArtifact.java | 453 ++--
.../maven/artifact/InvalidArtifactRTException.java | 49 +-
.../maven/artifact/handler/ArtifactHandler.java | 8 +-
.../maven/artifact/metadata/ArtifactMetadata.java | 11 +-
.../artifact/repository/ArtifactRepository.java | 40 +-
.../repository/ArtifactRepositoryPolicy.java | 161 +-
.../maven/artifact/repository/Authentication.java | 34 +-
.../layout/ArtifactRepositoryLayout.java | 14 +-
.../layout/ArtifactRepositoryLayout2.java | 13 +-
.../metadata/RepositoryMetadataStoreException.java | 20 +-
.../AbstractArtifactResolutionException.java | 384 ++--
.../resolver/ArtifactNotFoundException.java | 116 +-
.../resolver/ArtifactResolutionException.java | 64 +-
.../resolver/CyclicDependencyException.java | 18 +-
.../MultipleArtifactsNotFoundException.java | 85 +-
.../artifact/resolver/filter/ArtifactFilter.java | 10 +-
.../maven/artifact/versioning/ArtifactVersion.java | 11 +-
.../artifact/versioning/ComparableVersion.java | 526 ++---
.../versioning/DefaultArtifactVersion.java | 176 +-
.../InvalidVersionSpecificationException.java | 14 +-
.../OverConstrainedVersionException.java | 24 +-
.../maven/artifact/versioning/Restriction.java | 121 +-
.../maven/artifact/versioning/VersionRange.java | 446 ++--
.../java/org/apache/maven/repository/Proxy.java | 54 +-
.../legacy/metadata/ArtifactMetadata.java | 17 +-
.../apache/maven/artifact/ArtifactUtilsTest.java | 71 +-
.../apache/maven/artifact/DefaultArtifactTest.java | 141 +-
.../artifact/handler/ArtifactHandlerMock.java | 53 +-
.../artifact/versioning/ComparableVersionIT.java | 65 +-
.../artifact/versioning/ComparableVersionTest.java | 354 ++-
.../versioning/DefaultArtifactVersionTest.java | 288 ++-
.../artifact/versioning/VersionRangeTest.java | 1289 ++++++-----
maven-builder-support/pom.xml | 2 -
.../org/apache/maven/building/DefaultProblem.java | 97 +-
.../maven/building/DefaultProblemCollector.java | 26 +-
.../java/org/apache/maven/building/FileSource.java | 46 +-
.../java/org/apache/maven/building/Problem.java | 12 +-
.../apache/maven/building/ProblemCollector.java | 11 +-
.../maven/building/ProblemCollectorFactory.java | 12 +-
.../java/org/apache/maven/building/Source.java | 10 +-
.../org/apache/maven/building/StringSource.java | 51 +-
.../java/org/apache/maven/building/UrlSource.java | 44 +-
.../building/DefaultProblemCollectorTest.java | 68 +-
.../apache/maven/building/DefaultProblemTest.java | 133 +-
.../org/apache/maven/building/FileSourceTest.java | 56 +-
.../building/ProblemCollectorFactoryTest.java | 29 +-
.../apache/maven/building/StringSourceTest.java | 47 +-
.../org/apache/maven/building/UrlSourceTest.java | 48 +-
maven-compat/pom.xml | 2 -
.../apache/maven/artifact/ArtifactScopeEnum.java | 82 +-
.../org/apache/maven/artifact/ArtifactStatus.java | 56 +-
.../artifact/UnknownRepositoryLayoutException.java | 23 +-
.../maven/artifact/deployer/ArtifactDeployer.java | 25 +-
.../deployer/ArtifactDeploymentException.java | 25 +-
.../artifact/deployer/DefaultArtifactDeployer.java | 120 +-
.../installer/ArtifactInstallationException.java | 25 +-
.../artifact/installer/ArtifactInstaller.java | 17 +-
.../installer/DefaultArtifactInstaller.java | 89 +-
.../artifact/manager/DefaultWagonManager.java | 112 +-
.../manager/WagonConfigurationException.java | 17 +-
.../maven/artifact/manager/WagonManager.java | 25 +-
.../repository/ArtifactRepositoryFactory.java | 53 +-
.../repository/DefaultArtifactRepository.java | 172 +-
.../DefaultArtifactRepositoryFactory.java | 98 +-
.../repository/layout/FlatRepositoryLayout.java | 53 +-
.../metadata/DefaultRepositoryMetadataManager.java | 546 ++---
.../metadata/GroupRepositoryMetadata.java | 73 +-
.../repository/metadata/MetadataBridge.java | 104 +-
.../repository/metadata/MetadataUtils.java | 13 +-
.../metadata/RepositoryMetadataReadException.java | 20 +-
.../SnapshotArtifactRepositoryMetadata.java | 52 +-
.../maven/artifact/resolver/ArtifactCollector.java | 25 +-
.../maven/artifact/resolver/ArtifactResolver.java | 107 +-
.../artifact/resolver/DebugResolutionListener.java | 116 +-
.../resolver/DefaultArtifactCollector.java | 14 +-
.../artifact/resolver/DefaultArtifactResolver.java | 640 +++---
.../resolver/ResolutionListenerForDepMgmt.java | 17 +-
.../artifact/resolver/UnresolvedArtifacts.java | 24 +-
.../resolver/WarningResolutionListener.java | 62 +-
.../resolver/filter/InversionArtifactFilter.java | 32 +-
.../artifact/resolver/filter/OrArtifactFilter.java | 45 +-
.../resolver/filter/TypeArtifactFilter.java | 32 +-
.../artifact/versioning/ManagedVersionMap.java | 33 +-
.../maven/execution/DefaultRuntimeInformation.java | 26 +-
.../apache/maven/execution/RuntimeInformation.java | 8 +-
.../profiles/DefaultMavenProfilesBuilder.java | 64 +-
.../maven/profiles/DefaultProfileManager.java | 183 +-
.../maven/profiles/MavenProfilesBuilder.java | 14 +-
.../org/apache/maven/profiles/ProfileManager.java | 29 +-
.../maven/profiles/ProfilesConversionUtils.java | 112 +-
.../activation/DetectedProfileActivator.java | 17 +-
.../profiles/activation/FileProfileActivator.java | 69 +-
.../activation/JdkPrefixProfileActivator.java | 68 +-
.../OperatingSystemProfileActivator.java | 109 +-
.../activation/ProfileActivationException.java | 20 +-
.../profiles/activation/ProfileActivator.java | 14 +-
.../activation/SystemPropertyProfileActivator.java | 70 +-
.../maven/project/DefaultMavenProjectBuilder.java | 291 ++-
.../DefaultProjectBuilderConfiguration.java | 48 +-
.../project/InvalidProjectModelException.java | 38 +-
.../apache/maven/project/MavenProjectBuilder.java | 63 +-
.../project/MissingRepositoryElementException.java | 21 +-
.../java/org/apache/maven/project/ModelUtils.java | 27 +-
.../maven/project/ProjectBuilderConfiguration.java | 20 +-
.../org/apache/maven/project/ProjectUtils.java | 83 +-
.../DefaultModelInheritanceAssembler.java | 25 +-
.../inheritance/ModelInheritanceAssembler.java | 16 +-
.../AbstractStringBasedModelInterpolator.java | 350 ++-
.../interpolation/BuildTimestampValueSource.java | 27 +-
.../interpolation/ModelInterpolationException.java | 38 +-
.../project/interpolation/ModelInterpolator.java | 35 +-
.../PathTranslatingPostProcessor.java | 34 +-
.../interpolation/RegexBasedModelInterpolator.java | 29 +-
.../StringSearchModelInterpolator.java | 402 ++--
.../maven/project/path/DefaultPathTranslator.java | 185 +-
.../project/validation/DefaultModelValidator.java | 35 +-
.../project/validation/ModelValidationResult.java | 70 +-
.../maven/project/validation/ModelValidator.java | 11 +-
.../maven/reporting/MavenReportException.java | 18 +-
.../maven/repository/DefaultMirrorSelector.java | 139 +-
.../maven/repository/MavenArtifactMetadata.java | 56 +-
.../org/apache/maven/repository/MetadataGraph.java | 38 +-
.../apache/maven/repository/MetadataGraphNode.java | 52 +-
.../repository/MetadataResolutionRequest.java | 106 +-
.../maven/repository/MetadataResolutionResult.java | 209 +-
.../apache/maven/repository/MirrorSelector.java | 10 +-
.../repository/UserLocalArtifactRepository.java | 36 +-
.../maven/repository/VersionNotFoundException.java | 38 +-
.../repository/legacy/ChecksumFailedException.java | 20 +-
.../legacy/DefaultUpdateCheckManager.java | 366 ++-
.../repository/legacy/DefaultWagonManager.java | 826 +++----
.../repository/legacy/LegacyRepositorySystem.java | 813 +++----
.../maven/repository/legacy/MavenArtifact.java | 49 +-
.../repository/legacy/TransferListenerAdapter.java | 151 +-
.../repository/legacy/UpdateCheckManager.java | 20 +-
.../legacy/WagonConfigurationException.java | 29 +-
.../maven/repository/legacy/WagonManager.java | 65 +-
.../repository/ArtifactRepositoryFactory.java | 51 +-
.../DefaultArtifactRepositoryFactory.java | 121 +-
.../resolver/DefaultLegacyArtifactCollector.java | 773 +++----
.../legacy/resolver/LegacyArtifactCollector.java | 55 +-
.../legacy/resolver/conflict/ConflictResolver.java | 10 +-
.../resolver/conflict/ConflictResolverFactory.java | 11 +-
.../ConflictResolverNotFoundException.java | 14 +-
.../resolver/conflict/DefaultConflictResolver.java | 12 +-
.../conflict/DefaultConflictResolverFactory.java | 36 +-
.../conflict/FarthestConflictResolver.java | 20 +-
.../resolver/conflict/NearestConflictResolver.java | 20 +-
.../resolver/conflict/NewestConflictResolver.java | 29 +-
.../resolver/conflict/OldestConflictResolver.java | 29 +-
.../transform/AbstractVersionTransformation.java | 88 +-
.../resolver/transform/ArtifactTransformation.java | 33 +-
.../transform/ArtifactTransformationManager.java | 29 +-
.../DefaultArtifactTransformationManager.java | 63 +-
.../transform/LatestArtifactTransformation.java | 50 +-
.../transform/ReleaseArtifactTransformation.java | 70 +-
.../resolver/transform/SnapshotTransformation.java | 135 +-
.../repository/metadata/ArtifactMetadata.java | 265 ++-
.../repository/metadata/ClasspathContainer.java | 89 +-
.../metadata/ClasspathTransformation.java | 12 +-
.../metadata/DefaultClasspathTransformation.java | 158 +-
.../DefaultGraphConflictResolutionPolicy.java | 36 +-
.../metadata/DefaultGraphConflictResolver.java | 197 +-
.../metadata/GraphConflictResolutionException.java | 29 +-
.../metadata/GraphConflictResolutionPolicy.java | 11 +-
.../repository/metadata/GraphConflictResolver.java | 12 +-
.../maven/repository/metadata/MetadataGraph.java | 426 ++--
.../repository/metadata/MetadataGraphEdge.java | 128 +-
.../MetadataGraphTransformationException.java | 29 +-
.../repository/metadata/MetadataGraphVertex.java | 150 +-
.../repository/metadata/MetadataResolution.java | 41 +-
.../metadata/MetadataResolutionException.java | 28 +-
.../metadata/MetadataResolutionRequest.java | 46 +-
.../MetadataResolutionRequestTypeEnum.java | 29 +-
.../metadata/MetadataResolutionResult.java | 141 +-
.../metadata/MetadataRetrievalException.java | 34 +-
.../maven/repository/metadata/MetadataSource.java | 17 +-
.../repository/metadata/MetadataTreeNode.java | 95 +-
.../plugin/ExpressionDocumentationException.java | 20 +-
.../usability/plugin/ExpressionDocumenter.java | 104 +-
.../AbstractArtifactComponentTestCase.java | 271 +--
.../artifact/deployer/ArtifactDeployerTest.java | 55 +-
.../deployer/SimpleArtifactMetadataSource.java | 45 +-
.../factory/DefaultArtifactFactoryTest.java | 56 +-
.../artifact/installer/ArtifactInstallerTest.java | 45 +-
.../artifact/metadata/TestMetadataSource.java | 89 +-
.../repository/MavenArtifactRepositoryTest.java | 41 +-
.../resolver/ArtifactResolutionExceptionTest.java | 29 +-
.../artifact/resolver/ArtifactResolverTest.java | 236 +-
.../resolver/DefaultArtifactResolverTest.java | 65 +-
.../maven/artifact/resolver/TestFileWagon.java | 64 +-
.../artifact/resolver/TestTransferListener.java | 19 +-
.../resolver/filter/AndArtifactFilterTest.java | 32 +-
.../resolver/filter/FilterHashEqualsTest.java | 32 +-
.../resolver/filter/OrArtifactFilterTest.java | 32 +-
.../resolver/filter/ScopeArtifactFilterTest.java | 103 +-
.../maven/artifact/testutils/TestFileManager.java | 157 +-
.../transform/TransformationManagerTest.java | 58 +-
.../manager/DefaultProfileManagerTest.java | 148 +-
.../project/AbstractMavenProjectTestCase.java | 139 +-
.../maven/project/ClasspathArtifactResolver.java | 66 +-
.../maven/project/EmptyLifecycleExecutor.java | 68 +-
.../project/EmptyLifecyclePluginAnalyzer.java | 47 +-
.../project/LegacyLocalRepositoryManager.java | 138 +-
.../apache/maven/project/ProjectClasspathTest.java | 155 +-
.../apache/maven/project/TestArtifactResolver.java | 40 +-
.../maven/project/TestMavenRepositorySystem.java | 38 +-
.../apache/maven/project/TestProjectBuilder.java | 77 +-
.../AbstractProjectInheritanceTestCase.java | 34 +-
.../inheritance/t00/ProjectInheritanceTest.java | 33 +-
.../inheritance/t01/ProjectInheritanceTest.java | 37 +-
.../inheritance/t02/ProjectInheritanceTest.java | 88 +-
.../inheritance/t03/ProjectInheritanceTest.java | 28 +-
.../inheritance/t04/ProjectInheritanceTest.java | 55 +-
.../inheritance/t05/ProjectInheritanceTest.java | 49 +-
.../inheritance/t06/ProjectInheritanceTest.java | 50 +-
.../inheritance/t07/ProjectInheritanceTest.java | 54 +-
.../inheritance/t08/ProjectInheritanceTest.java | 51 +-
.../inheritance/t09/ProjectInheritanceTest.java | 77 +-
.../inheritance/t10/ProjectInheritanceTest.java | 51 +-
.../inheritance/t11/ProjectInheritanceTest.java | 35 +-
.../inheritance/t12/ProjectInheritanceTest.java | 39 +-
.../inheritance/t12scm/ProjectInheritanceTest.java | 130 +-
.../project/path/DefaultPathTranslatorTest.java | 42 +-
.../repository/DefaultMirrorSelectorTest.java | 19 +-
.../repository/LegacyRepositorySystemTest.java | 193 +-
.../maven/repository/MirrorProcessorTest.java | 267 ++-
.../legacy/DefaultUpdateCheckManagerTest.java | 200 +-
.../repository/legacy/DefaultWagonManagerTest.java | 321 ++-
.../legacy/LegacyRepositorySystemTest.java | 70 +-
.../maven/repository/legacy/PerLookupWagon.java | 17 +-
.../maven/repository/legacy/StringWagon.java | 68 +-
.../org/apache/maven/repository/legacy/WagonA.java | 16 +-
.../org/apache/maven/repository/legacy/WagonB.java | 16 +-
.../org/apache/maven/repository/legacy/WagonC.java | 16 +-
.../apache/maven/repository/legacy/WagonMock.java | 16 +-
.../resolver/DefaultArtifactCollectorTest.java | 1109 +++++----
.../conflict/AbstractConflictResolverTest.java | 86 +-
.../conflict/FarthestConflictResolverTest.java | 53 +-
.../conflict/NearestConflictResolverTest.java | 53 +-
.../conflict/NewestConflictResolverTest.java | 53 +-
.../conflict/OldestConflictResolverTest.java | 54 +-
.../DefaultClasspathTransformationTest.java | 124 +-
.../DefaultGraphConflictResolutionPolicyTest.java | 72 +-
.../metadata/DefaultGraphConflictResolverTest.java | 249 ++-
.../repository/metadata/TestMetadataSource.java | 79 +-
maven-core/pom.xml | 8 +-
.../maven/AbstractMavenLifecycleParticipant.java | 20 +-
.../org/apache/maven/ArtifactFilterManager.java | 12 +-
.../maven/ArtifactFilterManagerDelegate.java | 13 +-
.../src/main/java/org/apache/maven/BuildAbort.java | 18 +-
.../org/apache/maven/BuildFailureException.java | 19 +-
.../apache/maven/DefaultArtifactFilterManager.java | 58 +-
.../main/java/org/apache/maven/DefaultMaven.java | 646 +++---
.../maven/DefaultProjectDependenciesResolver.java | 172 +-
.../apache/maven/DuplicateProjectException.java | 18 +-
.../org/apache/maven/InternalErrorException.java | 13 +-
.../src/main/java/org/apache/maven/Maven.java | 14 +-
.../org/apache/maven/MavenExecutionException.java | 28 +-
.../org/apache/maven/MissingModuleException.java | 21 +-
.../org/apache/maven/MissingProfilesException.java | 14 +-
.../apache/maven/ProjectBuildFailureException.java | 20 +-
.../org/apache/maven/ProjectCycleException.java | 19 +-
.../apache/maven/ProjectDependenciesResolver.java | 36 +-
.../main/java/org/apache/maven/ReactorReader.java | 281 +--
.../java/org/apache/maven/RepositoryUtils.java | 388 ++--
.../main/java/org/apache/maven/SessionScoped.java | 14 +-
.../DependencyResolutionRequiredException.java | 14 +-
.../maven/artifact/InvalidRepositoryException.java | 33 +-
.../maven/artifact/factory/ArtifactFactory.java | 63 +-
.../artifact/factory/DefaultArtifactFactory.java | 187 +-
.../artifact/handler/DefaultArtifactHandler.java | 109 +-
.../handler/manager/ArtifactHandlerManager.java | 13 +-
.../manager/DefaultArtifactHandlerManager.java | 44 +-
.../providers/EarArtifactHandlerProvider.java | 29 +-
.../providers/EjbArtifactHandlerProvider.java | 29 +-
.../EjbClientArtifactHandlerProvider.java | 30 +-
.../providers/JarArtifactHandlerProvider.java | 29 +-
.../JavaSourceArtifactHandlerProvider.java | 30 +-
.../providers/JavadocArtifactHandlerProvider.java | 29 +-
.../MavenPluginArtifactHandlerProvider.java | 29 +-
.../providers/PomArtifactHandlerProvider.java | 29 +-
.../providers/RarArtifactHandlerProvider.java | 29 +-
.../providers/TestJarArtifactHandlerProvider.java | 29 +-
.../providers/WarArtifactHandlerProvider.java | 29 +-
.../metadata/AbstractArtifactMetadata.java | 15 +-
.../ArtifactMetadataRetrievalException.java | 29 +-
.../artifact/metadata/ArtifactMetadataSource.java | 38 +-
.../maven/artifact/metadata/ResolutionGroup.java | 29 +-
.../repository/DefaultRepositoryRequest.java | 64 +-
.../repository/LegacyLocalRepositoryManager.java | 302 +--
.../repository/MavenArtifactRepository.java | 281 +--
.../maven/artifact/repository/RepositoryCache.java | 11 +-
.../artifact/repository/RepositoryRequest.java | 15 +-
.../repository/layout/DefaultRepositoryLayout.java | 78 +-
.../metadata/AbstractRepositoryMetadata.java | 174 +-
.../metadata/ArtifactRepositoryMetadata.java | 68 +-
.../repository/metadata/RepositoryMetadata.java | 16 +-
.../RepositoryMetadataDeploymentException.java | 20 +-
.../RepositoryMetadataInstallationException.java | 20 +-
.../metadata/RepositoryMetadataManager.java | 36 +-
.../RepositoryMetadataResolutionException.java | 20 +-
.../metadata/io/DefaultMetadataReader.java | 59 +-
.../metadata/io/MetadataParseException.java | 26 +-
.../repository/metadata/io/MetadataReader.java | 17 +-
.../resolver/ArtifactResolutionRequest.java | 151 +-
.../resolver/ArtifactResolutionResult.java | 215 +-
.../resolver/DefaultResolutionErrorHandler.java | 59 +-
.../artifact/resolver/ResolutionErrorHandler.java | 11 +-
.../artifact/resolver/ResolutionListener.java | 40 +-
.../maven/artifact/resolver/ResolutionNode.java | 156 +-
.../filter/AbstractScopeArtifactFilter.java | 58 +-
.../resolver/filter/AndArtifactFilter.java | 51 +-
.../filter/CumulativeScopeArtifactFilter.java | 61 +-
.../resolver/filter/ExcludesArtifactFilter.java | 20 +-
.../resolver/filter/ExclusionArtifactFilter.java | 42 +-
.../resolver/filter/ExclusionSetFilter.java | 41 +-
.../resolver/filter/IncludesArtifactFilter.java | 43 +-
.../resolver/filter/ScopeArtifactFilter.java | 34 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 803 +++----
.../classrealm/ArtifactClassRealmConstituent.java | 33 +-
.../maven/classrealm/ClassRealmConstituent.java | 7 +-
.../apache/maven/classrealm/ClassRealmManager.java | 20 +-
.../classrealm/ClassRealmManagerDelegate.java | 10 +-
.../apache/maven/classrealm/ClassRealmRequest.java | 10 +-
.../maven/classrealm/DefaultClassRealmManager.java | 323 ++-
.../maven/classrealm/DefaultClassRealmRequest.java | 35 +-
.../BasedirBeanConfigurationPathTranslator.java | 30 +-
.../configuration/BeanConfigurationException.java | 18 +-
.../BeanConfigurationPathTranslator.java | 9 +-
.../configuration/BeanConfigurationRequest.java | 19 +-
.../BeanConfigurationValuePreprocessor.java | 10 +-
.../maven/configuration/BeanConfigurator.java | 10 +-
.../DefaultBeanConfigurationRequest.java | 101 +-
.../internal/DefaultBeanConfigurator.java | 137 +-
.../internal/EnhancedComponentConfigurator.java | 45 +-
.../internal/EnhancedConfigurationConverter.java | 114 +-
.../internal/EnhancedConverterLookup.java | 26 +-
.../apache/maven/eventspy/AbstractEventSpy.java | 23 +-
.../java/org/apache/maven/eventspy/EventSpy.java | 20 +-
.../eventspy/internal/EventSpyDispatcher.java | 104 +-
.../internal/EventSpyExecutionListener.java | 130 +-
.../internal/EventSpyRepositoryListener.java | 144 +-
.../maven/exception/DefaultExceptionHandler.java | 223 +-
.../apache/maven/exception/ExceptionHandler.java | 10 +-
.../apache/maven/exception/ExceptionSummary.java | 38 +-
.../maven/execution/AbstractExecutionListener.java | 59 +-
.../apache/maven/execution/ActivationSettings.java | 29 +-
.../org/apache/maven/execution/BuildFailure.java | 16 +-
.../maven/execution/BuildResumptionAnalyzer.java | 8 +-
.../maven/execution/BuildResumptionData.java | 13 +-
.../execution/BuildResumptionDataRepository.java | 13 +-
.../BuildResumptionPersistenceException.java | 11 +-
.../org/apache/maven/execution/BuildSuccess.java | 13 +-
.../org/apache/maven/execution/BuildSummary.java | 19 +-
.../execution/DefaultBuildResumptionAnalyzer.java | 48 +-
.../DefaultBuildResumptionDataRepository.java | 115 +-
.../execution/DefaultMavenExecutionRequest.java | 713 +++---
.../DefaultMavenExecutionRequestPopulator.java | 223 +-
.../execution/DefaultMavenExecutionResult.java | 63 +-
.../org/apache/maven/execution/ExecutionEvent.java | 10 +-
.../apache/maven/execution/ExecutionListener.java | 41 +-
.../maven/execution/MavenExecutionRequest.java | 135 +-
.../MavenExecutionRequestPopulationException.java | 25 +-
.../execution/MavenExecutionRequestPopulator.java | 20 +-
.../maven/execution/MavenExecutionResult.java | 25 +-
.../org/apache/maven/execution/MavenSession.java | 318 ++-
.../apache/maven/execution/MojoExecutionEvent.java | 31 +-
.../maven/execution/MojoExecutionListener.java | 14 +-
.../apache/maven/execution/ProfileActivation.java | 92 +-
.../apache/maven/execution/ProjectActivation.java | 109 +-
.../maven/execution/ProjectDependencyGraph.java | 12 +-
.../maven/execution/ProjectExecutionEvent.java | 40 +-
.../maven/execution/ProjectExecutionListener.java | 17 +-
.../org/apache/maven/execution/ReactorManager.java | 134 +-
.../maven/execution/scope/MojoExecutionScoped.java | 14 +-
.../execution/scope/WeakMojoExecutionListener.java | 14 +-
.../scope/internal/MojoExecutionScope.java | 133 +-
.../internal/MojoExecutionScopeCoreModule.java | 21 +-
.../scope/internal/MojoExecutionScopeModule.java | 45 +-
.../maven/extension/internal/CoreExports.java | 35 +-
.../extension/internal/CoreExportsProvider.java | 21 +-
.../extension/internal/CoreExtensionEntry.java | 82 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 348 ++-
.../maven/graph/DefaultProjectDependencyGraph.java | 97 +-
.../graph/FilteredProjectDependencyGraph.java | 60 +-
.../java/org/apache/maven/graph/GraphBuilder.java | 10 +-
.../org/apache/maven/graph/ProjectSelector.java | 126 +-
.../maven/internal/MultilineMessageHelper.java | 73 +-
.../aether/ConsumerModelSourceTransformer.java | 24 +-
.../DefaultRepositorySystemSessionFactory.java | 292 ++-
.../internal/aether/LoggingRepositoryListener.java | 121 +-
.../aether/MavenChainedWorkspaceReader.java | 53 +-
.../apache/maven/internal/impl/AbstractNode.java | 46 +-
.../maven/internal/impl/AbstractSession.java | 387 ++--
.../maven/internal/impl/DefaultArtifact.java | 76 +-
.../internal/impl/DefaultArtifactCoordinate.java | 67 +-
.../impl/DefaultArtifactCoordinateFactory.java | 51 +-
.../internal/impl/DefaultArtifactDeployer.java | 57 +-
.../internal/impl/DefaultArtifactFactory.java | 52 +-
.../internal/impl/DefaultArtifactInstaller.java | 46 +-
.../internal/impl/DefaultArtifactManager.java | 86 +-
.../internal/impl/DefaultArtifactResolver.java | 71 +-
.../maven/internal/impl/DefaultDependency.java | 96 +-
.../internal/impl/DefaultDependencyCollector.java | 82 +-
.../internal/impl/DefaultDependencyCoordinate.java | 77 +-
.../impl/DefaultDependencyCoordinateFactory.java | 44 +-
.../apache/maven/internal/impl/DefaultEvent.java | 33 +-
.../internal/impl/DefaultLocalRepository.java | 34 +-
.../impl/DefaultLocalRepositoryManager.java | 43 +-
.../org/apache/maven/internal/impl/DefaultLog.java | 158 +-
.../apache/maven/internal/impl/DefaultLookup.java | 73 +-
.../maven/internal/impl/DefaultMessageBuilder.java | 77 +-
.../impl/DefaultMessageBuilderFactory.java | 29 +-
.../internal/impl/DefaultModelXmlFactory.java | 114 +-
.../maven/internal/impl/DefaultMojoExecution.java | 33 +-
.../apache/maven/internal/impl/DefaultNode.java | 132 +-
.../apache/maven/internal/impl/DefaultProject.java | 147 +-
.../maven/internal/impl/DefaultProjectBuilder.java | 213 +-
.../maven/internal/impl/DefaultProjectManager.java | 132 +-
.../maven/internal/impl/DefaultPrompter.java | 77 +-
.../internal/impl/DefaultRemoteRepository.java | 29 +-
.../internal/impl/DefaultRepositoryFactory.java | 58 +-
.../apache/maven/internal/impl/DefaultSession.java | 255 +--
.../maven/internal/impl/DefaultSessionFactory.java | 32 +-
.../internal/impl/DefaultSettingsBuilder.java | 120 +-
.../internal/impl/DefaultSettingsXmlFactory.java | 86 +-
.../internal/impl/DefaultToolchainManager.java | 94 +-
.../internal/impl/DefaultToolchainsBuilder.java | 127 +-
.../internal/impl/DefaultToolchainsXmlFactory.java | 87 +-
.../maven/internal/impl/DefaultTypeRegistry.java | 42 +-
.../maven/internal/impl/DefaultVersionParser.java | 117 +-
.../apache/maven/internal/impl/EventSpyImpl.java | 42 +-
.../maven/internal/impl/MappedCollection.java | 28 +-
.../org/apache/maven/internal/impl/MappedList.java | 19 +-
.../maven/internal/impl/PropertiesAsMap.java | 68 +-
.../java/org/apache/maven/internal/impl/Utils.java | 33 +-
.../apache/maven/internal/impl/WrapperNode.java | 34 +-
.../maven/lifecycle/DefaultLifecycleExecutor.java | 83 +-
.../apache/maven/lifecycle/DefaultLifecycles.java | 104 +-
.../maven/lifecycle/LifeCyclePluginAnalyzer.java | 10 +-
.../java/org/apache/maven/lifecycle/Lifecycle.java | 34 +-
.../lifecycle/LifecycleExecutionException.java | 87 +-
.../apache/maven/lifecycle/LifecycleExecutor.java | 49 +-
.../maven/lifecycle/LifecycleMappingDelegate.java | 17 +-
.../lifecycle/LifecycleNotFoundException.java | 18 +-
.../lifecycle/LifecyclePhaseNotFoundException.java | 18 +-
.../apache/maven/lifecycle/MavenExecutionPlan.java | 124 +-
.../maven/lifecycle/MissingProjectException.java | 13 +-
.../maven/lifecycle/MojoExecutionConfigurator.java | 8 +-
.../maven/lifecycle/NoGoalSpecifiedException.java | 13 +-
.../lifecycle/internal/BuildListCalculator.java | 47 +-
.../lifecycle/internal/BuildThreadFactory.java | 12 +-
.../internal/CompoundProjectExecutionListener.java | 48 +-
.../lifecycle/internal/DefaultExecutionEvent.java | 26 +-
.../internal/DefaultExecutionEventCatapult.java | 63 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 555 ++---
.../internal/DefaultLifecycleMappingDelegate.java | 104 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 212 +-
.../DefaultLifecycleTaskSegmentCalculator.java | 95 +-
.../internal/DefaultMojoExecutionConfigurator.java | 160 +-
.../internal/DefaultProjectArtifactFactory.java | 24 +-
.../lifecycle/internal/DependencyContext.java | 57 +-
.../lifecycle/internal/ExecutionEventCatapult.java | 11 +-
.../lifecycle/internal/ExecutionPlanItem.java | 44 +-
.../apache/maven/lifecycle/internal/GoalTask.java | 14 +-
.../lifecycle/internal/LifecycleDebugLogger.java | 125 +-
.../internal/LifecycleDependencyResolver.java | 354 ++-
.../internal/LifecycleExecutionPlanCalculator.java | 53 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 89 +-
.../internal/LifecyclePluginResolver.java | 57 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 99 +-
.../maven/lifecycle/internal/LifecycleTask.java | 17 +-
.../internal/LifecycleTaskSegmentCalculator.java | 30 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 192 +-
.../maven/lifecycle/internal/MojoExecutor.java | 454 ++--
.../maven/lifecycle/internal/PhaseRecorder.java | 42 +-
.../lifecycle/internal/ProjectArtifactFactory.java | 12 +-
.../maven/lifecycle/internal/ProjectBuildList.java | 91 +-
.../maven/lifecycle/internal/ProjectIndex.java | 37 +-
.../maven/lifecycle/internal/ProjectSegment.java | 36 +-
.../lifecycle/internal/ReactorBuildStatus.java | 48 +-
.../maven/lifecycle/internal/ReactorContext.java | 29 +-
.../maven/lifecycle/internal/TaskSegment.java | 25 +-
.../maven/lifecycle/internal/builder/Builder.java | 19 +-
.../lifecycle/internal/builder/BuilderCommon.java | 179 +-
.../internal/builder/BuilderNotFoundException.java | 14 +-
.../multithreaded/ConcurrencyDependencyGraph.java | 84 +-
.../multithreaded/MultiThreadedBuilder.java | 194 +-
.../builder/multithreaded/ThreadOutputMuxer.java | 341 ++-
.../singlethreaded/SingleThreadedBuilder.java | 45 +-
.../lifecycle/mapping/DefaultLifecycleMapping.java | 88 +-
.../apache/maven/lifecycle/mapping/Lifecycle.java | 44 +-
.../maven/lifecycle/mapping/LifecycleMapping.java | 13 +-
.../maven/lifecycle/mapping/LifecycleMojo.java | 27 +-
.../maven/lifecycle/mapping/LifecyclePhase.java | 74 +-
.../providers/AbstractLifecycleProvider.java | 39 +-
.../providers/CleanLifecycleProvider.java | 22 +-
.../providers/DefaultLifecycleProvider.java | 23 +-
.../lifecycle/providers/SiteLifecycleProvider.java | 25 +-
.../providers/WrapperLifecycleProvider.java | 25 +-
.../AbstractLifecycleMappingProvider.java | 41 +-
.../packaging/EarLifecycleMappingProvider.java | 33 +-
.../packaging/EjbLifecycleMappingProvider.java | 41 +-
.../packaging/JarLifecycleMappingProvider.java | 41 +-
.../MavenPluginLifecycleMappingProvider.java | 47 +-
.../packaging/PomLifecycleMappingProvider.java | 25 +-
.../packaging/RarLifecycleMappingProvider.java | 41 +-
.../packaging/WarLifecycleMappingProvider.java | 41 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 158 +-
.../maven/monitor/event/EventDispatcher.java | 19 +-
.../apache/maven/monitor/event/EventMonitor.java | 17 +-
.../apache/maven/plugin/BuildPluginManager.java | 32 +-
.../java/org/apache/maven/plugin/CacheUtils.java | 110 +-
.../plugin/CompoundMojoExecutionListener.java | 40 +-
.../CycleDetectedInPluginGraphException.java | 17 +-
.../maven/plugin/DebugConfigurationListener.java | 60 +-
.../maven/plugin/DefaultBuildPluginManager.java | 226 +-
.../maven/plugin/DefaultExtensionRealmCache.java | 108 +-
.../plugin/DefaultMojosExecutionStrategy.java | 24 +-
.../maven/plugin/DefaultPluginArtifactsCache.java | 141 +-
.../maven/plugin/DefaultPluginDescriptorCache.java | 181 +-
.../maven/plugin/DefaultPluginRealmCache.java | 184 +-
.../apache/maven/plugin/ExtensionRealmCache.java | 36 +-
.../plugin/InvalidPluginDescriptorException.java | 25 +-
.../maven/plugin/InvalidPluginException.java | 25 +-
.../org/apache/maven/plugin/LegacySupport.java | 9 +-
.../apache/maven/plugin/MavenPluginManager.java | 46 +-
.../plugin/MavenPluginPrerequisitesChecker.java | 13 +-
.../org/apache/maven/plugin/MojoExecution.java | 121 +-
.../apache/maven/plugin/MojoExecutionRunner.java | 8 +-
.../maven/plugin/MojosExecutionStrategy.java | 12 +-
.../apache/maven/plugin/PluginArtifactsCache.java | 41 +-
.../maven/plugin/PluginConfigurationException.java | 40 +-
.../maven/plugin/PluginContainerException.java | 45 +-
.../apache/maven/plugin/PluginDescriptorCache.java | 22 +-
.../plugin/PluginDescriptorParsingException.java | 27 +-
.../maven/plugin/PluginExecutionException.java | 59 +-
.../maven/plugin/PluginIncompatibleException.java | 19 +-
.../apache/maven/plugin/PluginLoaderException.java | 78 +-
.../org/apache/maven/plugin/PluginManager.java | 56 +-
.../maven/plugin/PluginManagerException.java | 90 +-
.../maven/plugin/PluginNotFoundException.java | 44 +-
.../maven/plugin/PluginParameterException.java | 200 +-
.../plugin/PluginParameterExpressionEvaluator.java | 393 ++--
.../PluginParameterExpressionEvaluatorV4.java | 412 ++--
.../org/apache/maven/plugin/PluginRealmCache.java | 45 +-
.../maven/plugin/PluginResolutionException.java | 21 +-
.../AbstractMavenPluginParametersValidator.java | 108 +-
.../plugin/internal/DefaultLegacySupport.java | 38 +-
.../plugin/internal/DefaultMavenPluginManager.java | 915 ++++----
.../internal/DefaultMavenPluginValidator.java | 33 +-
.../DefaultPluginDependenciesResolver.java | 291 ++-
.../plugin/internal/DefaultPluginManager.java | 201 +-
.../plugin/internal/DeprecatedPluginValidator.java | 67 +-
.../MavenPluginConfigurationValidator.java | 15 +-
.../MavenPluginJavaPrerequisiteChecker.java | 27 +-
.../MavenPluginMavenPrerequisiteChecker.java | 46 +-
.../plugin/internal/MavenPluginValidator.java | 11 +-
.../maven/plugin/internal/MojoLogWrapper.java | 100 +-
.../internal/PluginDependenciesResolver.java | 22 +-
.../ReadOnlyPluginParametersValidator.java | 44 +-
.../internal/ValidatingConfigurationListener.java | 55 +-
.../plugin/prefix/DefaultPluginPrefixRequest.java | 77 +-
.../prefix/NoPluginFoundForPrefixException.java | 54 +-
.../maven/plugin/prefix/PluginPrefixRequest.java | 18 +-
.../maven/plugin/prefix/PluginPrefixResolver.java | 10 +-
.../maven/plugin/prefix/PluginPrefixResult.java | 9 +-
.../internal/DefaultPluginPrefixResolver.java | 239 +-
.../prefix/internal/DefaultPluginPrefixResult.java | 35 +-
.../version/DefaultPluginVersionRequest.java | 79 +-
.../version/PluginVersionNotFoundException.java | 21 +-
.../maven/plugin/version/PluginVersionRequest.java | 18 +-
.../version/PluginVersionResolutionException.java | 74 +-
.../plugin/version/PluginVersionResolver.java | 10 +-
.../maven/plugin/version/PluginVersionResult.java | 7 +-
.../internal/DefaultPluginVersionResolver.java | 393 ++--
.../internal/DefaultPluginVersionResult.java | 26 +-
.../DefaultDependencyResolutionRequest.java | 36 +-
.../project/DefaultDependencyResolutionResult.java | 63 +-
.../maven/project/DefaultMavenProjectHelper.java | 99 +-
.../project/DefaultModelBuildingListener.java | 97 +-
.../maven/project/DefaultProjectBuilder.java | 991 ++++-----
.../project/DefaultProjectBuildingHelper.java | 184 +-
.../project/DefaultProjectBuildingRequest.java | 219 +-
.../project/DefaultProjectBuildingResult.java | 45 +-
.../DefaultProjectDependenciesResolver.java | 299 +--
.../maven/project/DefaultProjectRealmCache.java | 86 +-
.../project/DependencyResolutionException.java | 16 +-
.../maven/project/DependencyResolutionRequest.java | 13 +-
.../maven/project/DependencyResolutionResult.java | 10 +-
.../DuplicateArtifactAttachmentException.java | 23 +-
.../maven/project/DuplicateProjectException.java | 35 +-
.../apache/maven/project/ExtensionDescriptor.java | 46 +-
.../maven/project/ExtensionDescriptorBuilder.java | 98 +-
.../project/InvalidProjectVersionException.java | 38 +-
.../org/apache/maven/project/MavenProject.java | 1308 +++++------
.../apache/maven/project/MavenProjectHelper.java | 20 +-
.../org/apache/maven/project/ProjectBuilder.java | 29 +-
.../maven/project/ProjectBuildingException.java | 63 +-
.../maven/project/ProjectBuildingHelper.java | 24 +-
.../maven/project/ProjectBuildingRequest.java | 47 +-
.../maven/project/ProjectBuildingResult.java | 8 +-
.../maven/project/ProjectDependenciesResolver.java | 10 +-
.../apache/maven/project/ProjectModelResolver.java | 286 +--
.../apache/maven/project/ProjectRealmCache.java | 32 +-
.../org/apache/maven/project/ProjectSorter.java | 269 +--
.../org/apache/maven/project/ReactorModelPool.java | 97 +-
.../maven/project/RepositorySessionDecorator.java | 8 +-
.../project/artifact/ActiveProjectArtifact.java | 251 +--
.../project/artifact/ArtifactWithDependencies.java | 10 +-
.../maven/project/artifact/AttachedArtifact.java | 153 +-
.../artifact/DefaultMavenMetadataCache.java | 287 ++-
.../project/artifact/DefaultMetadataSource.java | 18 +-
.../artifact/DefaultProjectArtifactsCache.java | 181 +-
.../InvalidDependencyVersionException.java | 25 +-
.../maven/project/artifact/MavenMetadataCache.java | 26 +-
.../project/artifact/MavenMetadataSource.java | 641 +++---
.../maven/project/artifact/PluginArtifact.java | 59 +-
.../maven/project/artifact/ProjectArtifact.java | 67 +-
.../project/artifact/ProjectArtifactMetadata.java | 78 +-
.../project/artifact/ProjectArtifactsCache.java | 43 +-
.../project/collector/DefaultProjectsSelector.java | 72 +-
.../collector/MultiModuleCollectionStrategy.java | 174 +-
.../collector/PomlessCollectionStrategy.java | 38 +-
.../collector/ProjectCollectionStrategy.java | 12 +-
.../maven/project/collector/ProjectsSelector.java | 14 +-
.../collector/RequestPomCollectionStrategy.java | 31 +-
.../apache/maven/project/path/PathTranslator.java | 17 +-
.../properties/internal/EnvironmentUtils.java | 30 +-
.../properties/internal/SystemProperties.java | 25 +-
.../repository/ArtifactDoesNotExistException.java | 17 +-
.../maven/repository/ArtifactTransferEvent.java | 166 +-
.../ArtifactTransferFailedException.java | 18 +-
.../maven/repository/ArtifactTransferListener.java | 19 +-
.../maven/repository/ArtifactTransferResource.java | 7 +-
.../DelegatingLocalArtifactRepository.java | 118 +-
.../maven/repository/LocalArtifactRepository.java | 9 +-
.../LocalRepositoryNotAccessibleException.java | 20 +-
.../apache/maven/repository/RepositorySystem.java | 90 +-
.../legacy/metadata/AbstractArtifactMetadata.java | 34 +-
.../ArtifactMetadataRetrievalException.java | 35 +-
.../legacy/metadata/ArtifactMetadataSource.java | 34 +-
.../metadata/DefaultMetadataResolutionRequest.java | 66 +-
.../legacy/metadata/MetadataResolutionRequest.java | 19 +-
.../legacy/metadata/ResolutionGroup.java | 41 +-
.../apache/maven/rtinfo/RuntimeInformation.java | 9 +-
.../rtinfo/internal/DefaultRuntimeInformation.java | 108 +-
.../maven/session/scope/internal/SessionScope.java | 103 +-
.../session/scope/internal/SessionScopeModule.java | 40 +-
.../settings/DefaultMavenSettingsBuilder.java | 109 +-
.../maven/settings/MavenSettingsBuilder.java | 25 +-
.../settings/SettingsConfigurationException.java | 37 +-
.../org/apache/maven/settings/SettingsUtils.java | 242 +-
.../apache/maven/toolchain/DefaultToolchain.java | 100 +-
.../maven/toolchain/DefaultToolchainManager.java | 114 +-
.../toolchain/DefaultToolchainManagerPrivate.java | 68 +-
.../maven/toolchain/DefaultToolchainsBuilder.java | 46 +-
.../toolchain/MisconfiguredToolchainException.java | 21 +-
.../apache/maven/toolchain/RequirementMatcher.java | 12 +-
.../maven/toolchain/RequirementMatcherFactory.java | 76 +-
.../java/org/apache/maven/toolchain/Toolchain.java | 12 +-
.../apache/maven/toolchain/ToolchainFactory.java | 14 +-
.../apache/maven/toolchain/ToolchainManager.java | 14 +-
.../maven/toolchain/ToolchainManagerPrivate.java | 14 +-
.../apache/maven/toolchain/ToolchainPrivate.java | 15 +-
.../apache/maven/toolchain/ToolchainsBuilder.java | 11 +-
.../maven/toolchain/java/DefaultJavaToolChain.java | 25 +-
.../apache/maven/toolchain/java/JavaToolchain.java | 75 +-
.../maven/toolchain/java/JavaToolchainFactory.java | 86 +-
.../maven/toolchain/java/JavaToolchainImpl.java | 52 +-
.../DefaultConsumerPomXMLFilterFactory.java | 13 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 285 +--
.../java/org/apache/maven/DefaultMavenTest.java | 90 +-
.../maven/MavenLifecycleParticipantTest.java | 172 +-
.../src/test/java/org/apache/maven/MavenTest.java | 66 +-
.../maven/ProjectDependenciesResolverTest.java | 87 +-
.../artifact/handler/ArtifactHandlerTest.java | 105 +-
.../filter/ExclusionArtifactFilterTest.java | 142 +-
.../DefaultBeanConfiguratorPathTest.java | 87 +-
.../configuration/DefaultBeanConfiguratorTest.java | 86 +-
.../exception/DefaultExceptionHandlerTest.java | 56 +-
.../DefaultBuildResumptionAnalyzerTest.java | 149 +-
.../DefaultBuildResumptionDataRepositoryTest.java | 78 +-
.../DefaultMavenExecutionRequestPopulatorTest.java | 38 +-
.../maven/execution/DefaultMavenExecutionTest.java | 32 +-
.../scope/internal/MojoExecutionScopeTest.java | 95 +-
.../maven/graph/DefaultGraphBuilderTest.java | 601 ++---
.../graph/DefaultProjectDependencyGraphTest.java | 183 +-
.../apache/maven/graph/ProjectSelectorTest.java | 215 +-
.../maven/internal/MultilineMessageHelperTest.java | 72 +-
.../aether/ConsumerModelSourceTransformerTest.java | 40 +-
.../maven/internal/impl/PropertiesAsMapTest.java | 48 +-
.../org/apache/maven/internal/impl/TestApi.java | 85 +-
.../maven/internal/impl/TestArtifactHandler.java | 37 +-
.../maven/internal/impl/TestRepositorySystem.java | 313 ++-
.../maven/lifecycle/DefaultLifecyclesTest.java | 138 +-
.../lifecycle/DelegatingMojoExecutionListener.java | 48 +-
.../DelegatingProjectExecutionListener.java | 56 +-
.../lifecycle/EmptyLifecyclePluginAnalyzer.java | 47 +-
.../lifecycle/LifecycleExecutorSubModulesTest.java | 65 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 733 +++---
.../maven/lifecycle/MavenExecutionPlanTest.java | 73 +-
.../lifecycle/MojoExecutionXPathContainer.java | 48 +-
.../internal/BuildListCalculatorTest.java | 68 +-
.../internal/ConcurrencyDependencyGraphTest.java | 110 +-
.../internal/LifecycleDependencyResolverTest.java | 61 +-
.../LifecycleExecutionPlanCalculatorTest.java | 97 +-
.../internal/LifecycleModuleBuilderTest.java | 94 +-
.../LifecycleTaskSegmentCalculatorImplTest.java | 40 +-
.../lifecycle/internal/PhaseRecorderTest.java | 55 +-
.../lifecycle/internal/ProjectBuildListTest.java | 52 +-
.../internal/builder/BuilderCommonTest.java | 116 +-
.../ConcurrencyDependencyGraphTest.java | 86 +-
.../multithreaded/ThreadOutputMuxerTest.java | 142 +-
.../internal/stub/BuildPluginManagerStub.java | 50 +-
.../internal/stub/CompletionServiceStub.java | 73 +-
.../internal/stub/DefaultLifecyclesStub.java | 90 +-
.../internal/stub/ExecutionEventCatapultStub.java | 18 +-
.../internal/stub/LifeCyclePluginAnalyzerStub.java | 75 +-
.../stub/LifecycleExecutionPlanCalculatorStub.java | 275 ++-
.../stub/LifecycleTaskSegmentCalculatorStub.java | 83 +-
.../lifecycle/internal/stub/MojoExecutorStub.java | 79 +-
.../internal/stub/PluginPrefixResolverStub.java | 46 +-
.../internal/stub/PluginVersionResolverStub.java | 43 +-
.../stub/ProjectDependenciesResolverStub.java | 102 +-
.../internal/stub/ProjectDependencyGraphStub.java | 198 +-
.../stub/ProjectDependencyGraphStubTest.java | 72 +-
.../lifecycle/mapping/LifecyclePhaseTest.java | 75 +-
.../org/apache/maven/plugin/PluginManagerTest.java | 223 +-
.../maven/plugin/PluginParameterExceptionTest.java | 192 +-
.../PluginParameterExpressionEvaluatorTest.java | 369 ++-
.../plugin/internal/DefaultLegacySupportTest.java | 20 +-
.../plugin/internal/MavenPluginValidatorTest.java | 110 +-
.../project/AbstractMavenProjectTestCase.java | 144 +-
.../project/DefaultMavenProjectBuilderTest.java | 415 ++--
.../maven/project/EmptyLifecycleExecutor.java | 68 +-
.../maven/project/EmptyProjectBuildingHelper.java | 35 +-
.../project/ExtensionDescriptorBuilderTest.java | 64 +-
.../project/LegacyLocalRepositoryManager.java | 138 +-
.../org/apache/maven/project/MavenProjectTest.java | 211 +-
.../apache/maven/project/PomConstructionTest.java | 2343 +++++++++-----------
.../apache/maven/project/ProjectBuilderTest.java | 398 ++--
.../ProjectBuildingResultWithLocationMatcher.java | 62 +-
...ectBuildingResultWithProblemMessageMatcher.java | 56 +-
.../maven/project/ProjectModelResolverTest.java | 214 +-
.../apache/maven/project/ProjectSorterTest.java | 348 ++-
.../apache/maven/project/TestMetadataSource.java | 38 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 55 +-
.../artifact/DefaultProjectArtifactsCacheTest.java | 57 +-
.../project/artifact/MavenMetadataSourceTest.java | 24 +-
.../canonical/CanonicalProjectBuilderTest.java | 58 +-
.../maven/project/harness/PomTestWrapper.java | 70 +-
.../project/harness/Xpp3DomAttributeIterator.java | 38 +-
.../project/harness/Xpp3DomAttributePointer.java | 48 +-
.../maven/project/harness/Xpp3DomNodeIterator.java | 83 +-
.../maven/project/harness/Xpp3DomNodePointer.java | 89 +-
.../project/harness/Xpp3DomPointerFactory.java | 40 +-
.../maven/repository/TestArtifactHandler.java | 37 +-
.../maven/repository/TestRepositoryConnector.java | 128 +-
.../repository/TestRepositoryConnectorFactory.java | 21 +-
.../maven/repository/TestRepositorySystem.java | 311 ++-
.../internal/DefaultRuntimeInformationTest.java | 44 +-
.../settings/PomConstructionWithSettingsTest.java | 98 +-
.../apache/maven/settings/SettingsUtilsTest.java | 156 +-
.../DefaultToolchainManagerPrivateTest.java | 104 +-
.../toolchain/DefaultToolchainManagerTest.java | 111 +-
.../maven/toolchain/DefaultToolchainTest.java | 129 +-
.../toolchain/RequirementMatcherFactoryTest.java | 50 +-
maven-embedder/pom.xml | 2 -
.../main/java/org/apache/maven/embedder/App.java | 15 -
.../java/org/apache/maven/embedder/AppTest.java | 15 -
.../main/java/org/apache/maven/cli/CLIManager.java | 258 ++-
.../org/apache/maven/cli/CLIReportingUtils.java | 167 +-
.../java/org/apache/maven/cli/CleanArgument.java | 80 +-
.../main/java/org/apache/maven/cli/CliRequest.java | 50 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 1672 ++++++--------
.../java/org/apache/maven/cli/ResolveFile.java | 28 +-
.../cli/configuration/ConfigurationProcessor.java | 9 +-
.../SettingsXmlConfigurationProcessor.java | 199 +-
.../maven/cli/event/DefaultEventSpyContext.java | 12 +-
.../maven/cli/event/ExecutionEventLogger.java | 460 ++--
.../internal/BootstrapCoreExtensionManager.java | 177 +-
.../cli/internal/ExtensionResolutionException.java | 22 +-
.../maven/cli/logging/BaseSlf4jConfiguration.java | 19 +-
.../maven/cli/logging/Slf4jConfiguration.java | 15 +-
.../cli/logging/Slf4jConfigurationFactory.java | 36 +-
.../org/apache/maven/cli/logging/Slf4jLogger.java | 89 +-
.../maven/cli/logging/Slf4jLoggerManager.java | 47 +-
.../maven/cli/logging/Slf4jStdoutLogger.java | 253 +--
.../cli/logging/impl/Log4j2Configuration.java | 18 +-
.../cli/logging/impl/LogbackConfiguration.java | 18 +-
.../cli/logging/impl/Slf4jSimpleConfiguration.java | 18 +-
.../impl/UnsupportedSlf4jBindingConfiguration.java | 32 +-
.../transfer/AbstractMavenTransferListener.java | 200 +-
.../transfer/BatchModeMavenTransferListener.java | 15 +-
.../cli/transfer/ConsoleMavenTransferListener.java | 127 +-
.../cli/transfer/QuietMavenTransferListener.java | 11 +-
.../cli/transfer/Slf4jMavenTransferListener.java | 68 +-
.../sisu/plexus/PlexusXmlBeanConverter.java | 359 ++-
.../src/main/java/org/slf4j/MavenSlf4jFriend.java | 9 +-
.../org/slf4j/impl/MavenSlf4jSimpleFriend.java | 14 +-
.../maven/cli/CLIManagerDocumentationTest.java | 93 +-
.../apache/maven/cli/CLIReportingUtilsTest.java | 31 +-
.../org/apache/maven/cli/CleanArgumentTest.java | 44 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 520 ++---
.../maven/cli/event/ExecutionEventLoggerTest.java | 300 ++-
.../maven/cli/transfer/FileSizeFormatTest.java | 342 ++-
maven-model-builder/pom.xml | 2 -
.../java/org/apache/maven/feature/Features.java | 33 +-
.../building/AbstractModelBuildingListener.java | 11 +-
.../building/AbstractModelSourceTransformer.java | 11 +-
.../maven/model/building/ArtifactModelSource.java | 44 +-
.../building/BuildModelSourceTransformer.java | 18 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 61 +-
.../maven/model/building/DefaultModelBuilder.java | 2065 ++++++++---------
.../model/building/DefaultModelBuilderFactory.java | 187 +-
.../model/building/DefaultModelBuildingEvent.java | 20 +-
.../building/DefaultModelBuildingRequest.java | 239 +-
.../model/building/DefaultModelBuildingResult.java | 118 +-
.../maven/model/building/DefaultModelProblem.java | 110 +-
.../building/DefaultModelProblemCollector.java | 131 +-
.../model/building/DefaultModelProcessor.java | 40 +-
.../building/DefaultModelSourceTransformer.java | 13 +-
.../model/building/DefaultTransformerContext.java | 88 +-
.../maven/model/building/FileModelSource.java | 55 +-
.../maven/model/building/FileToRawModelMerger.java | 192 +-
.../model/building/FilterModelBuildingRequest.java | 165 +-
.../apache/maven/model/building/ModelBuilder.java | 16 +-
.../maven/model/building/ModelBuildingEvent.java | 7 +-
.../model/building/ModelBuildingEventCatapult.java | 9 +-
.../model/building/ModelBuildingException.java | 111 +-
.../model/building/ModelBuildingListener.java | 9 +-
.../maven/model/building/ModelBuildingRequest.java | 46 +-
.../maven/model/building/ModelBuildingResult.java | 12 +-
.../apache/maven/model/building/ModelCache.java | 41 +-
.../apache/maven/model/building/ModelCacheTag.java | 57 +-
.../org/apache/maven/model/building/ModelData.java | 45 +-
.../apache/maven/model/building/ModelProblem.java | 17 +-
.../model/building/ModelProblemCollector.java | 9 +-
.../model/building/ModelProblemCollectorExt.java | 7 +-
.../building/ModelProblemCollectorRequest.java | 38 +-
.../maven/model/building/ModelProblemUtils.java | 113 +-
.../maven/model/building/ModelProcessor.java | 10 +-
.../apache/maven/model/building/ModelSource.java | 8 +-
.../apache/maven/model/building/ModelSource2.java | 9 +-
.../model/building/ModelSourceTransformer.java | 11 +-
.../org/apache/maven/model/building/Result.java | 146 +-
.../maven/model/building/StringModelSource.java | 17 +-
.../maven/model/building/TransformerContext.java | 13 +-
.../model/building/TransformerContextBuilder.java | 8 +-
.../maven/model/building/TransformerException.java | 19 +-
.../maven/model/building/UrlModelSource.java | 13 +-
.../DefaultDependencyManagementImporter.java | 44 +-
.../composition/DependencyManagementImporter.java | 15 +-
.../inheritance/DefaultInheritanceAssembler.java | 317 ++-
.../model/inheritance/InheritanceAssembler.java | 11 +-
.../AbstractStringBasedModelInterpolator.java | 160 +-
.../interpolation/BuildTimestampValueSource.java | 23 +-
.../DefaultModelVersionProcessor.java | 39 +-
.../model/interpolation/MavenBuildTimestamp.java | 50 +-
.../model/interpolation/ModelInterpolator.java | 22 +-
.../model/interpolation/ModelVersionProcessor.java | 14 +-
.../PathTranslatingPostProcessor.java | 38 +-
.../StringVisitorModelInterpolator.java | 86 +-
.../interpolation/UrlNormalizingPostProcessor.java | 35 +-
.../apache/maven/model/io/DefaultModelReader.java | 136 +-
.../apache/maven/model/io/DefaultModelWriter.java | 67 +-
.../apache/maven/model/io/ModelParseException.java | 26 +-
.../org/apache/maven/model/io/ModelReader.java | 17 +-
.../org/apache/maven/model/io/ModelWriter.java | 26 +-
.../maven/model/locator/DefaultModelLocator.java | 14 +-
.../apache/maven/model/locator/ModelLocator.java | 9 +-
.../DefaultDependencyManagementInjector.java | 95 +-
.../DefaultPluginManagementInjector.java | 103 +-
.../management/DependencyManagementInjector.java | 9 +-
.../model/management/PluginManagementInjector.java | 9 +-
.../apache/maven/model/merge/MavenModelMerger.java | 671 +++---
.../normalization/DefaultModelNormalizer.java | 114 +-
.../maven/model/normalization/ModelNormalizer.java | 11 +-
.../model/path/DefaultModelPathTranslator.java | 105 +-
.../model/path/DefaultModelUrlNormalizer.java | 46 +-
.../maven/model/path/DefaultPathTranslator.java | 34 +-
.../maven/model/path/DefaultUrlNormalizer.java | 46 +-
.../maven/model/path/ModelPathTranslator.java | 12 +-
.../maven/model/path/ModelUrlNormalizer.java | 11 +-
.../apache/maven/model/path/PathTranslator.java | 11 +-
.../ProfileActivationFilePathInterpolator.java | 54 +-
.../org/apache/maven/model/path/UrlNormalizer.java | 11 +-
.../plugin/DefaultPluginConfigurationExpander.java | 41 +-
.../plugin/DefaultReportConfigurationExpander.java | 30 +-
.../model/plugin/DefaultReportingConverter.java | 218 +-
.../model/plugin/LifecycleBindingsInjector.java | 9 +-
.../model/plugin/PluginConfigurationExpander.java | 9 +-
.../model/plugin/ReportConfigurationExpander.java | 9 +-
.../maven/model/plugin/ReportingConverter.java | 9 +-
.../profile/DefaultProfileActivationContext.java | 128 +-
.../model/profile/DefaultProfileInjector.java | 240 +-
.../model/profile/DefaultProfileSelector.java | 104 +-
.../model/profile/ProfileActivationContext.java | 9 +-
.../maven/model/profile/ProfileInjector.java | 9 +-
.../maven/model/profile/ProfileSelector.java | 12 +-
.../profile/activation/FileProfileActivator.java | 68 +-
.../activation/JdkVersionProfileActivator.java | 170 +-
.../OperatingSystemProfileActivator.java | 91 +-
.../model/profile/activation/ProfileActivator.java | 11 +-
.../activation/PropertyProfileActivator.java | 65 +-
.../resolution/InvalidRepositoryException.java | 21 +-
.../maven/model/resolution/ModelResolver.java | 62 +-
.../resolution/UnresolvableModelException.java | 46 +-
.../model/resolution/WorkspaceModelResolver.java | 19 +-
.../model/superpom/DefaultSuperPomProvider.java | 55 +-
.../maven/model/superpom/SuperPomProvider.java | 9 +-
.../model/validation/DefaultModelValidator.java | 1938 +++++++++-------
.../maven/model/validation/ModelValidator.java | 16 +-
.../model/building/ComplexActivationTest.java | 49 +-
.../building/DefaultModelBuilderFactoryTest.java | 94 +-
.../model/building/DefaultModelBuilderTest.java | 174 +-
.../maven/model/building/FileModelSourceTest.java | 54 +-
.../model/building/FileToRawModelMergerTest.java | 71 +-
.../model/building/SimpleProblemCollector.java | 42 +-
.../DefaultInheritanceAssemblerTest.java | 180 +-
.../AbstractModelInterpolatorTest.java | 421 ++--
.../interpolation/MavenBuildTimestampTest.java | 23 +-
.../StringVisitorModelInterpolatorTest.java | 13 +-
.../maven/model/merge/MavenModelMergerTest.java | 103 +-
.../maven/model/path/DefaultUrlNormalizerTest.java | 69 +-
.../activation/AbstractProfileActivatorTest.java | 29 +-
.../activation/FileProfileActivatorTest.java | 102 +-
.../activation/JdkVersionProfileActivatorTest.java | 214 +-
.../activation/PropertyProfileActivatorTest.java | 150 +-
.../validation/DefaultModelValidatorTest.java | 939 ++++----
maven-model-transform/pom.xml | 4 +-
.../transform/BuildToRawPomXMLFilterFactory.java | 57 +-
.../maven/model/transform/CiFriendlyXMLFilter.java | 47 +-
.../maven/model/transform/FastForwardFilter.java | 58 +-
.../maven/model/transform/ModulesXMLFilter.java | 17 +-
.../maven/model/transform/ParentXMLFilter.java | 125 +-
.../RawToConsumerPomXMLFilterFactory.java | 22 +-
.../transform/ReactorDependencyXMLFilter.java | 79 +-
.../model/transform/RelativePathXMLFilter.java | 40 +-
.../maven/model/transform/RelativeProject.java | 18 +-
.../model/transform/pull/BufferingParser.java | 410 ++--
.../model/transform/pull/NodeBufferingParser.java | 41 +-
.../maven/model/transform/pull/XmlUtils.java | 97 +-
.../model/transform/AbstractXMLFilterTests.java | 29 +-
.../model/transform/CiFriendlyXMLFilterTest.java | 37 +-
.../model/transform/ConsumerPomXMLFilterTest.java | 333 ++-
.../model/transform/ModulesXMLFilterTest.java | 93 +-
.../maven/model/transform/ParentXMLFilterTest.java | 392 ++--
.../transform/ReactorDependencyXMLFilterTest.java | 164 +-
.../model/transform/RelativePathXMLFilterTest.java | 155 +-
maven-model/pom.xml | 6 +-
.../java/org/apache/maven/model/BaseObject.java | 41 +-
.../java/org/apache/maven/model/InputLocation.java | 357 ++-
.../apache/maven/model/InputLocationTracker.java | 26 +-
.../java/org/apache/maven/model/InputSource.java | 112 +-
.../java/org/apache/maven/model/WrapperList.java | 108 +-
.../org/apache/maven/model/WrapperProperties.java | 309 +--
.../maven/model/io/xpp3/MavenXpp3Reader.java | 84 +-
.../maven/model/io/xpp3/MavenXpp3ReaderEx.java | 86 +-
.../maven/model/io/xpp3/MavenXpp3Writer.java | 47 +-
.../maven/model/io/xpp3/MavenXpp3WriterEx.java | 70 +-
.../apache/maven/model/io/xpp3/package-info.java | 19 -
.../org/apache/maven/model/merge/package-info.java | 19 -
.../org/apache/maven/model/ActivationFileTest.java | 31 +-
.../org/apache/maven/model/ActivationOSTest.java | 31 +-
.../apache/maven/model/ActivationPropertyTest.java | 31 +-
.../org/apache/maven/model/ActivationTest.java | 31 +-
.../java/org/apache/maven/model/BuildTest.java | 31 +-
.../org/apache/maven/model/CiManagementTest.java | 31 +-
.../org/apache/maven/model/ContributorTest.java | 31 +-
.../maven/model/DependencyManagementTest.java | 31 +-
.../org/apache/maven/model/DependencyTest.java | 31 +-
.../maven/model/DeploymentRepositoryTest.java | 31 +-
.../java/org/apache/maven/model/DeveloperTest.java | 31 +-
.../maven/model/DistributionManagementTest.java | 31 +-
.../java/org/apache/maven/model/ExclusionTest.java | 31 +-
.../java/org/apache/maven/model/ExtensionTest.java | 31 +-
.../apache/maven/model/IssueManagementTest.java | 31 +-
.../java/org/apache/maven/model/LicenseTest.java | 31 +-
.../org/apache/maven/model/MailingListTest.java | 31 +-
.../java/org/apache/maven/model/ModelTest.java | 31 +-
.../java/org/apache/maven/model/NotifierTest.java | 31 +-
.../org/apache/maven/model/OrganizationTest.java | 31 +-
.../java/org/apache/maven/model/ParentTest.java | 31 +-
.../maven/model/PluginConfigurationTest.java | 31 +-
.../apache/maven/model/PluginContainerTest.java | 31 +-
.../apache/maven/model/PluginExecutionTest.java | 31 +-
.../apache/maven/model/PluginManagementTest.java | 31 +-
.../java/org/apache/maven/model/PluginTest.java | 31 +-
.../org/apache/maven/model/PrerequisitesTest.java | 31 +-
.../java/org/apache/maven/model/ProfileTest.java | 31 +-
.../org/apache/maven/model/RelocationTest.java | 31 +-
.../org/apache/maven/model/ReportPluginTest.java | 31 +-
.../java/org/apache/maven/model/ReportSetTest.java | 31 +-
.../java/org/apache/maven/model/ReportingTest.java | 31 +-
.../apache/maven/model/RepositoryPolicyTest.java | 31 +-
.../org/apache/maven/model/RepositoryTest.java | 31 +-
.../java/org/apache/maven/model/ResourceTest.java | 31 +-
.../test/java/org/apache/maven/model/ScmTest.java | 31 +-
.../org/apache/maven/model/SerializationTest.java | 33 +-
.../test/java/org/apache/maven/model/SiteTest.java | 31 +-
.../apache/maven/model/merge/MavenMergerTest.java | 65 +-
.../org/apache/maven/model/v4/ModelXmlTest.java | 49 +-
maven-plugin-api/pom.xml | 4 +-
.../java/org/apache/maven/plugin/AbstractMojo.java | 25 +-
.../plugin/AbstractMojoExecutionException.java | 30 +-
.../org/apache/maven/plugin/ContextEnabled.java | 10 +-
.../main/java/org/apache/maven/plugin/Mojo.java | 13 +-
.../maven/plugin/MojoExecutionException.java | 35 +-
.../apache/maven/plugin/MojoFailureException.java | 30 +-
.../apache/maven/plugin/MojoNotFoundException.java | 50 +-
.../DuplicateMojoDescriptorException.java | 21 +-
.../descriptor/DuplicateParameterException.java | 15 +-
.../descriptor/InvalidParameterException.java | 21 +-
.../InvalidPluginDescriptorException.java | 20 +-
.../maven/plugin/descriptor/MojoDescriptor.java | 253 +--
.../apache/maven/plugin/descriptor/Parameter.java | 105 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 291 +--
.../plugin/descriptor/PluginDescriptorBuilder.java | 373 ++--
.../maven/plugin/descriptor/Requirement.java | 34 +-
.../plugin/lifecycle/ImmutableCollections.java | 488 ++--
.../java/org/apache/maven/plugin/logging/Log.java | 32 +-
.../maven/plugin/logging/SystemStreamLog.java | 116 +-
.../plugin/descriptor/MojoDescriptorTest.java | 47 +-
.../descriptor/PluginDescriptorBuilderTest.java | 192 +-
maven-repository-metadata/pom.xml | 2 -
.../artifact/repository/metadata/MetadataTest.java | 291 ++-
maven-resolver-provider/pom.xml | 3 -
.../internal/ArtifactDescriptorReaderDelegate.java | 120 +-
.../internal/ArtifactDescriptorUtils.java | 49 +-
.../internal/DefaultArtifactDescriptorReader.java | 289 ++-
.../repository/internal/DefaultModelCache.java | 147 +-
.../internal/DefaultModelCacheFactory.java | 13 +-
.../repository/internal/DefaultModelResolver.java | 257 +--
.../internal/DefaultVersionRangeResolver.java | 264 +--
.../internal/DefaultVersionResolver.java | 514 ++---
.../internal/DefaultVersionSchemeProvider.java | 18 +-
.../repository/internal/LocalSnapshotMetadata.java | 108 +-
.../internal/LocalSnapshotMetadataGenerator.java | 44 +-
.../maven/repository/internal/MavenMetadata.java | 93 +-
.../internal/MavenRepositorySystemUtils.java | 64 +-
.../repository/internal/MavenResolverModule.java | 58 +-
.../repository/internal/MavenSnapshotMetadata.java | 53 +-
.../repository/internal/MavenWorkspaceReader.java | 12 +-
.../repository/internal/ModelCacheFactory.java | 9 +-
.../maven/repository/internal/PluginsMetadata.java | 64 +-
.../internal/PluginsMetadataGenerator.java | 108 +-
.../internal/PluginsMetadataGeneratorFactory.java | 25 +-
.../repository/internal/RelocatedArtifact.java | 106 +-
.../internal/RemoteSnapshotMetadata.java | 104 +-
.../internal/RemoteSnapshotMetadataGenerator.java | 64 +-
.../internal/SnapshotMetadataGeneratorFactory.java | 25 +-
.../repository/internal/VersionsMetadata.java | 88 +-
.../internal/VersionsMetadataGenerator.java | 58 +-
.../internal/VersionsMetadataGeneratorFactory.java | 25 +-
.../maven/repository/internal/package-info.java | 19 -
.../internal/AbstractRepositoryTestCase.java | 40 +-
.../DefaultArtifactDescriptorReaderTest.java | 58 +-
.../internal/DefaultModelResolverTest.java | 204 +-
.../internal/DefaultVersionResolverTest.java | 62 +-
.../internal/MavenRepositorySystemUtilsTest.java | 16 +-
.../internal/RemoteSnapshotMetadataTest.java | 47 +-
.../repository/internal/RepositorySystemTest.java | 237 +-
.../internal/util/ConsoleRepositoryListener.java | 110 +-
.../internal/util/ConsoleTransferListener.java | 154 +-
maven-settings-builder/pom.xml | 2 -
.../settings/building/DefaultSettingsBuilder.java | 229 +-
.../building/DefaultSettingsBuilderFactory.java | 23 +-
.../building/DefaultSettingsBuildingRequest.java | 72 +-
.../building/DefaultSettingsBuildingResult.java | 20 +-
.../settings/building/DefaultSettingsProblem.java | 98 +-
.../building/DefaultSettingsProblemCollector.java | 30 +-
.../settings/building/FileSettingsSource.java | 16 +-
.../maven/settings/building/SettingsBuilder.java | 10 +-
.../building/SettingsBuildingException.java | 52 +-
.../settings/building/SettingsBuildingRequest.java | 19 +-
.../settings/building/SettingsBuildingResult.java | 8 +-
.../maven/settings/building/SettingsProblem.java | 12 +-
.../building/SettingsProblemCollector.java | 9 +-
.../maven/settings/building/SettingsSource.java | 8 +-
.../settings/building/StringSettingsSource.java | 21 +-
.../maven/settings/building/UrlSettingsSource.java | 17 +-
.../settings/crypto/DefaultSettingsDecrypter.java | 88 +-
.../crypto/DefaultSettingsDecryptionRequest.java | 47 +-
.../crypto/DefaultSettingsDecryptionResult.java | 37 +-
.../crypto/MavenSecDispatcherProvider.java | 25 +-
.../maven/settings/crypto/SettingsDecrypter.java | 9 +-
.../settings/crypto/SettingsDecryptionRequest.java | 12 +-
.../settings/crypto/SettingsDecryptionResult.java | 8 +-
.../maven/settings/io/DefaultSettingsReader.java | 59 +-
.../maven/settings/io/DefaultSettingsWriter.java | 49 +-
.../maven/settings/io/SettingsParseException.java | 26 +-
.../apache/maven/settings/io/SettingsReader.java | 17 +-
.../apache/maven/settings/io/SettingsWriter.java | 17 +-
.../maven/settings/merge/MavenSettingsMerger.java | 84 +-
.../validation/DefaultSettingsValidator.java | 272 +--
.../settings/validation/SettingsValidator.java | 11 +-
.../DefaultSettingsBuilderFactoryTest.java | 33 +-
.../validation/DefaultSettingsValidatorTest.java | 261 ++-
maven-settings/pom.xml | 6 +-
.../org/apache/maven/settings/WrapperList.java | 108 +-
.../apache/maven/settings/WrapperProperties.java | 307 +--
.../maven/settings/io/xpp3/SettingsXpp3Reader.java | 85 +-
.../maven/settings/io/xpp3/SettingsXpp3Writer.java | 48 +-
maven-slf4j-provider/pom.xml | 10 +-
.../org/slf4j/impl/MavenFailOnSeverityLogger.java | 81 +-
.../java/org/slf4j/impl/MavenLoggerFactory.java | 52 +-
.../java/org/slf4j/impl/MavenSimpleLogger.java | 92 +-
.../java/org/slf4j/impl/StaticLoggerBinder.java | 21 +-
.../org/slf4j/impl/MavenLoggerFactoryTest.java | 78 +-
maven-slf4j-wrapper/pom.xml | 8 +-
.../apache/maven/logwrapper/LogLevelRecorder.java | 46 +-
.../maven/logwrapper/MavenSlf4jWrapperFactory.java | 12 +-
.../maven/logwrapper/LogLevelRecorderTest.java | 52 +-
maven-toolchain-builder/pom.xml | 6 +-
.../building/DefaultToolchainsBuilder.java | 197 +-
.../building/DefaultToolchainsBuildingRequest.java | 20 +-
.../building/DefaultToolchainsBuildingResult.java | 20 +-
.../toolchain/building/ToolchainsBuilder.java | 10 +-
.../building/ToolchainsBuildingException.java | 52 +-
.../building/ToolchainsBuildingRequest.java | 10 +-
.../building/ToolchainsBuildingResult.java | 8 +-
.../toolchain/io/DefaultToolchainsReader.java | 59 +-
.../toolchain/io/DefaultToolchainsWriter.java | 29 +-
.../toolchain/io/ToolchainsParseException.java | 26 +-
.../maven/toolchain/io/ToolchainsReader.java | 17 +-
.../maven/toolchain/io/ToolchainsWriter.java | 14 +-
.../toolchain/merge/MavenToolchainMerger.java | 71 +-
.../building/DefaultToolchainsBuilderTest.java | 377 ++--
.../building/ToolchainsBuildingExceptionTest.java | 69 +-
.../toolchain/merge/MavenToolchainMergerTest.java | 165 +-
maven-toolchain-model/pom.xml | 172 +-
.../apache/maven/toolchain/model/WrapperList.java | 108 +-
.../maven/toolchain/model/WrapperProperties.java | 307 +--
maven-xml-impl/pom.xml | 58 +-
.../org/apache/maven/internal/xml/DomBuilder.java | 67 +-
.../maven/internal/xml/MavenXmlException.java | 30 +-
.../maven/internal/xml/XmlPlexusConfiguration.java | 59 +-
.../org/apache/maven/internal/xml/Xpp3Dom.java | 311 +--
.../apache/maven/internal/xml/Xpp3DomBuilder.java | 143 +-
.../apache/maven/internal/xml/Xpp3DomWriter.java | 52 +-
.../apache/maven/internal/xml/package-info.java | 19 -
.../java/org/codehaus/plexus/util/xml/Xpp3Dom.java | 282 +--
.../codehaus/plexus/util/xml/Xpp3DomBuilder.java | 74 +-
.../org/codehaus/plexus/util/xml/package-info.java | 19 -
plexus-utils/pom.xml | 282 ++-
pom.xml | 183 +-
1278 files changed, 48362 insertions(+), 67304 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 7acd55ddd..a443d0b51 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -100,6 +98,19 @@ under the License.
</dependency>
</dependencies>
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>apache.snapshots</id>
+ <url>https://repository.apache.org/snapshots/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<finalName>${distributionFileName}</finalName>
<pluginManagement>
@@ -179,10 +190,10 @@ under the License.
<executions>
<execution>
<id>create-distro-packages</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/assembly/bin.xml</descriptor>
@@ -194,19 +205,6 @@ under the License.
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <url>https://repository.apache.org/snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
<profiles>
<profile>
<id>create-distribution-in-dir</id>
@@ -222,10 +220,10 @@ under the License.
<artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
+ <id>clean-target-dir</id>
<goals>
<goal>clean</goal>
</goals>
- <id>clean-target-dir</id>
<phase>prepare-package</phase>
<configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories>
@@ -243,10 +241,10 @@ under the License.
<executions>
<execution>
<id>create-distribution-dir</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<finalName>./</finalName>
<appendAssemblyId>false</appendAssemblyId>
@@ -271,10 +269,10 @@ under the License.
<executions>
<execution>
<id>make-src-assembly</id>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/assembly/src.xml</descriptor>
@@ -288,14 +286,6 @@ under the License.
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>source-release-checksum</id>
- <goals>
- <goal>files</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<fileSets>
<fileSet>
@@ -310,6 +300,14 @@ under the License.
</fileSets>
<failIfNoFiles>true</failIfNoFiles>
</configuration>
+ <executions>
+ <execution>
+ <id>source-release-checksum</id>
+ <goals>
+ <goal>files</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
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 7d1853b7a..fb7544ec1 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
@@ -1,5 +1,3 @@
-package org.apache.maven.settings;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,39 +16,34 @@ package org.apache.maven.settings;
* specific language governing permissions and limitations
* under the License.
*/
+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.
*
* @author Benjamin Bentmann
*/
-public class GlobalSettingsTest
-{
+public class GlobalSettingsTest {
@Test
- public void testValidGlobalSettings()
- throws Exception
- {
- String basedir = System.getProperty( "basedir", System.getProperty( "user.dir" ) );
+ public void testValidGlobalSettings() throws Exception {
+ String basedir = System.getProperty("basedir", System.getProperty("user.dir"));
- File globalSettingsFile = new File( basedir, "src/assembly/maven/conf/settings.xml" );
- assertTrue( globalSettingsFile.isFile(), globalSettingsFile.getAbsolutePath() );
+ File globalSettingsFile = new File(basedir, "src/assembly/maven/conf/settings.xml");
+ assertTrue(globalSettingsFile.isFile(), globalSettingsFile.getAbsolutePath());
- try ( Reader reader = new InputStreamReader( new FileInputStream( globalSettingsFile ), StandardCharsets.UTF_8) )
- {
- new SettingsXpp3Reader().read( reader );
+ try (Reader reader = new InputStreamReader(new FileInputStream(globalSettingsFile), StandardCharsets.UTF_8)) {
+ new SettingsXpp3Reader().read(reader);
}
}
-
}
diff --git a/api/maven-api-core/pom.xml b/api/maven-api-core/pom.xml
index fd78f534f..bae7a9368 100644
--- a/api/maven-api-core/pom.xml
+++ b/api/maven-api-core/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java
index d222789f7..b9a29e919 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Artifact.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
@@ -30,8 +29,7 @@ import org.apache.maven.api.annotations.Nonnull;
*/
@Experimental
@Immutable
-public interface Artifact
-{
+public interface Artifact {
/**
* Returns a unique identifier for this artifact.
@@ -39,13 +37,15 @@ public interface Artifact
*
* @return the unique identifier
*/
- default String key()
- {
+ default String key() {
return getGroupId()
- + ':' + getArtifactId()
- + ':' + getExtension()
- + ( getClassifier().length() > 0 ? ":" + getClassifier() : "" )
- + ':' + getVersion();
+ + ':'
+ + getArtifactId()
+ + ':'
+ + getExtension()
+ + (getClassifier().length() > 0 ? ":" + getClassifier() : "")
+ + ':'
+ + getVersion();
}
/**
@@ -104,5 +104,4 @@ public interface Artifact
*/
@Nonnull
ArtifactCoordinate toCoordinate();
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/ArtifactCoordinate.java b/api/maven-api-core/src/main/java/org/apache/maven/api/ArtifactCoordinate.java
index 3e66594df..c6ad5ea6e 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/ArtifactCoordinate.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/ArtifactCoordinate.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
@@ -31,8 +30,7 @@ import org.apache.maven.api.annotations.Nonnull;
*/
@Experimental
@Immutable
-public interface ArtifactCoordinate
-{
+public interface ArtifactCoordinate {
/**
* The groupId of the artifact.
@@ -77,13 +75,11 @@ public interface ArtifactCoordinate
/**
* Unique id identifying this artifact
*/
- default String getId()
- {
+ default String getId() {
return getGroupId()
+ ":" + getArtifactId()
+ ":" + getExtension()
- + ( getClassifier().isEmpty() ? "" : ":" + getClassifier() )
+ + (getClassifier().isEmpty() ? "" : ":" + getClassifier())
+ ":" + getVersion();
}
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java
index 20fbc6904..5b7d66627 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Dependency.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,11 +16,11 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Nonnull;
-public interface Dependency extends Artifact
-{
+public interface Dependency extends Artifact {
/**
* The artifact type.
@@ -44,5 +42,4 @@ public interface Dependency extends Artifact
*/
@Nonnull
DependencyCoordinate toCoordinate();
-
}
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 675a00f0d..c24cf191f 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,13 +16,13 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+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;
import org.apache.maven.api.annotations.Nullable;
-import org.apache.maven.api.annotations.Immutable;
-
-import java.util.Collection;
/**
*
@@ -32,8 +30,7 @@ import java.util.Collection;
*/
@Experimental
@Immutable
-public interface DependencyCoordinate extends ArtifactCoordinate
-{
+public interface DependencyCoordinate extends ArtifactCoordinate {
/**
* The type of the artifact.
*
@@ -50,5 +47,4 @@ public interface DependencyCoordinate extends ArtifactCoordinate
@Nonnull
Collection<Exclusion> getExclusions();
-
}
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 4d23939a7..a19479aa8 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,12 +16,12 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
+import java.util.Optional;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
-import java.util.Optional;
-
/**
* Event sent by maven during various phases of the build process.
* Such events can be listened to using {@link Listener}s objects
@@ -32,8 +30,7 @@ import java.util.Optional;
* @since 4.0
*/
@Experimental
-public interface Event
-{
+public interface Event {
/**
* Gets the type of the event.
@@ -73,5 +70,4 @@ public interface Event
* @return the exception or {@code empty()} if none
*/
Optional<Exception> getException();
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/EventType.java b/api/maven-api-core/src/main/java/org/apache/maven/api/EventType.java
index 0279d1222..84d5d6283 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/EventType.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/EventType.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Experimental;
@@ -27,8 +26,7 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public enum EventType
-{
+public enum EventType {
PROJECT_DISCOVERY_STARTED,
SESSION_STARTED,
SESSION_ENDED,
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Exclusion.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Exclusion.java
index 143c6d257..f4615b49d 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Exclusion.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Exclusion.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nullable;
@@ -29,12 +28,10 @@ import org.apache.maven.api.annotations.Nullable;
* @see DependencyCoordinate#getExclusions()
*/
@Experimental
-public interface Exclusion
-{
+public interface Exclusion {
@Nullable
String getGroupId();
@Nullable
String getArtifactId();
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/JavaToolchain.java b/api/maven-api-core/src/main/java/org/apache/maven/api/JavaToolchain.java
index 21eefa490..d06749112 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/JavaToolchain.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/JavaToolchain.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Experimental;
@@ -27,9 +26,7 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public interface JavaToolchain extends Toolchain
-{
+public interface JavaToolchain extends Toolchain {
String getJavaHome();
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Listener.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Listener.java
index 673b5f8ed..ac73a5084 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Listener.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Listener.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Consumer;
import org.apache.maven.api.annotations.Experimental;
@@ -30,8 +29,8 @@ import org.apache.maven.api.annotations.Nonnull;
* @since 4.0
*/
@Experimental
-@FunctionalInterface @Consumer
-public interface Listener
-{
- void onEvent( @Nonnull Event event );
+@FunctionalInterface
+@Consumer
+public interface Listener {
+ void onEvent(@Nonnull Event event);
}
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 4d1101f76..612b1ac94 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,9 +16,9 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+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;
@@ -33,10 +31,8 @@ import org.apache.maven.api.annotations.Nonnull;
*/
@Experimental
@Immutable
-public interface LocalRepository extends Repository
-{
+public interface LocalRepository extends Repository {
@Nonnull
Path getPath();
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/MetadataStorage.java b/api/maven-api-core/src/main/java/org/apache/maven/api/MetadataStorage.java
index 1b988cfc7..021c9698a 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/MetadataStorage.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/MetadataStorage.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Experimental;
@@ -27,8 +26,7 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public enum MetadataStorage
-{
+public enum MetadataStorage {
GROUP,
ARTIFACT,
VERSION
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 0d7ffd1a3..0a8494f7c 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,12 +16,11 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+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;
import org.apache.maven.api.xml.Dom;
@@ -31,8 +28,7 @@ import org.apache.maven.api.xml.Dom;
* A {@code MojoExecution}
*/
@Experimental
-public interface MojoExecution
-{
+public interface MojoExecution {
@Nonnull
Plugin getPlugin();
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 d23c8f60e..13f77bb19 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,15 +16,15 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
-
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Immutable;
-import org.apache.maven.api.annotations.Nonnull;
+package org.apache.maven.api;
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;
/**
* Represents a dependency node within a Maven project's dependency collector.
@@ -36,8 +34,7 @@ import java.util.stream.Stream;
*/
@Experimental
@Immutable
-public interface Node
-{
+public interface Node {
/**
* @return dependency for this node
@@ -70,7 +67,7 @@ public interface Node
* @param visitor the visitor to call back, must not be {@code null}
* @return {@code true} to visit siblings nodes of this node as well, {@code false} to skip siblings
*/
- boolean accept( @Nonnull NodeVisitor visitor );
+ boolean accept(@Nonnull NodeVisitor visitor);
/**
* Returns a new tree starting at this node, filtering the children.
@@ -80,7 +77,7 @@ public interface Node
* @param filter the filter to apply
* @return a new filtered graph
*/
- Node filter( Predicate<Node> filter );
+ Node filter(Predicate<Node> filter);
/**
* Returns a string representation of this dependency node.
@@ -95,9 +92,7 @@ public interface Node
* @return a stream containing this node and its descendant
*/
@Nonnull
- default Stream<Node> stream()
- {
- return Stream.concat( Stream.of( this ), getChildren().stream().flatMap( Node::stream ) );
+ default Stream<Node> stream() {
+ return Stream.concat(Stream.of(this), getChildren().stream().flatMap(Node::stream));
}
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/NodeVisitor.java b/api/maven-api-core/src/main/java/org/apache/maven/api/NodeVisitor.java
index 39ae803ea..0b23fd120 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/NodeVisitor.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/NodeVisitor.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,7 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
-
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Consumer;
import org.apache.maven.api.annotations.Experimental;
@@ -26,21 +24,20 @@ import org.apache.maven.api.annotations.Nonnull;
/**
* Defines a hierarchical visitor for collecting dependency node trees.
- *
+ *
* @since 4.0
*/
@Experimental
@Consumer
-public interface NodeVisitor
-{
+public interface NodeVisitor {
/**
* Starts the visit to the specified dependency node.
- *
+ *
* @param node the dependency node to visit
* @return <code>true</code> to visit the specified dependency node's children, <code>false</code> to skip the
* specified dependency node's children and proceed to its next sibling
*/
- boolean enter( @Nonnull Node node );
+ boolean enter(@Nonnull Node node);
/**
* Ends the visit to the specified dependency node.
@@ -49,5 +46,5 @@ public interface NodeVisitor
* @return <code>true</code> to visit the specified dependency node's next sibling, <code>false</code> to skip the
* specified dependency node's next siblings and proceed to its parent
*/
- boolean leave( @Nonnull Node node );
+ boolean leave(@Nonnull Node node);
}
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 0531724b1..f3c321857 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,11 +16,11 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+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;
@@ -35,8 +33,7 @@ import org.apache.maven.api.model.Model;
* @since 4.0
*/
@Experimental
-public interface Project
-{
+public interface Project {
@Nonnull
String getGroupId();
@@ -57,8 +54,7 @@ public interface Project
Model getModel();
@Nonnull
- default Build getBuild()
- {
+ default Build getBuild() {
Build build = getModel().getBuild();
return build != null ? build : Build.newInstance();
}
@@ -74,9 +70,8 @@ public interface Project
Optional<Path> getPomPath();
@Nonnull
- default Optional<Path> getBasedir()
- {
- return getPomPath().map( Path::getParent );
+ default Optional<Path> getBasedir() {
+ return getPomPath().map(Path::getParent);
}
@Nonnull
@@ -86,8 +81,7 @@ public interface Project
List<DependencyCoordinate> getManagedDependencies();
@Nonnull
- default String getId()
- {
+ default String getId() {
return getModel().getId();
}
@@ -101,5 +95,4 @@ public interface Project
@Nonnull
List<RemoteRepository> getRemotePluginRepositories();
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/RemoteRepository.java b/api/maven-api-core/src/main/java/org/apache/maven/api/RemoteRepository.java
index 4dd629f2c..98dadefd3 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/RemoteRepository.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/RemoteRepository.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
@@ -28,13 +27,11 @@ import org.apache.maven.api.annotations.Nonnull;
*/
@Experimental
@Immutable
-public interface RemoteRepository extends Repository
-{
+public interface RemoteRepository extends Repository {
@Nonnull
String getUrl();
@Nonnull
String getProtocol();
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Repository.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Repository.java
index 896943d19..f7166afa1 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Repository.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Repository.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
@@ -32,8 +31,7 @@ import org.apache.maven.api.annotations.Nonnull;
*/
@Experimental
@Immutable
-public interface Repository
-{
+public interface Repository {
/**
* Gets the identifier of this repository.
@@ -50,5 +48,4 @@ public interface Repository
*/
@Nonnull
String getType();
-
}
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 a68dc5256..8adccbb1a 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import java.util.Arrays;
import java.util.Collections;
@@ -27,7 +26,6 @@ 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;
/**
@@ -40,65 +38,59 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public enum ResolutionScope
-{
+public enum ResolutionScope {
/**
* empty resolution scope
*/
- NONE( null ),
+ NONE(null),
/**
* <code>compile</code> resolution scope
* = <code>compile</code> + <code>system</code> + <code>provided</code> dependencies
*/
- COMPILE( "compile", Scope.COMPILE, Scope.SYSTEM, Scope.PROVIDED ),
+ COMPILE("compile", Scope.COMPILE, Scope.SYSTEM, Scope.PROVIDED),
/**
* <code>compile+runtime</code> resolution scope (Maven 3 only)
* = <code>compile</code> + <code>system</code> + <code>provided</code> + <code>runtime</code> dependencies
*/
- COMPILE_PLUS_RUNTIME( "compile+runtime", Scope.COMPILE, Scope.SYSTEM, Scope.PROVIDED, Scope.RUNTIME ),
+ COMPILE_PLUS_RUNTIME("compile+runtime", Scope.COMPILE, Scope.SYSTEM, Scope.PROVIDED, Scope.RUNTIME),
/**
* <code>runtime</code> resolution scope
* = <code>compile</code> + <code>runtime</code> dependencies
*/
- RUNTIME( "runtime", Scope.COMPILE, Scope.RUNTIME ),
+ RUNTIME("runtime", Scope.COMPILE, Scope.RUNTIME),
/**
* <code>runtime+system</code> resolution scope (Maven 3 only)
* = <code>compile</code> + <code>system</code> + <code>runtime</code> dependencies
*/
- RUNTIME_PLUS_SYSTEM( "runtime+system", Scope.COMPILE, Scope.SYSTEM, Scope.RUNTIME ),
+ RUNTIME_PLUS_SYSTEM("runtime+system", Scope.COMPILE, Scope.SYSTEM, Scope.RUNTIME),
/**
* <code>test</code> resolution scope
* = <code>compile</code> + <code>system</code> + <code>provided</code> + <code>runtime</code> + <code>test</code>
* dependencies
*/
- TEST( "test", Scope.COMPILE, Scope.SYSTEM, Scope.PROVIDED, Scope.RUNTIME, Scope.TEST );
+ TEST("test", Scope.COMPILE, Scope.SYSTEM, Scope.PROVIDED, Scope.RUNTIME, Scope.TEST);
- private static final Map<String, ResolutionScope> VALUES
- = Stream.of( ResolutionScope.values() ).collect( Collectors.toMap( ResolutionScope::id, s -> s ) );
+ private static final Map<String, ResolutionScope> VALUES =
+ Stream.of(ResolutionScope.values()).collect(Collectors.toMap(ResolutionScope::id, s -> s));
- public static ResolutionScope fromString( String id )
- {
- return Optional.ofNullable( VALUES.get( id ) )
- .orElseThrow( () -> new IllegalArgumentException( "Unknown resolution scope " + id ) );
+ public static ResolutionScope fromString(String id) {
+ return Optional.ofNullable(VALUES.get(id))
+ .orElseThrow(() -> new IllegalArgumentException("Unknown resolution scope " + id));
}
private final String id;
private final Set<Scope> scopes;
- ResolutionScope( String id, Scope... scopes )
- {
+ ResolutionScope(String id, Scope... scopes) {
this.id = id;
- this.scopes = Collections.unmodifiableSet( new HashSet<>( Arrays.asList( scopes ) ) );
+ this.scopes = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(scopes)));
}
- public String id()
- {
+ public String id() {
return this.id;
}
- public Set<Scope> scopes()
- {
+ public Set<Scope> scopes() {
return scopes;
}
-
}
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 f246e9fd7..186fb2a24 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,9 +16,9 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import java.util.Locale;
-
import org.apache.maven.api.annotations.Experimental;
/**
@@ -29,29 +27,25 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public enum Scope
-{
- COMPILE( "compile" ),
- PROVIDED ( "provided" ),
- SYSTEM( "system" ),
- RUNTIME( "runtime" ),
- TEST( "test" ),
- IMPORT( "import" );
+public enum Scope {
+ COMPILE("compile"),
+ PROVIDED("provided"),
+ SYSTEM("system"),
+ RUNTIME("runtime"),
+ TEST("test"),
+ IMPORT("import");
private final String id;
- Scope( String id )
- {
+ Scope(String id) {
this.id = id;
}
- public String id()
- {
+ public String id() {
return this.id;
}
- public static Scope get( String scope )
- {
- return Enum.valueOf( Scope.class, scope.toUpperCase( Locale.ROOT ) );
+ public static Scope get(String scope) {
+ return Enum.valueOf(Scope.class, scope.toUpperCase(Locale.ROOT));
}
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Service.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Service.java
index a4cabcaa7..5f53c06d5 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Service.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Service.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.ThreadSafe;
@@ -27,11 +26,9 @@ import org.apache.maven.api.annotations.ThreadSafe;
* <p>
* Services can be retrieved from the session using the
* {@link Session#getService(Class)} method.
- *
- * @see Session#getService(Class)
+ *
+ * @see Session#getService(Class)
*/
@Experimental
@ThreadSafe
-public interface Service
-{
-}
+public interface Service {}
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 28556d86a..4ed8a3874 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import java.nio.file.Path;
import java.time.Instant;
@@ -26,7 +25,6 @@ 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;
@@ -41,8 +39,7 @@ import org.apache.maven.api.settings.Settings;
*/
@Experimental
@ThreadSafe
-public interface Session
-{
+public interface Session {
@Nonnull
Settings getSettings();
@@ -105,7 +102,7 @@ public interface Session
* @throws org.apache.maven.api.services.MavenException if not called from the within a mojo execution
*/
@Nonnull
- Map<String, Object> getPluginContext( @Nonnull Project project );
+ Map<String, Object> getPluginContext(@Nonnull Project project);
/**
* Retrieves the service for the interface
@@ -113,7 +110,7 @@ public interface Session
* @throws NoSuchElementException if the service could not be found
*/
@Nonnull
- <T extends Service> T getService( @Nonnull Class<T> clazz );
+ <T extends Service> T getService(@Nonnull Class<T> clazz);
/**
* Creates a derived session using the given local repository.
@@ -123,7 +120,7 @@ public interface Session
* @throws NullPointerException if {@code localRepository} is null
*/
@Nonnull
- Session withLocalRepository( @Nonnull LocalRepository localRepository );
+ Session withLocalRepository(@Nonnull LocalRepository localRepository);
/**
* Creates a derived session using the given remote repositories.
@@ -133,7 +130,7 @@ public interface Session
* @throws NullPointerException if {@code repositories} is null
*/
@Nonnull
- Session withRemoteRepositories( @Nonnull List<RemoteRepository> repositories );
+ Session withRemoteRepositories(@Nonnull List<RemoteRepository> repositories);
/**
* Register the given listener which will receive all events.
@@ -141,7 +138,7 @@ public interface Session
* @param listener the listener to register
* @throws NullPointerException if {@code listener} is null
*/
- void registerListener( @Nonnull Listener listener );
+ void registerListener(@Nonnull Listener listener);
/**
* Unregisters a previously registered listener.
@@ -149,7 +146,7 @@ public interface Session
* @param listener the listener to unregister
* @throws NullPointerException if {@code listener} is null
*/
- void unregisterListener( @Nonnull Listener listener );
+ void unregisterListener(@Nonnull Listener listener);
/**
* Returns the list of registered listeners.
@@ -163,60 +160,60 @@ public interface Session
* Shortcut for <code>getService(RepositoryFactory.class).createLocal(...)</code>
* @see org.apache.maven.api.services.RepositoryFactory#createLocal(Path)
*/
- LocalRepository createLocalRepository( Path path );
+ LocalRepository createLocalRepository(Path path);
/**
* Shortcut for <code>getService(RepositoryFactory.class).createRemote(...)</code>
* @see org.apache.maven.api.services.RepositoryFactory#createRemote(String, String)
*/
@Nonnull
- RemoteRepository createRemoteRepository( @Nonnull String id, @Nonnull String url );
+ RemoteRepository createRemoteRepository(@Nonnull String id, @Nonnull String url);
/**
* Shortcut for <code>getService(RepositoryFactory.class).createRemote(...)</code>
* @see org.apache.maven.api.services.RepositoryFactory#createRemote(Repository)
*/
@Nonnull
- RemoteRepository createRemoteRepository( @Nonnull Repository repository );
+ RemoteRepository createRemoteRepository(@Nonnull Repository repository);
/**
* Shortcut for <code>getService(ArtifactFactory.class).create(...)</code>
* @see org.apache.maven.api.services.ArtifactFactory#create(Session, String, String, String, String)
*/
- ArtifactCoordinate createArtifactCoordinate( String groupId, String artifactId, String version, String extension );
+ ArtifactCoordinate createArtifactCoordinate(String groupId, String artifactId, String version, String extension);
/**
* Shortcut for <code>getService(ArtifactFactory.class).create(...)</code>
* @see org.apache.maven.api.services.ArtifactFactory#create(Session, String, String, String, String, String, String)
*/
- ArtifactCoordinate createArtifactCoordinate( String groupId, String artifactId, String version, String classifier,
- String extension, String type );
+ ArtifactCoordinate createArtifactCoordinate(
+ String groupId, String artifactId, String version, String classifier, String extension, String type);
/**
* Shortcut for <code>getService(ArtifactFactory.class).create(...)</code>
* @see org.apache.maven.api.services.ArtifactFactory#create(Session, String, String, String, String, String, String)
*/
- ArtifactCoordinate createArtifactCoordinate( Artifact artifact );
+ ArtifactCoordinate createArtifactCoordinate(Artifact artifact);
/**
* Shortcut for <code>getService(DependencyFactory.class).create(...)</code>
* @see DependencyCoordinateFactory#create(Session, ArtifactCoordinate)
*/
@Nonnull
- DependencyCoordinate createDependencyCoordinate( @Nonnull ArtifactCoordinate coordinate );
+ DependencyCoordinate createDependencyCoordinate(@Nonnull ArtifactCoordinate coordinate);
/**
* Shortcut for <code>getService(ArtifactFactory.class).create(...)</code>
* @see org.apache.maven.api.services.ArtifactFactory#create(Session, String, String, String, String)
*/
- Artifact createArtifact( String groupId, String artifactId, String version, String extension );
+ Artifact createArtifact(String groupId, String artifactId, String version, String extension);
/**
* Shortcut for <code>getService(ArtifactFactory.class).create(...)</code>
* @see org.apache.maven.api.services.ArtifactFactory#create(Session, String, String, String, String, String, String)
*/
- Artifact createArtifact( String groupId, String artifactId, String version, String classifier,
- String extension, String type );
+ Artifact createArtifact(
+ String groupId, String artifactId, String version, String classifier, String extension, String type);
/**
* Shortcut for <code>getService(ArtifactResolver.class).resolve(...)</code>
@@ -224,7 +221,7 @@ public interface Session
*
* @throws org.apache.maven.api.services.ArtifactResolverException if the artifact resolution failed
*/
- Artifact resolveArtifact( ArtifactCoordinate coordinate );
+ Artifact resolveArtifact(ArtifactCoordinate coordinate);
/**
* Shortcut for <code>getService(ArtifactResolver.class).resolve(...)</code>
@@ -232,7 +229,7 @@ public interface Session
*
* @throws org.apache.maven.api.services.ArtifactResolverException if the artifact resolution failed
*/
- Collection<Artifact> resolveArtifacts( ArtifactCoordinate... coordinates );
+ Collection<Artifact> resolveArtifacts(ArtifactCoordinate... coordinates);
/**
* Shortcut for <code>getService(ArtifactResolver.class).resolve(...)</code>
@@ -240,7 +237,7 @@ public interface Session
*
* @throws org.apache.maven.api.services.ArtifactResolverException if the artifact resolution failed
*/
- Collection<Artifact> resolveArtifacts( Collection<? extends ArtifactCoordinate> coordinates );
+ Collection<Artifact> resolveArtifacts(Collection<? extends ArtifactCoordinate> coordinates);
/**
* Shortcut for <code>getService(ArtifactResolver.class).resolve(...)</code>
@@ -248,7 +245,7 @@ public interface Session
*
* @throws org.apache.maven.api.services.ArtifactResolverException if the artifact resolution failed
*/
- Artifact resolveArtifact( Artifact artifact );
+ Artifact resolveArtifact(Artifact artifact);
/**
* Shortcut for <code>getService(ArtifactResolver.class).resolve(...)</code>
@@ -256,7 +253,7 @@ public interface Session
*
* @throws org.apache.maven.api.services.ArtifactResolverException if the artifact resolution failed
*/
- Collection<Artifact> resolveArtifacts( Artifact... artifacts );
+ Collection<Artifact> resolveArtifacts(Artifact... artifacts);
/**
* Shortcut for {@code getService(ArtifactInstaller.class).install(...)}
@@ -264,7 +261,7 @@ public interface Session
*
* @throws org.apache.maven.api.services.ArtifactInstallerException if the artifacts installation failed
*/
- void installArtifacts( Artifact... artifacts );
+ void installArtifacts(Artifact... artifacts);
/**
* Shortcut for {@code getService(ArtifactInstaller.class).install(...)}
@@ -272,7 +269,7 @@ public interface Session
*
* @throws org.apache.maven.api.services.ArtifactInstallerException if the artifacts installation failed
*/
- void installArtifacts( Collection<Artifact> artifacts );
+ void installArtifacts(Collection<Artifact> artifacts);
/**
* Shortcut for <code>getService(ArtifactDeployer.class).deploy(...)</code>
@@ -280,26 +277,26 @@ public interface Session
*
* @throws org.apache.maven.api.services.ArtifactDeployerException if the artifacts deployment failed
*/
- void deployArtifact( RemoteRepository repository, Artifact... artifacts );
+ void deployArtifact(RemoteRepository repository, Artifact... artifacts);
/**
* Shortcut for <code>getService(ArtifactManager.class).setPath(...)</code>
* @see org.apache.maven.api.services.ArtifactManager#setPath(Artifact, Path)
*/
- void setArtifactPath( @Nonnull Artifact artifact, @Nonnull Path path );
+ void setArtifactPath(@Nonnull Artifact artifact, @Nonnull Path path);
/**
* Shortcut for <code>getService(ArtifactManager.class).getPath(...)</code>
* @see org.apache.maven.api.services.ArtifactManager#getPath(Artifact)
*/
@Nonnull
- Optional<Path> getArtifactPath( @Nonnull Artifact artifact );
+ Optional<Path> getArtifactPath(@Nonnull Artifact artifact);
/**
* Shortcut for <code>getService(ArtifactManager.class).isSnapshot(...)</code>
* @see org.apache.maven.api.services.VersionParser#isSnapshot(String)
*/
- boolean isVersionSnapshot( @Nonnull String version );
+ boolean isVersionSnapshot(@Nonnull String version);
/**
* Shortcut for <code>getService(DependencyCollector.class).collect(...)</code>
@@ -308,7 +305,7 @@ public interface Session
* @throws org.apache.maven.api.services.DependencyCollectorException if the dependency collection failed
*/
@Nonnull
- Node collectDependencies( @Nonnull Artifact artifact );
+ Node collectDependencies(@Nonnull Artifact artifact);
/**
* Shortcut for <code>getService(DependencyCollector.class).collect(...)</code>
@@ -317,7 +314,7 @@ public interface Session
* @throws org.apache.maven.api.services.DependencyCollectorException if the dependency collection failed
*/
@Nonnull
- Node collectDependencies( @Nonnull Project project );
+ Node collectDependencies(@Nonnull Project project);
/**
* Shortcut for <code>getService(DependencyResolver.class).resolve(...)</code>
@@ -326,11 +323,11 @@ public interface Session
* @throws org.apache.maven.api.services.DependencyCollectorException if the dependency collection failed
*/
@Nonnull
- Node collectDependencies( @Nonnull DependencyCoordinate dependency );
+ Node collectDependencies(@Nonnull DependencyCoordinate dependency);
- Path getPathForLocalArtifact( @Nonnull Artifact artifact );
+ Path getPathForLocalArtifact(@Nonnull Artifact artifact);
- Path getPathForRemoteArtifact( RemoteRepository remote, Artifact artifact );
+ Path getPathForRemoteArtifact(RemoteRepository remote, Artifact artifact);
/**
* Shortcut for <code>getService(VersionParser.class).parseVersion(...)</code>
@@ -339,7 +336,7 @@ public interface Session
* @throws org.apache.maven.api.services.VersionParserException if the parsing failed
*/
@Nonnull
- Version parseVersion( @Nonnull String version );
+ Version parseVersion(@Nonnull String version);
/**
* Shortcut for <code>getService(VersionParser.class).parseVersionRange(...)</code>
@@ -348,5 +345,5 @@ public interface Session
* @throws org.apache.maven.api.services.VersionParserException if the parsing failed
*/
@Nonnull
- VersionRange parseVersionRange( @Nonnull String versionRange );
+ VersionRange parseVersionRange(@Nonnull String versionRange);
}
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 2df695ec3..c8833519c 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -8,9 +6,9 @@ package org.apache.maven.api;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,15 +16,15 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+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;
import org.apache.maven.api.annotations.Provider;
import org.apache.maven.api.annotations.ThreadSafe;
-import java.util.function.Supplier;
-
/**
* A container for data that is specific to a session.
* All components may use this storage to associate arbitrary data with a session.
@@ -35,43 +33,43 @@ import java.util.function.Supplier;
* abused as a cache (i.e. for storing values that can be re-calculated) to avoid memory exhaustion.
* <p>
* <strong>Note:</strong> Actual implementations must be thread-safe.
- *
+ *
* @see Session#getData()
* @since 4.0
*/
@Experimental
-@ThreadSafe @Provider
-public interface SessionData
-{
+@ThreadSafe
+@Provider
+public interface SessionData {
/**
* Associates the specified session data with the given key.
- *
+ *
* @param key the key under which to store the session data, must not be {@code null}
* @param value the data to associate with the key, may be {@code null} to remove the mapping
*/
- void set( @Nonnull Object key, @Nullable Object value );
+ void set(@Nonnull Object key, @Nullable Object value);
/**
* Associates the specified session data with the given key if the key is currently mapped to the given value. This
* method provides an atomic compare-and-update of some key's value.
- *
+ *
* @param key the key under which to store the session data, must not be {@code null}
* @param oldValue the expected data currently associated with the key, may be {@code null}
* @param newValue the data to associate with the key, may be {@code null} to remove the mapping
* @return {@code true} if the key mapping was successfully updated from the old value to the new value,
* {@code false} if the current key mapping didn't match the expected value and was not updated.
*/
- boolean set( @Nonnull Object key, @Nullable Object oldValue, @Nullable Object newValue );
+ boolean set(@Nonnull Object key, @Nullable Object oldValue, @Nullable Object newValue);
/**
* Gets the session data associated with the specified key.
- *
+ *
* @param key the key for which to retrieve the session data, must not be {@code null}
* @return the session data associated with the key or {@code null} if none
*/
@Nullable
- Object get( @Nonnull Object key );
+ Object get(@Nonnull Object key);
/**
* Retrieve of compute the data associated with the specified key.
@@ -81,6 +79,5 @@ public interface SessionData
* @return the session data associated with the key
*/
@Nullable
- Object computeIfAbsent( @Nonnull Object key, @Nonnull Supplier<Object> supplier );
-
+ Object computeIfAbsent(@Nonnull Object key, @Nonnull Supplier<Object> supplier);
}
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 3bc15e48f..92aca129f 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,9 +16,9 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import java.util.Map;
-
import org.apache.maven.api.annotations.Experimental;
/**
@@ -29,8 +27,7 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public interface Toolchain
-{
+public interface Toolchain {
/**
* get the type of toolchain.
*
@@ -44,7 +41,7 @@ public interface Toolchain
* @param toolName the tool platform independent tool name
* @return file representing the tool executable, or null if the tool cannot be found
*/
- String findTool( String toolName );
+ String findTool(String toolName);
/**
* Let the toolchain decide if it matches requirements defined
@@ -52,5 +49,5 @@ public interface Toolchain
* @param requirements Map<String, String> key value pair, may not be {@code null}
* @return {@code true} if the requirements match, otherwise {@code false}
*/
- boolean matchesRequirements( Map<String, String> requirements );
-}
\ No newline at end of file
+ boolean matchesRequirements(Map<String, String> requirements);
+}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Type.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Type.java
index 71a94b2e2..93bd1bab4 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Type.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Type.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
@@ -34,8 +33,7 @@ import org.apache.maven.api.annotations.Immutable;
*/
@Experimental
@Immutable
-public interface Type
-{
+public interface Type {
String POM = "pom";
String JAR = "jar";
@@ -68,5 +66,4 @@ public interface Type
boolean isIncludesDependencies();
boolean isAddedToClasspath();
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Version.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Version.java
index bf75f6c1d..e4a18a963 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/Version.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Version.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
@@ -30,9 +29,7 @@ import org.apache.maven.api.annotations.Nonnull;
* @see org.apache.maven.api.Session#parseVersion(String)
*/
@Experimental
-public interface Version
- extends Comparable<Version>
-{
+public interface Version extends Comparable<Version> {
// TODO: add access to the version information
@@ -42,5 +39,4 @@ public interface Version
*/
@Nonnull
String asString();
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/VersionRange.java b/api/maven-api-core/src/main/java/org/apache/maven/api/VersionRange.java
index 83117b681..17e951037 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/VersionRange.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/VersionRange.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
@@ -28,8 +27,7 @@ import org.apache.maven.api.annotations.Nonnull;
* @since 4.0
*/
@Experimental
-public interface VersionRange
-{
+public interface VersionRange {
// TODO: add access to the version information
@@ -39,7 +37,7 @@ public interface VersionRange
* @param version the version to test, must not be {@code null}
* @return {@code true} if this range contains the specified version, {@code false} otherwise
*/
- boolean contains( @Nonnull Version version );
+ boolean contains(@Nonnull Version version);
/**
* Returns a string representation of this version range
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/Log.java b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/Log.java
index f0eb2a660..fb7732e2f 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/Log.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/Log.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.plugin;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.plugin;
import java.util.function.Supplier;
@@ -31,8 +30,7 @@ import java.util.function.Supplier;
*
* @since 4.0
*/
-public interface Log
-{
+public interface Log {
/**
* @return true if the <b>debug</b> error level is enabled
*/
@@ -43,7 +41,7 @@ public interface Log
*
* @param content
*/
- void debug( CharSequence content );
+ void debug(CharSequence content);
/**
* Send a message (and accompanying exception) to the user in the <b>debug</b> error level.<br>
@@ -52,7 +50,7 @@ public interface Log
* @param content
* @param error
*/
- void debug( CharSequence content, Throwable error );
+ void debug(CharSequence content, Throwable error);
/**
* Send an exception to the user in the <b>debug</b> error level.<br>
@@ -60,11 +58,11 @@ public interface Log
*
* @param error
*/
- void debug( Throwable error );
+ void debug(Throwable error);
- void debug( Supplier<String> content );
+ void debug(Supplier<String> content);
- void debug( Supplier<String> content, Throwable error );
+ void debug(Supplier<String> content, Throwable error);
/**
* @return true if the <b>info</b> error level is enabled
@@ -76,7 +74,7 @@ public interface Log
*
* @param content
*/
- void info( CharSequence content );
+ void info(CharSequence content);
/**
* Send a message (and accompanying exception) to the user in the <b>info</b> error level.<br>
@@ -85,7 +83,7 @@ public interface Log
* @param content
* @param error
*/
- void info( CharSequence content, Throwable error );
+ void info(CharSequence content, Throwable error);
/**
* Send an exception to the user in the <b>info</b> error level.<br>
@@ -93,11 +91,11 @@ public interface Log
*
* @param error
*/
- void info( Throwable error );
+ void info(Throwable error);
- void info( Supplier<String> content );
+ void info(Supplier<String> content);
- void info( Supplier<String> content, Throwable error );
+ void info(Supplier<String> content, Throwable error);
/**
* @return true if the <b>warn</b> error level is enabled
@@ -109,7 +107,7 @@ public interface Log
*
* @param content
*/
- void warn( CharSequence content );
+ void warn(CharSequence content);
/**
* Send a message (and accompanying exception) to the user in the <b>warn</b> error level.<br>
@@ -118,7 +116,7 @@ public interface Log
* @param content
* @param error
*/
- void warn( CharSequence content, Throwable error );
+ void warn(CharSequence content, Throwable error);
/**
* Send an exception to the user in the <b>warn</b> error level.<br>
@@ -126,11 +124,11 @@ public interface Log
*
* @param error
*/
- void warn( Throwable error );
+ void warn(Throwable error);
- void warn( Supplier<String> content );
+ void warn(Supplier<String> content);
- void warn( Supplier<String> content, Throwable error );
+ void warn(Supplier<String> content, Throwable error);
/**
* @return true if the <b>error</b> error level is enabled
@@ -142,7 +140,7 @@ public interface Log
*
* @param content
*/
- void error( CharSequence content );
+ void error(CharSequence content);
/**
* Send a message (and accompanying exception) to the user in the <b>error</b> error level.<br>
@@ -151,7 +149,7 @@ public interface Log
* @param content
* @param error
*/
- void error( CharSequence content, Throwable error );
+ void error(CharSequence content, Throwable error);
/**
* Send an exception to the user in the <b>error</b> error level.<br>
@@ -159,10 +157,9 @@ public interface Log
*
* @param error
*/
- void error( Throwable error );
-
- void error( Supplier<String> content );
+ void error(Throwable error);
- void error( Supplier<String> content, Throwable error );
+ void error(Supplier<String> content);
+ void error(Supplier<String> content, Throwable error);
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/Mojo.java b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/Mojo.java
index 384616d2a..5c68c3b63 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/Mojo.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/Mojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.plugin;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.plugin;
import org.apache.maven.api.annotations.Consumer;
import org.apache.maven.api.annotations.Experimental;
@@ -31,9 +30,9 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-@FunctionalInterface @Consumer
-public interface Mojo
-{
+@FunctionalInterface
+@Consumer
+public interface Mojo {
/**
* Perform whatever build-process behavior this <code>Mojo</code> implements.<br>
* This is the main trigger for the <code>Mojo</code> inside the <code>Maven</code> system, and allows
@@ -42,5 +41,4 @@ public interface Mojo
* @throws MojoException if a problem occurs
*/
void execute();
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/MojoException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/MojoException.java
index bd93e6067..165546908 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/MojoException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/MojoException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.plugin;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.plugin;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.services.MavenException;
@@ -28,9 +27,7 @@ import org.apache.maven.api.services.MavenException;
* @since 4.0
*/
@Experimental
-public class MojoException
- extends MavenException
-{
+public class MojoException extends MavenException {
protected Object source;
@@ -40,9 +37,8 @@ public class MojoException
* Construct a new <code>MojoException</code> exception providing the source and a short and long message:
* these messages are used to improve the message written at the end of Maven build.
*/
- public MojoException( Object source, String shortMessage, String longMessage )
- {
- super( shortMessage );
+ public MojoException(Object source, String shortMessage, String longMessage) {
+ super(shortMessage);
this.source = source;
this.longMessage = longMessage;
}
@@ -51,17 +47,15 @@ public class MojoException
* Construct a new <code>MojoExecutionException</code> exception wrapping an underlying <code>Throwable</code>
* and providing a <code>message</code>.
*/
- public MojoException( String message, Throwable cause )
- {
- super( message, cause );
+ public MojoException(String message, Throwable cause) {
+ super(message, cause);
}
/**
* Construct a new <code>MojoExecutionException</code> exception providing a <code>message</code>.
*/
- public MojoException( String message )
- {
- super( message );
+ public MojoException(String message) {
+ super(message);
}
/**
@@ -70,19 +64,15 @@ public class MojoException
* @param cause the cause which is saved for later retrieval by the {@link #getCause()} method.
* A {@code null} value is permitted, and indicates that the cause is nonexistent or unknown.
*/
- public MojoException( Throwable cause )
- {
- super( cause );
+ public MojoException(Throwable cause) {
+ super(cause);
}
- public String getLongMessage()
- {
+ public String getLongMessage() {
return longMessage;
}
- public Object getSource()
- {
+ public Object getSource() {
return source;
}
-
}
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 f963dfa98..0459eda4b 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.plugin.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -25,7 +24,6 @@ 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;
/**
@@ -37,11 +35,10 @@ import org.apache.maven.api.annotations.Experimental;
*/
@Experimental
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( { ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER } )
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@Inherited
-public @interface Component
-{
+public @interface Component {
/**
* role of the component to inject.
* @return the role
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 6aec36666..07f33319c 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.plugin.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -25,7 +24,6 @@ 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;
/**
@@ -35,11 +33,10 @@ import org.apache.maven.api.annotations.Experimental;
*/
@Experimental
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( ElementType.TYPE )
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE)
@Inherited
-public @interface Execute
-{
+public @interface Execute {
/**
* Lifecycle phase to fork. Note that specifying a phase overrides specifying a goal.
* For custom lifecycle phase ids use {@link #customPhase()} instead.
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/InstantiationStrategy.java b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/InstantiationStrategy.java
index c5cfc75ec..a3fe530c1 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/InstantiationStrategy.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/InstantiationStrategy.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.plugin.annotations;
import org.apache.maven.api.annotations.Experimental;
@@ -27,22 +26,19 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public enum InstantiationStrategy
-{
- PER_LOOKUP( "per-lookup" ),
- SINGLETON( "singleton" ),
- KEEP_ALIVE( "keep-alive" ),
- POOLABLE( "poolable" );
+public enum InstantiationStrategy {
+ PER_LOOKUP("per-lookup"),
+ SINGLETON("singleton"),
+ KEEP_ALIVE("keep-alive"),
+ POOLABLE("poolable");
private final String id;
- InstantiationStrategy( String id )
- {
+ InstantiationStrategy(String id) {
this.id = id;
}
- public String id()
- {
+ public String id() {
return this.id;
}
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/LifecyclePhase.java b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/LifecyclePhase.java
index 84c567b4d..11e050217 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/LifecyclePhase.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/LifecyclePhase.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.plugin.annotations;
import org.apache.maven.api.annotations.Experimental;
@@ -27,54 +26,49 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public enum LifecyclePhase
-{
+public enum LifecyclePhase {
+ VALIDATE("validate"),
+ INITIALIZE("initialize"),
+ GENERATE_SOURCES("generate-sources"),
+ PROCESS_SOURCES("process-sources"),
+ GENERATE_RESOURCES("generate-resources"),
+ PROCESS_RESOURCES("process-resources"),
+ COMPILE("compile"),
+ PROCESS_CLASSES("process-classes"),
+ GENERATE_TEST_SOURCES("generate-test-sources"),
+ PROCESS_TEST_SOURCES("process-test-sources"),
+ GENERATE_TEST_RESOURCES("generate-test-resources"),
+ PROCESS_TEST_RESOURCES("process-test-resources"),
+ TEST_COMPILE("test-compile"),
+ PROCESS_TEST_CLASSES("process-test-classes"),
+ TEST("test"),
+ PREPARE_PACKAGE("prepare-package"),
+ PACKAGE("package"),
+ PRE_INTEGRATION_TEST("pre-integration-test"),
+ INTEGRATION_TEST("integration-test"),
+ POST_INTEGRATION_TEST("post-integration-test"),
+ VERIFY("verify"),
+ INSTALL("install"),
+ DEPLOY("deploy"),
- VALIDATE( "validate" ),
- INITIALIZE( "initialize" ),
- GENERATE_SOURCES( "generate-sources" ),
- PROCESS_SOURCES( "process-sources" ),
- GENERATE_RESOURCES( "generate-resources" ),
- PROCESS_RESOURCES( "process-resources" ),
- COMPILE( "compile" ),
- PROCESS_CLASSES( "process-classes" ),
- GENERATE_TEST_SOURCES( "generate-test-sources" ),
- PROCESS_TEST_SOURCES( "process-test-sources" ),
- GENERATE_TEST_RESOURCES( "generate-test-resources" ),
- PROCESS_TEST_RESOURCES( "process-test-resources" ),
- TEST_COMPILE( "test-compile" ),
- PROCESS_TEST_CLASSES( "process-test-classes" ),
- TEST( "test" ),
- PREPARE_PACKAGE( "prepare-package" ),
- PACKAGE( "package" ),
- PRE_INTEGRATION_TEST( "pre-integration-test" ),
- INTEGRATION_TEST( "integration-test" ),
- POST_INTEGRATION_TEST( "post-integration-test" ),
- VERIFY( "verify" ),
- INSTALL( "install" ),
- DEPLOY( "deploy" ),
+ PRE_CLEAN("pre-clean"),
+ CLEAN("clean"),
+ POST_CLEAN("post-clean"),
- PRE_CLEAN( "pre-clean" ),
- CLEAN( "clean" ),
- POST_CLEAN( "post-clean" ),
+ PRE_SITE("pre-site"),
+ SITE("site"),
+ POST_SITE("post-site"),
+ SITE_DEPLOY("site-deploy"),
- PRE_SITE( "pre-site" ),
- SITE( "site" ),
- POST_SITE( "post-site" ),
- SITE_DEPLOY( "site-deploy" ),
-
- NONE( "" );
+ NONE("");
private final String id;
- LifecyclePhase( String id )
- {
+ LifecyclePhase(String id) {
this.id = id;
}
- public String id()
- {
+ public String id() {
return this.id;
}
-
}
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 e87341140..415c6631e 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.plugin.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -25,7 +24,6 @@ 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;
@@ -36,11 +34,10 @@ import org.apache.maven.api.annotations.Experimental;
*/
@Experimental
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( ElementType.TYPE )
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE)
@Inherited
-public @interface Mojo
-{
+public @interface Mojo {
/**
* goal name (required).
* @return the goal name
@@ -61,7 +58,7 @@ public @interface Mojo
/**
* the required dependency collection scope.
- * @return the required dependency collection scope
+ * @return the required dependency collection scope
*/
ResolutionScope requiresDependencyCollection() default ResolutionScope.NONE;
@@ -94,5 +91,4 @@ public @interface Mojo
* @return the configurator bean name
*/
String configurator() default "";
-
}
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 27ada3d2a..df2d6c253 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.plugin.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.plugin.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.plugin.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -25,7 +24,6 @@ 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;
/**
@@ -41,11 +39,10 @@ import org.apache.maven.api.annotations.Experimental;
*/
@Experimental
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( { ElementType.FIELD, ElementType.METHOD } )
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.FIELD, ElementType.METHOD})
@Inherited
-public @interface Parameter
-{
+public @interface Parameter {
/**
* name of the bean property used to get/set the field: by default, field name is used.
* @return the name of the bean property
@@ -69,7 +66,7 @@ public @interface Parameter
* parameter default value, may contain <code>${...}</code> expressions which will be interpreted at
* inject time: see
* <a href="/ref/current/maven-core/apidocs/org/apache/maven/plugin/PluginParameterExpressionEvaluator.html">
- * PluginParameterExpressionEvaluator</a>.
+ * PluginParameterExpressionEvaluator</a>.
* @return the default value
*/
String defaultValue() default "";
@@ -87,7 +84,7 @@ public @interface Parameter
* want the user to modify <code><build><finalName/></build></code> rather than specifying a value
* for finalName directly in the plugin configuration section. It is also useful to ensure that - for example - a
* List-typed parameter which expects items of type Artifact doesn't get a List full of Strings.
- *
+ *
* @return <code>true</code> if the user should not be allowed to configure the parameter directly
*/
boolean readonly() default false;
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactory.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactory.java
index a1da37134..d2da409ed 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactory.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactory.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.Artifact;
import org.apache.maven.api.ArtifactCoordinate;
@@ -32,8 +31,7 @@ import org.apache.maven.api.annotations.Nonnull;
* @since 4.0
*/
@Experimental
-public interface ArtifactCoordinateFactory extends Service
-{
+public interface ArtifactCoordinateFactory extends Service {
/**
* Creates a coordinate.
@@ -43,29 +41,36 @@ public interface ArtifactCoordinateFactory extends Service
* @throws IllegalArgumentException if {@code request} is null or {@code request.session} is null or invalid
*/
@Nonnull
- ArtifactCoordinate create( @Nonnull ArtifactCoordinateFactoryRequest request );
+ ArtifactCoordinate create(@Nonnull ArtifactCoordinateFactoryRequest request);
@Nonnull
- default ArtifactCoordinate create( @Nonnull Session session, String groupId,
- String artifactId, String version, String extension )
- {
- return create( ArtifactCoordinateFactoryRequest.build( session, groupId, artifactId, version, extension ) );
+ default ArtifactCoordinate create(
+ @Nonnull Session session, String groupId, String artifactId, String version, String extension) {
+ return create(ArtifactCoordinateFactoryRequest.build(session, groupId, artifactId, version, extension));
}
@Nonnull
- default ArtifactCoordinate create( @Nonnull Session session, String groupId, String artifactId, String version,
- String classifier, String extension, String type )
- {
- return create( ArtifactCoordinateFactoryRequest.build( session, groupId, artifactId,
- version, classifier, extension, type ) );
+ default ArtifactCoordinate create(
+ @Nonnull Session session,
+ String groupId,
+ String artifactId,
+ String version,
+ String classifier,
+ String extension,
+ String type) {
+ return create(ArtifactCoordinateFactoryRequest.build(
+ session, groupId, artifactId, version, classifier, extension, type));
}
@Nonnull
- default ArtifactCoordinate create( @Nonnull Session session, Artifact artifact )
- {
- return create( ArtifactCoordinateFactoryRequest.build( session,
- artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion().asString(),
- artifact.getClassifier(), artifact.getExtension(), null ) );
+ default ArtifactCoordinate create(@Nonnull Session session, Artifact artifact) {
+ return create(ArtifactCoordinateFactoryRequest.build(
+ session,
+ artifact.getGroupId(),
+ artifact.getArtifactId(),
+ artifact.getVersion().asString(),
+ artifact.getClassifier(),
+ artifact.getExtension(),
+ null));
}
-
}
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 c93d249d8..66f795afe 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,9 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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;
@@ -26,8 +27,6 @@ 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.
*
@@ -35,8 +34,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
*/
@Experimental
@Immutable
-public interface ArtifactCoordinateFactoryRequest
-{
+public interface ArtifactCoordinateFactoryRequest {
@Nonnull
Session getSession();
@@ -54,55 +52,55 @@ public interface ArtifactCoordinateFactoryRequest
String getType();
@Nonnull
- static ArtifactCoordinateFactoryRequest build( @Nonnull Session session, String groupId, String artifactId,
- String version, String extension )
- {
+ static ArtifactCoordinateFactoryRequest build(
+ @Nonnull Session session, String groupId, String artifactId, String version, String extension) {
return ArtifactCoordinateFactoryRequest.builder()
- .session( nonNull( session, "session cannot be null" ) )
- .groupId( groupId )
- .artifactId( artifactId )
- .version( version )
- .extension( extension )
+ .session(nonNull(session, "session cannot be null"))
+ .groupId(groupId)
+ .artifactId(artifactId)
+ .version(version)
+ .extension(extension)
.build();
}
@Nonnull
- static ArtifactCoordinateFactoryRequest build( @Nonnull Session session, String groupId, String artifactId,
- String version, String classifier, String extension, String type )
- {
+ static ArtifactCoordinateFactoryRequest build(
+ @Nonnull Session session,
+ String groupId,
+ String artifactId,
+ String version,
+ String classifier,
+ String extension,
+ String type) {
return ArtifactCoordinateFactoryRequest.builder()
- .session( nonNull( session, "session cannot be null" ) )
- .groupId( groupId )
- .artifactId( artifactId )
- .version( version )
- .classifier( classifier )
- .extension( extension )
- .type( type )
+ .session(nonNull(session, "session cannot be null"))
+ .groupId(groupId)
+ .artifactId(artifactId)
+ .version(version)
+ .classifier(classifier)
+ .extension(extension)
+ .type(type)
.build();
}
@Nonnull
- static ArtifactCoordinateFactoryRequest build( @Nonnull Session session, @Nonnull ArtifactCoordinate coordinate )
- {
+ static ArtifactCoordinateFactoryRequest build(@Nonnull Session session, @Nonnull ArtifactCoordinate coordinate) {
return ArtifactCoordinateFactoryRequest.builder()
- .session( nonNull( session, "session cannot be null" ) )
- .groupId( nonNull( coordinate, "coordinate cannot be null" ).getGroupId() )
- .artifactId( coordinate.getArtifactId() )
- .classifier( coordinate.getClassifier() )
- .version( coordinate.getVersion().asString() )
- .extension( coordinate.getExtension() )
+ .session(nonNull(session, "session cannot be null"))
+ .groupId(nonNull(coordinate, "coordinate cannot be null").getGroupId())
+ .artifactId(coordinate.getArtifactId())
+ .classifier(coordinate.getClassifier())
+ .version(coordinate.getVersion().asString())
+ .extension(coordinate.getExtension())
.build();
}
-
- static ArtifactFactoryRequestBuilder builder()
- {
+ static ArtifactFactoryRequestBuilder builder() {
return new ArtifactFactoryRequestBuilder();
}
@NotThreadSafe
- class ArtifactFactoryRequestBuilder
- {
+ class ArtifactFactoryRequestBuilder {
private Session session;
private String groupId;
private String artifactId;
@@ -111,61 +109,50 @@ public interface ArtifactCoordinateFactoryRequest
private String extension;
private String type;
- ArtifactFactoryRequestBuilder()
- {
- }
+ ArtifactFactoryRequestBuilder() {}
- public ArtifactFactoryRequestBuilder session( Session session )
- {
+ public ArtifactFactoryRequestBuilder session(Session session) {
this.session = session;
return this;
}
- public ArtifactFactoryRequestBuilder groupId( String groupId )
- {
+ public ArtifactFactoryRequestBuilder groupId(String groupId) {
this.groupId = groupId;
return this;
}
- public ArtifactFactoryRequestBuilder artifactId( String artifactId )
- {
+ public ArtifactFactoryRequestBuilder artifactId(String artifactId) {
this.artifactId = artifactId;
return this;
}
- public ArtifactFactoryRequestBuilder version( String version )
- {
+ public ArtifactFactoryRequestBuilder version(String version) {
this.version = version;
return this;
}
- public ArtifactFactoryRequestBuilder classifier( String classifier )
- {
+ public ArtifactFactoryRequestBuilder classifier(String classifier) {
this.classifier = classifier;
return this;
}
- public ArtifactFactoryRequestBuilder extension( String extension )
- {
+ public ArtifactFactoryRequestBuilder extension(String extension) {
this.extension = extension;
return this;
}
- public ArtifactFactoryRequestBuilder type( String type )
- {
+ public ArtifactFactoryRequestBuilder type(String type) {
this.type = type;
return this;
}
- public ArtifactCoordinateFactoryRequest build()
- {
- return new DefaultArtifactFactoryRequestArtifact( session, groupId, artifactId, version,
- classifier, extension, type );
+ public ArtifactCoordinateFactoryRequest build() {
+ return new DefaultArtifactFactoryRequestArtifact(
+ session, groupId, artifactId, version, classifier, extension, type);
}
- private static class DefaultArtifactFactoryRequestArtifact extends BaseRequest implements
- ArtifactCoordinateFactoryRequest
- {
+ private static class DefaultArtifactFactoryRequestArtifact extends BaseRequest
+ implements ArtifactCoordinateFactoryRequest {
private final String groupId;
private final String artifactId;
private final String version;
@@ -173,15 +160,15 @@ public interface ArtifactCoordinateFactoryRequest
private final String extension;
private final String type;
- DefaultArtifactFactoryRequestArtifact( @Nonnull Session session,
- String groupId,
- String artifactId,
- String version,
- String classifier,
- String extension,
- String type )
- {
- super( session );
+ DefaultArtifactFactoryRequestArtifact(
+ @Nonnull Session session,
+ String groupId,
+ String artifactId,
+ String version,
+ String classifier,
+ String extension,
+ String type) {
+ super(session);
this.groupId = groupId;
this.artifactId = artifactId;
this.version = version;
@@ -191,41 +178,34 @@ public interface ArtifactCoordinateFactoryRequest
}
@Override
- public String getGroupId()
- {
+ public String getGroupId() {
return groupId;
}
@Override
- public String getArtifactId()
- {
+ public String getArtifactId() {
return artifactId;
}
@Override
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
@Override
- public String getClassifier()
- {
+ public String getClassifier() {
return classifier;
}
@Override
- public String getExtension()
- {
+ public String getExtension() {
return extension;
}
@Override
- public String getType()
- {
+ public String getType() {
return type;
}
}
}
-
}
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 38c243dbe..349480479 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,13 +16,13 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import java.util.Collection;
-
-import org.apache.maven.api.Service;
-import org.apache.maven.api.Session;
import org.apache.maven.api.Artifact;
import org.apache.maven.api.RemoteRepository;
+import org.apache.maven.api.Service;
+import org.apache.maven.api.Session;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
@@ -35,14 +33,13 @@ import org.apache.maven.api.annotations.Nonnull;
* @see Session#deployArtifact(RemoteRepository, Artifact...)
*/
@Experimental
-public interface ArtifactDeployer extends Service
-{
+public interface ArtifactDeployer extends Service {
/**
* @param request {@link ArtifactDeployerRequest}
* @throws ArtifactDeployerException if the deployment failed
*/
- void deploy( @Nonnull ArtifactDeployerRequest request );
+ void deploy(@Nonnull ArtifactDeployerRequest request);
/**
* @param session the repository session
@@ -51,11 +48,8 @@ public interface ArtifactDeployer extends Service
* @throws ArtifactDeployerException if the deployment failed
* @throws IllegalArgumentException if an argument is {@code null} or invalid
*/
- default void deploy( @Nonnull Session session,
- @Nonnull RemoteRepository repository,
- @Nonnull Collection<Artifact> artifacts )
- {
- deploy( ArtifactDeployerRequest.build( session, repository, artifacts ) );
+ default void deploy(
+ @Nonnull Session session, @Nonnull RemoteRepository repository, @Nonnull Collection<Artifact> artifacts) {
+ deploy(ArtifactDeployerRequest.build(session, repository, artifacts));
}
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerException.java
index 9fba9f026..1262ebb36 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Experimental;
@@ -27,12 +26,10 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public class ArtifactDeployerException
- extends MavenException
-{
+public class ArtifactDeployerException extends MavenException {
/**
- *
+ *
*/
private static final long serialVersionUID = 7421964724059077698L;
@@ -40,9 +37,7 @@ public class ArtifactDeployerException
* @param message the message of the error
* @param e {@link Exception}
*/
- public ArtifactDeployerException( String message, Exception e )
- {
- super( message, e );
+ public ArtifactDeployerException(String message, Exception e) {
+ super(message, e);
}
-
}
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 6fb3eecbe..8ed8ec6ec 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,18 +16,17 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
-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;
import java.util.Collection;
-
-import org.apache.maven.api.Session;
import org.apache.maven.api.Artifact;
import org.apache.maven.api.RemoteRepository;
-
-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;
/**
* A request for deploying one or more artifacts to a remote repository.
@@ -38,8 +35,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
*/
@Experimental
@Immutable
-public interface ArtifactDeployerRequest
-{
+public interface ArtifactDeployerRequest {
@Nonnull
Session getSession();
@@ -53,105 +49,88 @@ public interface ArtifactDeployerRequest
int getRetryFailedDeploymentCount();
@Nonnull
- static ArtifactDeployerRequestBuilder builder()
- {
+ static ArtifactDeployerRequestBuilder builder() {
return new ArtifactDeployerRequestBuilder();
}
@Nonnull
- static ArtifactDeployerRequest build( @Nonnull Session session,
- @Nonnull RemoteRepository repository,
- @Nonnull Collection<Artifact> artifacts )
- {
+ static ArtifactDeployerRequest build(
+ @Nonnull Session session, @Nonnull RemoteRepository repository, @Nonnull Collection<Artifact> artifacts) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .repository( nonNull( repository, "repository cannot be null" ) )
- .artifacts( nonNull( artifacts, "artifacts cannot be null" ) )
+ .session(nonNull(session, "session cannot be null"))
+ .repository(nonNull(repository, "repository cannot be null"))
+ .artifacts(nonNull(artifacts, "artifacts cannot be null"))
.build();
}
- class ArtifactDeployerRequestBuilder
- {
+ class ArtifactDeployerRequestBuilder {
Session session;
RemoteRepository repository;
Collection<Artifact> artifacts;
int retryFailedDeploymentCount;
- ArtifactDeployerRequestBuilder()
- {
- }
+ ArtifactDeployerRequestBuilder() {}
@Nonnull
- public ArtifactDeployerRequestBuilder session( Session session )
- {
+ public ArtifactDeployerRequestBuilder session(Session session) {
this.session = session;
return this;
}
@Nonnull
- public ArtifactDeployerRequestBuilder repository( RemoteRepository repository )
- {
+ public ArtifactDeployerRequestBuilder repository(RemoteRepository repository) {
this.repository = repository;
return this;
}
- public ArtifactDeployerRequestBuilder artifacts( Collection<Artifact> artifacts )
- {
+ public ArtifactDeployerRequestBuilder artifacts(Collection<Artifact> artifacts) {
this.artifacts = artifacts;
return this;
}
- public ArtifactDeployerRequestBuilder retryFailedDeploymentCount( int retryFailedDeploymentCount )
- {
+ public ArtifactDeployerRequestBuilder retryFailedDeploymentCount(int retryFailedDeploymentCount) {
this.retryFailedDeploymentCount = retryFailedDeploymentCount;
return this;
}
@Nonnull
- public ArtifactDeployerRequest build()
- {
- return new DefaultArtifactDeployerRequest( session, repository, artifacts, retryFailedDeploymentCount );
+ public ArtifactDeployerRequest build() {
+ return new DefaultArtifactDeployerRequest(session, repository, artifacts, retryFailedDeploymentCount);
}
- private static class DefaultArtifactDeployerRequest extends BaseRequest
- implements ArtifactDeployerRequest
- {
+ private static class DefaultArtifactDeployerRequest extends BaseRequest implements ArtifactDeployerRequest {
private final RemoteRepository repository;
private final Collection<Artifact> artifacts;
private final int retryFailedDeploymentCount;
- DefaultArtifactDeployerRequest( @Nonnull Session session,
- @Nonnull RemoteRepository repository,
- @Nonnull Collection<Artifact> artifacts,
- int retryFailedDeploymentCount )
- {
- super( session );
- this.repository = nonNull( repository, "repository cannot be null" );
- this.artifacts = unmodifiable( nonNull( artifacts, "artifacts cannot be null" ) );
+ DefaultArtifactDeployerRequest(
+ @Nonnull Session session,
+ @Nonnull RemoteRepository repository,
+ @Nonnull Collection<Artifact> artifacts,
+ int retryFailedDeploymentCount) {
+ super(session);
+ this.repository = nonNull(repository, "repository cannot be null");
+ this.artifacts = unmodifiable(nonNull(artifacts, "artifacts cannot be null"));
this.retryFailedDeploymentCount = retryFailedDeploymentCount;
}
@Nonnull
@Override
- public RemoteRepository getRepository()
- {
+ public RemoteRepository getRepository() {
return repository;
}
@Nonnull
@Override
- public Collection<Artifact> getArtifacts()
- {
+ public Collection<Artifact> getArtifacts() {
return artifacts;
}
@Override
- public int getRetryFailedDeploymentCount()
- {
+ public int getRetryFailedDeploymentCount() {
return retryFailedDeploymentCount;
}
}
-
}
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactFactory.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactFactory.java
index c9f2095aa..0a066aa56 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactFactory.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactFactory.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,10 +16,11 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
+import org.apache.maven.api.Artifact;
import org.apache.maven.api.Service;
import org.apache.maven.api.Session;
-import org.apache.maven.api.Artifact;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
@@ -31,8 +30,7 @@ import org.apache.maven.api.annotations.Nonnull;
* @since 4.0
*/
@Experimental
-public interface ArtifactFactory extends Service
-{
+public interface ArtifactFactory extends Service {
/**
* Creates an artifact.
@@ -42,20 +40,23 @@ public interface ArtifactFactory extends Service
* @throws IllegalArgumentException if {@code request} is null or {@code request.session} is null or invalid
*/
@Nonnull
- Artifact create( @Nonnull ArtifactFactoryRequest request );
+ Artifact create(@Nonnull ArtifactFactoryRequest request);
@Nonnull
- default Artifact create( @Nonnull Session session, String groupId,
- String artifactId, String version, String extension )
- {
- return create( ArtifactFactoryRequest.build( session, groupId, artifactId, version, extension ) );
+ default Artifact create(
+ @Nonnull Session session, String groupId, String artifactId, String version, String extension) {
+ return create(ArtifactFactoryRequest.build(session, groupId, artifactId, version, extension));
}
@Nonnull
- default Artifact create( @Nonnull Session session, String groupId, String artifactId, String version,
- String classifier, String extension, String type )
- {
- return create( ArtifactFactoryRequest.build( session, groupId, artifactId,
- version, classifier, extension, type ) );
+ default Artifact create(
+ @Nonnull Session session,
+ String groupId,
+ String artifactId,
+ String version,
+ String classifier,
+ String extension,
+ String type) {
+ return create(ArtifactFactoryRequest.build(session, groupId, artifactId, version, classifier, extension, type));
}
}
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 e351f3863..e5e55ec3d 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,16 +16,16 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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.Session;
import org.apache.maven.api.annotations.NotThreadSafe;
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
/**
*
*
@@ -35,8 +33,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
*/
@Experimental
@Immutable
-public interface ArtifactFactoryRequest
-{
+public interface ArtifactFactoryRequest {
@Nonnull
Session getSession();
@@ -53,40 +50,42 @@ public interface ArtifactFactoryRequest
String getType();
- static ArtifactFactoryRequest build( Session session, String groupId, String artifactId,
- String version, String extension )
- {
+ static ArtifactFactoryRequest build(
+ Session session, String groupId, String artifactId, String version, String extension) {
return ArtifactFactoryRequest.builder()
- .session( nonNull( session, "session cannot be null" ) )
- .groupId( groupId )
- .artifactId( artifactId )
- .version( version )
- .extension( extension )
+ .session(nonNull(session, "session cannot be null"))
+ .groupId(groupId)
+ .artifactId(artifactId)
+ .version(version)
+ .extension(extension)
.build();
}
- static ArtifactFactoryRequest build( Session session, String groupId, String artifactId,
- String version, String classifier, String extension, String type )
- {
+ static ArtifactFactoryRequest build(
+ Session session,
+ String groupId,
+ String artifactId,
+ String version,
+ String classifier,
+ String extension,
+ String type) {
return ArtifactFactoryRequest.builder()
- .session( nonNull( session, "session cannot be null" ) )
- .groupId( groupId )
- .artifactId( artifactId )
- .version( version )
- .classifier( classifier )
- .extension( extension )
- .type( type )
+ .session(nonNull(session, "session cannot be null"))
+ .groupId(groupId)
+ .artifactId(artifactId)
+ .version(version)
+ .classifier(classifier)
+ .extension(extension)
+ .type(type)
.build();
}
- static ArtifactFactoryRequestBuilder builder()
- {
+ static ArtifactFactoryRequestBuilder builder() {
return new ArtifactFactoryRequestBuilder();
}
@NotThreadSafe
- class ArtifactFactoryRequestBuilder
- {
+ class ArtifactFactoryRequestBuilder {
private Session session;
private String groupId;
private String artifactId;
@@ -95,60 +94,49 @@ public interface ArtifactFactoryRequest
private String extension;
private String type;
- ArtifactFactoryRequestBuilder()
- {
- }
+ ArtifactFactoryRequestBuilder() {}
- public ArtifactFactoryRequestBuilder session( Session session )
- {
+ public ArtifactFactoryRequestBuilder session(Session session) {
this.session = session;
return this;
}
- public ArtifactFactoryRequestBuilder groupId( String groupId )
- {
+ public ArtifactFactoryRequestBuilder groupId(String groupId) {
this.groupId = groupId;
return this;
}
- public ArtifactFactoryRequestBuilder artifactId( String artifactId )
- {
+ public ArtifactFactoryRequestBuilder artifactId(String artifactId) {
this.artifactId = artifactId;
return this;
}
- public ArtifactFactoryRequestBuilder version( String version )
- {
+ public ArtifactFactoryRequestBuilder version(String version) {
this.version = version;
return this;
}
- public ArtifactFactoryRequestBuilder classifier( String classifier )
- {
+ public ArtifactFactoryRequestBuilder classifier(String classifier) {
this.classifier = classifier;
return this;
}
- public ArtifactFactoryRequestBuilder extension( String extension )
- {
+ public ArtifactFactoryRequestBuilder extension(String extension) {
this.extension = extension;
return this;
}
- public ArtifactFactoryRequestBuilder type( String type )
- {
+ public ArtifactFactoryRequestBuilder type(String type) {
this.type = type;
return this;
}
- public ArtifactFactoryRequest build()
- {
- return new DefaultArtifactFactoryRequest( session, groupId, artifactId, version,
- classifier, extension, type );
+ public ArtifactFactoryRequest build() {
+ return new DefaultArtifactFactoryRequest(
+ session, groupId, artifactId, version, classifier, extension, type);
}
- private static class DefaultArtifactFactoryRequest extends BaseRequest implements ArtifactFactoryRequest
- {
+ private static class DefaultArtifactFactoryRequest extends BaseRequest implements ArtifactFactoryRequest {
private final String groupId;
private final String artifactId;
private final String version;
@@ -156,15 +144,15 @@ public interface ArtifactFactoryRequest
private final String extension;
private final String type;
- DefaultArtifactFactoryRequest( @Nonnull Session session,
- String groupId,
- String artifactId,
- String version,
- String classifier,
- String extension,
- String type )
- {
- super( session );
+ DefaultArtifactFactoryRequest(
+ @Nonnull Session session,
+ String groupId,
+ String artifactId,
+ String version,
+ String classifier,
+ String extension,
+ String type) {
+ super(session);
this.groupId = groupId;
this.artifactId = artifactId;
this.version = version;
@@ -174,41 +162,34 @@ public interface ArtifactFactoryRequest
}
@Override
- public String getGroupId()
- {
+ public String getGroupId() {
return groupId;
}
@Override
- public String getArtifactId()
- {
+ public String getArtifactId() {
return artifactId;
}
@Override
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
@Override
- public String getClassifier()
- {
+ public String getClassifier() {
return classifier;
}
@Override
- public String getExtension()
- {
+ public String getExtension() {
return extension;
}
@Override
- public String getType()
- {
+ public String getType() {
return type;
}
}
}
-
}
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 35046c6d3..57fa2c4fd 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,13 +16,13 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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;
-import org.apache.maven.api.Artifact;
import org.apache.maven.api.annotations.Experimental;
/**
@@ -34,14 +32,13 @@ import org.apache.maven.api.annotations.Experimental;
* @see Session#withLocalRepository(org.apache.maven.api.LocalRepository)
*/
@Experimental
-public interface ArtifactInstaller extends Service
-{
+public interface ArtifactInstaller extends Service {
/**
* @param request {@link ArtifactInstallerRequest}
* @throws ArtifactInstallerException in case of an error
* @throws IllegalArgumentException in case {@code request} is {@code null}
*/
- void install( ArtifactInstallerRequest request );
+ void install(ArtifactInstallerRequest request);
/**
* @param session the repository session
@@ -51,9 +48,8 @@ public interface ArtifactInstaller extends Service
* @throws IllegalArgumentException in case of parameter {@code session} is {@code null} or
* {@code artifact} is {@code null}.
*/
- default void install( Session session, Artifact artifact )
- {
- install( session, Collections.singletonList( artifact ) );
+ default void install(Session session, Artifact artifact) {
+ install(session, Collections.singletonList(artifact));
}
/**
@@ -66,9 +62,7 @@ public interface ArtifactInstaller extends Service
* or parameter {@code mavenArtifacts} is {@code null} or
* {@code mavenArtifacts.isEmpty()} is {@code true}.
*/
- default void install( Session session, Collection<Artifact> artifacts )
- {
- install( ArtifactInstallerRequest.build( session, artifacts ) );
+ default void install(Session session, Collection<Artifact> artifacts) {
+ install(ArtifactInstallerRequest.build(session, artifacts));
}
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerException.java
index d045a5f82..a93a42d1a 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Experimental;
@@ -25,12 +24,10 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public class ArtifactInstallerException
- extends MavenException
-{
+public class ArtifactInstallerException extends MavenException {
/**
- *
+ *
*/
private static final long serialVersionUID = 3652561971360586373L;
@@ -38,9 +35,7 @@ public class ArtifactInstallerException
* @param message the message of the error
* @param e {@link Exception}
*/
- public ArtifactInstallerException( String message, Exception e )
- {
- super( message, e );
+ public ArtifactInstallerException(String message, Exception e) {
+ super(message, e);
}
-
}
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 dda5c09cd..9e33d2444 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,21 +16,20 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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;
import org.apache.maven.api.annotations.Immutable;
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.annotations.NotThreadSafe;
import org.apache.maven.api.annotations.Nullable;
-import java.util.Collection;
-import java.util.Collections;
-
-import org.apache.maven.api.Session;
-import org.apache.maven.api.Artifact;
-
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
/**
* A request for installing one or more artifacts in the local repository.
*
@@ -40,8 +37,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
*/
@Experimental
@Immutable
-public interface ArtifactInstallerRequest
-{
+public interface ArtifactInstallerRequest {
@Nonnull
Session getSession();
@@ -50,70 +46,56 @@ public interface ArtifactInstallerRequest
Collection<Artifact> getArtifacts();
@Nonnull
- static ArtifactInstallerRequestBuilder builder()
- {
+ static ArtifactInstallerRequestBuilder builder() {
return new ArtifactInstallerRequestBuilder();
}
@Nonnull
- static ArtifactInstallerRequest build( Session session, Collection<Artifact> artifacts )
- {
+ static ArtifactInstallerRequest build(Session session, Collection<Artifact> artifacts) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .artifacts( nonNull( artifacts, "artifacts cannot be null" ) )
+ .session(nonNull(session, "session cannot be null"))
+ .artifacts(nonNull(artifacts, "artifacts cannot be null"))
.build();
}
@NotThreadSafe
- class ArtifactInstallerRequestBuilder
- {
+ class ArtifactInstallerRequestBuilder {
Session session;
Collection<Artifact> artifacts = Collections.emptyList();
- ArtifactInstallerRequestBuilder()
- {
- }
+ ArtifactInstallerRequestBuilder() {}
@Nonnull
- public ArtifactInstallerRequestBuilder session( @Nonnull Session session )
- {
+ public ArtifactInstallerRequestBuilder session(@Nonnull Session session) {
this.session = session;
return this;
}
@Nonnull
- public ArtifactInstallerRequestBuilder artifacts( @Nullable Collection<Artifact> artifacts )
- {
+ public ArtifactInstallerRequestBuilder artifacts(@Nullable Collection<Artifact> artifacts) {
this.artifacts = artifacts != null ? artifacts : Collections.emptyList();
return this;
}
@Nonnull
- public ArtifactInstallerRequest build()
- {
- return new DefaultArtifactInstallerRequest( session, artifacts );
+ public ArtifactInstallerRequest build() {
+ return new DefaultArtifactInstallerRequest(session, artifacts);
}
- static class DefaultArtifactInstallerRequest extends BaseRequest
- implements ArtifactInstallerRequest
- {
+ static class DefaultArtifactInstallerRequest extends BaseRequest implements ArtifactInstallerRequest {
private final Collection<Artifact> artifacts;
- DefaultArtifactInstallerRequest( @Nonnull Session session,
- @Nonnull Collection<Artifact> artifacts )
- {
- super( session );
- this.artifacts = unmodifiable( nonNull( artifacts, "artifacts cannot be null" ) );
+ DefaultArtifactInstallerRequest(@Nonnull Session session, @Nonnull Collection<Artifact> artifacts) {
+ super(session);
+ this.artifacts = unmodifiable(nonNull(artifacts, "artifacts cannot be null"));
}
@Nonnull
@Override
- public Collection<Artifact> getArtifacts()
- {
+ public Collection<Artifact> getArtifacts() {
return artifacts;
}
}
}
-
}
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 70d8f6c14..cf8a6624a 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,34 +16,31 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
-
-import org.apache.maven.api.Service;
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Nonnull;
+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;
+import org.apache.maven.api.annotations.Nonnull;
/**
*
* @since 4.0
*/
@Experimental
-public interface ArtifactManager extends Service
-{
+public interface ArtifactManager extends Service {
/**
* Returns the path of the file previously associated to this artifact
* or {@code Optional.empty()} if no path has been associated.
*/
@Nonnull
- Optional<Path> getPath( @Nonnull Artifact artifact );
+ Optional<Path> getPath(@Nonnull Artifact artifact);
/**
* Associates the given file path to the artifact.
*/
- void setPath( @Nonnull Artifact artifact, Path path );
-
+ void setPath(@Nonnull Artifact artifact, Path path);
}
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 b695bb24e..3d3eadfc1 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,9 +16,9 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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;
@@ -32,8 +30,7 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public interface ArtifactResolver extends Service
-{
+public interface ArtifactResolver extends Service {
/**
* @param request {@link ArtifactResolverRequest}
@@ -42,7 +39,7 @@ public interface ArtifactResolver extends Service
* @throws IllegalArgumentException in case of parameter {@code buildingRequest} is {@code null} or
* parameter {@code mavenArtifact} is {@code null} or invalid
*/
- ArtifactResolverResult resolve( ArtifactResolverRequest request );
+ ArtifactResolverResult resolve(ArtifactResolverRequest request);
/**
* @param session {@link Session}
@@ -52,10 +49,7 @@ public interface ArtifactResolver extends Service
* @throws IllegalArgumentException in case of parameter {@code buildingRequest} is {@code null} or
* parameter {@code coordinate} is {@code null} or invalid
*/
- default ArtifactResolverResult resolve( Session session,
- Collection<? extends ArtifactCoordinate> coordinates )
- {
- return resolve( ArtifactResolverRequest.build( session, coordinates ) );
+ default ArtifactResolverResult resolve(Session session, Collection<? extends ArtifactCoordinate> coordinates) {
+ return resolve(ArtifactResolverRequest.build(session, coordinates));
}
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverException.java
index 2928c984d..5765cf935 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Experimental;
@@ -27,9 +26,7 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public class ArtifactResolverException
- extends MavenException
-{
+public class ArtifactResolverException extends MavenException {
private static final long serialVersionUID = 7252294837746943917L;
@@ -37,9 +34,7 @@ public class ArtifactResolverException
* @param message the message for the exception
* @param e the exception itself
*/
- public ArtifactResolverException( String message, Exception e )
- {
- super( message, e );
+ public ArtifactResolverException(String message, Exception e) {
+ super(message, e);
}
-
}
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 3416c76ca..614ae8108 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,9 +16,11 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
-import java.util.Collection;
+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,8 +28,6 @@ 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.
*
@@ -37,8 +35,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
*/
@Experimental
@Immutable
-public interface ArtifactResolverRequest
-{
+public interface ArtifactResolverRequest {
@Nonnull
Session getSession();
@@ -46,70 +43,58 @@ public interface ArtifactResolverRequest
Collection<? extends ArtifactCoordinate> getCoordinates();
@Nonnull
- static ArtifactResolverRequestBuilder builder()
- {
+ static ArtifactResolverRequestBuilder builder() {
return new ArtifactResolverRequestBuilder();
}
@Nonnull
- static ArtifactResolverRequest build( @Nonnull Session session,
- @Nonnull Collection<? extends ArtifactCoordinate> coordinates )
- {
+ static ArtifactResolverRequest build(
+ @Nonnull Session session, @Nonnull Collection<? extends ArtifactCoordinate> coordinates) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .coordinates( nonNull( coordinates, "coordinates cannot be null" ) )
+ .session(nonNull(session, "session cannot be null"))
+ .coordinates(nonNull(coordinates, "coordinates cannot be null"))
.build();
}
@NotThreadSafe
- class ArtifactResolverRequestBuilder
- {
+ class ArtifactResolverRequestBuilder {
Session session;
Collection<? extends ArtifactCoordinate> coordinates;
- ArtifactResolverRequestBuilder()
- {
- }
+ ArtifactResolverRequestBuilder() {}
@Nonnull
- public ArtifactResolverRequestBuilder session( Session session )
- {
+ public ArtifactResolverRequestBuilder session(Session session) {
this.session = session;
return this;
}
@Nonnull
- public ArtifactResolverRequestBuilder coordinates( Collection<? extends ArtifactCoordinate> coordinates )
- {
+ public ArtifactResolverRequestBuilder coordinates(Collection<? extends ArtifactCoordinate> coordinates) {
this.coordinates = coordinates;
return this;
}
@Nonnull
- public ArtifactResolverRequest build()
- {
- return new DefaultArtifactResolverRequest( session, coordinates );
+ public ArtifactResolverRequest build() {
+ return new DefaultArtifactResolverRequest(session, coordinates);
}
- private static class DefaultArtifactResolverRequest extends BaseRequest implements ArtifactResolverRequest
- {
+ private static class DefaultArtifactResolverRequest extends BaseRequest implements ArtifactResolverRequest {
@Nonnull
private final Collection<? extends ArtifactCoordinate> coordinates;
- DefaultArtifactResolverRequest( @Nonnull Session session,
- @Nonnull Collection<? extends ArtifactCoordinate> coordinates )
- {
- super( session );
- this.coordinates = unmodifiable( nonNull( coordinates, "coordinates cannot be null" ) );
+ DefaultArtifactResolverRequest(
+ @Nonnull Session session, @Nonnull Collection<? extends ArtifactCoordinate> coordinates) {
+ super(session);
+ this.coordinates = unmodifiable(nonNull(coordinates, "coordinates cannot be null"));
}
@Nonnull
@Override
- public Collection<? extends ArtifactCoordinate> getCoordinates()
- {
+ public Collection<? extends ArtifactCoordinate> getCoordinates() {
return coordinates;
}
}
}
-
}
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 74bd5a741..2a50239f8 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,26 +16,24 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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;
/**
* The Artifact Result
- *
+ *
* @since 4.0
*/
@Experimental
-public interface ArtifactResolverResult
-{
+public interface ArtifactResolverResult {
/**
* @return {@link Artifact}
*/
@Nonnull
Map<Artifact, Path> getArtifacts();
-
}
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 f3937b28a..e48f2b55e 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,15 +16,14 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
-
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Nonnull;
+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;
/**
* Base class for requests.
@@ -34,34 +31,29 @@ import org.apache.maven.api.Session;
* @since 4.0
*/
@Experimental
-abstract class BaseRequest
-{
+abstract class BaseRequest {
private final Session session;
- protected BaseRequest( @Nonnull Session session )
- {
- this.session = nonNull( session, "session cannot be null" );
+ protected BaseRequest(@Nonnull Session session) {
+ this.session = nonNull(session, "session cannot be null");
}
@Nonnull
- public Session getSession()
- {
+ public Session getSession() {
return session;
}
- public static <T> T nonNull( T obj, String message )
- {
- if ( obj == null )
- {
- throw new IllegalArgumentException( message );
+ public static <T> T nonNull(T obj, String message) {
+ if (obj == null) {
+ throw new IllegalArgumentException(message);
}
return obj;
}
- protected static <T> Collection<T> unmodifiable( Collection<T> obj )
- {
+ protected static <T> Collection<T> unmodifiable(Collection<T> obj) {
return obj != null && !obj.isEmpty()
- ? Collections.unmodifiableCollection( new ArrayList<>( obj ) ) : Collections.emptyList();
+ ? Collections.unmodifiableCollection(new ArrayList<>(obj))
+ : Collections.emptyList();
}
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/BuilderProblem.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/BuilderProblem.java
index d1bcf501b..8127bdb9f 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/BuilderProblem.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/BuilderProblem.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Immutable;
@@ -32,8 +31,7 @@ import org.apache.maven.api.annotations.Nullable;
*/
@Experimental
@Immutable
-public interface BuilderProblem
-{
+public interface BuilderProblem {
/**
* Gets the hint about the source of the problem. While the syntax of this hint is unspecified and depends on the
@@ -102,12 +100,9 @@ public interface BuilderProblem
* @since 4.0
*/
@Experimental
- enum Severity
- {
-
+ enum Severity {
FATAL, //
ERROR, //
WARNING //
-
}
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollector.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollector.java
index a8a651c38..73f136671 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollector.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollector.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,15 +16,15 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
-import org.apache.maven.api.Service;
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Nonnull;
-
-import org.apache.maven.api.Session;
import org.apache.maven.api.Artifact;
import org.apache.maven.api.DependencyCoordinate;
import org.apache.maven.api.Project;
+import org.apache.maven.api.Service;
+import org.apache.maven.api.Session;
+import org.apache.maven.api.annotations.Experimental;
+import org.apache.maven.api.annotations.Nonnull;
/**
* The DependencyCollector service can be used to collect dependencies
@@ -37,8 +35,7 @@ import org.apache.maven.api.Project;
* @since 4.0
*/
@Experimental
-public interface DependencyCollector extends Service
-{
+public interface DependencyCollector extends Service {
/**
* Collects the transitive dependencies and builds a dependency graph.
@@ -55,7 +52,7 @@ public interface DependencyCollector extends Service
* @see DependencyCollector#collect(Session, Artifact)
*/
@Nonnull
- DependencyCollectorResult collect( @Nonnull DependencyCollectorRequest request );
+ DependencyCollectorResult collect(@Nonnull DependencyCollectorRequest request);
/**
* Collects the transitive dependencies of some artifacts and builds a dependency graph. Note that this operation is
@@ -70,10 +67,8 @@ public interface DependencyCollector extends Service
* @see #collect(DependencyCollectorRequest)
*/
@Nonnull
- default DependencyCollectorResult collect( @Nonnull Session session,
- @Nonnull DependencyCoordinate root )
- {
- return collect( DependencyCollectorRequest.build( session, root ) );
+ default DependencyCollectorResult collect(@Nonnull Session session, @Nonnull DependencyCoordinate root) {
+ return collect(DependencyCollectorRequest.build(session, root));
}
/**
@@ -89,10 +84,8 @@ public interface DependencyCollector extends Service
* @see #collect(DependencyCollectorRequest)
*/
@Nonnull
- default DependencyCollectorResult collect( @Nonnull Session session,
- @Nonnull Project project )
- {
- return collect( DependencyCollectorRequest.build( session, project ) );
+ default DependencyCollectorResult collect(@Nonnull Session session, @Nonnull Project project) {
+ return collect(DependencyCollectorRequest.build(session, project));
}
/**
@@ -108,10 +101,7 @@ public interface DependencyCollector extends Service
* @see #collect(DependencyCollectorRequest)
*/
@Nonnull
- default DependencyCollectorResult collect( @Nonnull Session session,
- @Nonnull Artifact artifact )
- {
- return collect( DependencyCollectorRequest.build( session, artifact ) );
+ default DependencyCollectorResult collect(@Nonnull Session session, @Nonnull Artifact artifact) {
+ return collect(DependencyCollectorRequest.build(session, artifact));
}
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorException.java
index d173c0f78..1a584470e 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Experimental;
@@ -28,9 +27,7 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public class DependencyCollectorException
- extends MavenException
-{
+public class DependencyCollectorException extends MavenException {
/**
*
*/
@@ -40,8 +37,7 @@ public class DependencyCollectorException
* @param message the message you would give for the exception
* @param cause the cause which is related to the message
*/
- public DependencyCollectorException( String message, Throwable cause )
- {
- super( message, cause );
+ public DependencyCollectorException(String message, Throwable cause) {
+ super(message, cause);
}
}
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 f94b1e9a1..46c7ea372 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,13 +16,15 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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,8 +35,6 @@ 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
@@ -49,8 +47,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
*/
@Experimental
@Immutable
-public interface DependencyCollectorRequest
-{
+public interface DependencyCollectorRequest {
@Nonnull
Session getSession();
@@ -70,43 +67,38 @@ public interface DependencyCollectorRequest
boolean getVerbose();
@Nonnull
- static DependencyCollectorRequest build( @Nonnull Session session, Artifact root )
- {
+ static DependencyCollectorRequest build(@Nonnull Session session, Artifact root) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .rootArtifact( nonNull( root, "root cannot be null" ) )
+ .session(nonNull(session, "session cannot be null"))
+ .rootArtifact(nonNull(root, "root cannot be null"))
.build();
}
@Nonnull
- static DependencyCollectorRequest build( @Nonnull Session session, @Nonnull DependencyCoordinate root )
- {
+ static DependencyCollectorRequest build(@Nonnull Session session, @Nonnull DependencyCoordinate root) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .root( nonNull( root, "root cannot be null" ) )
+ .session(nonNull(session, "session cannot be null"))
+ .root(nonNull(root, "root cannot be null"))
.build();
}
@Nonnull
- static DependencyCollectorRequest build( @Nonnull Session session, @Nonnull Project project )
- {
+ static DependencyCollectorRequest build(@Nonnull Session session, @Nonnull Project project) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .rootArtifact( nonNull( project, "project cannot be null" ).getArtifact() )
- .dependencies( project.getDependencies() )
- .managedDependencies( project.getManagedDependencies() )
+ .session(nonNull(session, "session cannot be null"))
+ .rootArtifact(nonNull(project, "project cannot be null").getArtifact())
+ .dependencies(project.getDependencies())
+ .managedDependencies(project.getManagedDependencies())
.build();
}
@Nonnull
- static DependencyCollectorRequestBuilder builder()
- {
+ static DependencyCollectorRequestBuilder builder() {
return new DependencyCollectorRequestBuilder();
}
@NotThreadSafe
- class DependencyCollectorRequestBuilder
- {
+ class DependencyCollectorRequestBuilder {
Session session;
Artifact rootArtifact;
@@ -115,13 +107,10 @@ public interface DependencyCollectorRequest
List<DependencyCoordinate> managedDependencies = Collections.emptyList();
boolean verbose;
- DependencyCollectorRequestBuilder()
- {
- }
+ DependencyCollectorRequestBuilder() {}
@Nonnull
- public DependencyCollectorRequestBuilder session( @Nonnull Session session )
- {
+ public DependencyCollectorRequestBuilder session(@Nonnull Session session) {
this.session = session;
return this;
}
@@ -138,8 +127,7 @@ public interface DependencyCollectorRequest
* @return this request for chaining, never {@code null}
*/
@Nonnull
- public DependencyCollectorRequestBuilder rootArtifact( @Nullable Artifact rootArtifact )
- {
+ public DependencyCollectorRequestBuilder rootArtifact(@Nullable Artifact rootArtifact) {
this.rootArtifact = rootArtifact;
return this;
}
@@ -149,8 +137,7 @@ public interface DependencyCollectorRequest
* @return this request for chaining, never {@code null}
*/
@Nonnull
- public DependencyCollectorRequestBuilder root( @Nonnull DependencyCoordinate root )
- {
+ public DependencyCollectorRequestBuilder root(@Nonnull DependencyCoordinate root) {
this.root = root;
return this;
}
@@ -164,9 +151,8 @@ public interface DependencyCollectorRequest
* @return this request for chaining, never {@code null}
*/
@Nonnull
- public DependencyCollectorRequestBuilder dependencies( @Nullable List<DependencyCoordinate> dependencies )
- {
- this.dependencies = ( dependencies != null ) ? dependencies : Collections.emptyList();
+ public DependencyCollectorRequestBuilder dependencies(@Nullable List<DependencyCoordinate> dependencies) {
+ this.dependencies = (dependencies != null) ? dependencies : Collections.emptyList();
return this;
}
@@ -177,20 +163,16 @@ public interface DependencyCollectorRequest
* @return this request for chaining, never {@code null}
*/
@Nonnull
- public DependencyCollectorRequestBuilder dependency( @Nullable DependencyCoordinate dependency )
- {
- if ( dependency != null )
- {
- if ( this.dependencies.isEmpty() )
- {
+ public DependencyCollectorRequestBuilder dependency(@Nullable DependencyCoordinate dependency) {
+ if (dependency != null) {
+ if (this.dependencies.isEmpty()) {
this.dependencies = new ArrayList<>();
}
- this.dependencies.add( dependency );
+ this.dependencies.add(dependency);
}
return this;
}
-
/**
* Sets the dependency management to apply to transitive dependencies. To clarify, this management does not
* apply to
@@ -201,9 +183,8 @@ public interface DependencyCollectorRequest
*/
@Nonnull
public DependencyCollectorRequestBuilder managedDependencies(
- @Nullable List<DependencyCoordinate> managedDependencies )
- {
- this.managedDependencies = ( managedDependencies != null ) ? managedDependencies : Collections.emptyList();
+ @Nullable List<DependencyCoordinate> managedDependencies) {
+ this.managedDependencies = (managedDependencies != null) ? managedDependencies : Collections.emptyList();
return this;
}
@@ -215,15 +196,12 @@ public interface DependencyCollectorRequest
* @return this request for chaining, never {@code null}
*/
@Nonnull
- public DependencyCollectorRequestBuilder managedDependency( @Nullable DependencyCoordinate managedDependency )
- {
- if ( managedDependency != null )
- {
- if ( this.managedDependencies.isEmpty() )
- {
+ public DependencyCollectorRequestBuilder managedDependency(@Nullable DependencyCoordinate managedDependency) {
+ if (managedDependency != null) {
+ if (this.managedDependencies.isEmpty()) {
this.managedDependencies = new ArrayList<>();
}
- this.managedDependencies.add( managedDependency );
+ this.managedDependencies.add(managedDependency);
}
return this;
}
@@ -235,34 +213,24 @@ public interface DependencyCollectorRequest
* @return this request for chaining, never {@code null}
*/
@Nonnull
- public DependencyCollectorRequestBuilder verbose( boolean verbose )
- {
+ public DependencyCollectorRequestBuilder verbose(boolean verbose) {
this.verbose = verbose;
return this;
}
@Nonnull
- public DependencyCollectorRequest build()
- {
+ public DependencyCollectorRequest build() {
return new DefaultDependencyCollectorRequest(
- session,
- rootArtifact,
- root,
- dependencies,
- managedDependencies,
- verbose );
+ session, rootArtifact, root, dependencies, managedDependencies, verbose);
}
- static class DefaultDependencyCollectorRequest extends BaseRequest
- implements DependencyCollectorRequest
- {
+ static class DefaultDependencyCollectorRequest extends BaseRequest implements DependencyCollectorRequest {
private final Artifact rootArtifact;
private final DependencyCoordinate root;
private final Collection<DependencyCoordinate> dependencies;
private final Collection<DependencyCoordinate> managedDependencies;
private final boolean verbose;
-
/**
* Creates a request with the specified properties.
*
@@ -276,59 +244,50 @@ public interface DependencyCollectorRequest
@Nullable DependencyCoordinate root,
@Nonnull Collection<DependencyCoordinate> dependencies,
@Nonnull Collection<DependencyCoordinate> managedDependencies,
- boolean verbose )
- {
- super( session );
+ boolean verbose) {
+ super(session);
this.rootArtifact = rootArtifact;
this.root = root;
- this.dependencies = unmodifiable( nonNull( dependencies, "dependencies cannot be null" ) );
- this.managedDependencies = unmodifiable( nonNull( managedDependencies,
- "managedDependencies cannot be null" ) );
+ this.dependencies = unmodifiable(nonNull(dependencies, "dependencies cannot be null"));
+ this.managedDependencies =
+ unmodifiable(nonNull(managedDependencies, "managedDependencies cannot be null"));
this.verbose = verbose;
}
@Nonnull
@Override
- public Optional<Artifact> getRootArtifact()
- {
- return Optional.ofNullable( rootArtifact );
+ public Optional<Artifact> getRootArtifact() {
+ return Optional.ofNullable(rootArtifact);
}
@Nonnull
@Override
- public Optional<DependencyCoordinate> getRoot()
- {
- return Optional.ofNullable( root );
+ public Optional<DependencyCoordinate> getRoot() {
+ return Optional.ofNullable(root);
}
@Nonnull
@Override
- public Collection<DependencyCoordinate> getDependencies()
- {
+ public Collection<DependencyCoordinate> getDependencies() {
return dependencies;
}
@Nonnull
@Override
- public Collection<DependencyCoordinate> getManagedDependencies()
- {
+ public Collection<DependencyCoordinate> getManagedDependencies() {
return managedDependencies;
}
@Override
- public boolean getVerbose()
- {
+ public boolean getVerbose() {
return verbose;
}
@Nonnull
@Override
- public String toString()
- {
+ public String toString() {
return getRoot() + " -> " + getDependencies();
}
-
}
}
-
}
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 2d00af211..9f01ca7af 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,9 +16,9 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import java.util.List;
-
import org.apache.maven.api.Node;
import org.apache.maven.api.annotations.Experimental;
@@ -31,20 +29,18 @@ import org.apache.maven.api.annotations.Experimental;
* @see DependencyCollector#collect(DependencyCollectorRequest)
*/
@Experimental
-public interface DependencyCollectorResult
-{
- /**
- * Gets the exceptions that occurred while building the dependency graph.
- *
- * @return the exceptions that occurred, never {@code null}
- */
- List<Exception> getExceptions();
-
- /**
- * Gets the root node of the dependency graph.
- *
- * @return the root node of the dependency graph or {@code null} if none
- */
- Node getRoot();
+public interface DependencyCollectorResult {
+ /**
+ * Gets the exceptions that occurred while building the dependency graph.
+ *
+ * @return the exceptions that occurred, never {@code null}
+ */
+ List<Exception> getExceptions();
+ /**
+ * Gets the root node of the dependency graph.
+ *
+ * @return the root node of the dependency graph or {@code null} if none
+ */
+ Node getRoot();
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactory.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactory.java
index 809a418a1..b3ddb909f 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactory.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactory.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.ArtifactCoordinate;
import org.apache.maven.api.DependencyCoordinate;
@@ -34,8 +33,7 @@ import org.apache.maven.api.model.ReportPlugin;
* @since 4.0
*/
@Experimental
-public interface DependencyCoordinateFactory extends Service
-{
+public interface DependencyCoordinateFactory extends Service {
/**
* Creates a new {@link DependencyCoordinate} object from the request.
@@ -47,43 +45,47 @@ public interface DependencyCoordinateFactory extends Service
* if {@code request.getSession()} is null or invalid
*/
@Nonnull
- DependencyCoordinate create( @Nonnull DependencyCoordinateFactoryRequest request );
+ DependencyCoordinate create(@Nonnull DependencyCoordinateFactoryRequest request);
@Nonnull
- default DependencyCoordinate create( @Nonnull Session session, @Nonnull ArtifactCoordinate coordinate )
- {
- return create( DependencyCoordinateFactoryRequest.build( session, coordinate ) );
+ default DependencyCoordinate create(@Nonnull Session session, @Nonnull ArtifactCoordinate coordinate) {
+ return create(DependencyCoordinateFactoryRequest.build(session, coordinate));
}
@Nonnull
- default DependencyCoordinate create( @Nonnull Session session, @Nonnull org.apache.maven.api.Dependency dependency )
- {
- return create( DependencyCoordinateFactoryRequest.build( session, dependency ) );
+ default DependencyCoordinate create(@Nonnull Session session, @Nonnull org.apache.maven.api.Dependency dependency) {
+ return create(DependencyCoordinateFactoryRequest.build(session, dependency));
}
@Nonnull
- default DependencyCoordinate create( @Nonnull Session session, Dependency dependency )
- {
- return create( DependencyCoordinateFactoryRequest.build( session,
- dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion(),
- dependency.getClassifier(), null, dependency.getType() ) );
+ default DependencyCoordinate create(@Nonnull Session session, Dependency dependency) {
+ return create(DependencyCoordinateFactoryRequest.build(
+ session,
+ dependency.getGroupId(),
+ dependency.getArtifactId(),
+ dependency.getVersion(),
+ dependency.getClassifier(),
+ null,
+ dependency.getType()));
}
@Nonnull
- default DependencyCoordinate create( @Nonnull Session session, Plugin plugin )
- {
+ default DependencyCoordinate create(@Nonnull Session session, Plugin plugin) {
// TODO: hard coded string
- return create( DependencyCoordinateFactoryRequest.build( session,
- plugin.getGroupId(), plugin.getArtifactId(), plugin.getVersion(),
- null, null, "maven-plugin" ) );
+ return create(DependencyCoordinateFactoryRequest.build(
+ session, plugin.getGroupId(), plugin.getArtifactId(), plugin.getVersion(), null, null, "maven-plugin"));
}
@Nonnull
- default DependencyCoordinate create( @Nonnull Session session, ReportPlugin reportPlugin )
- {
+ default DependencyCoordinate create(@Nonnull Session session, ReportPlugin reportPlugin) {
// TODO: hard coded string
- return create( DependencyCoordinateFactoryRequest.build( session,
- reportPlugin.getGroupId(), reportPlugin.getArtifactId(), reportPlugin.getVersion(),
- null, null, "maven-plugin" ) );
+ return create(DependencyCoordinateFactoryRequest.build(
+ session,
+ reportPlugin.getGroupId(),
+ reportPlugin.getArtifactId(),
+ reportPlugin.getVersion(),
+ null,
+ null,
+ "maven-plugin"));
}
}
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 2573fe427..583aa70d9 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,11 +16,13 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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,16 +32,13 @@ 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
*/
@Experimental
@Immutable
-public interface DependencyCoordinateFactoryRequest extends ArtifactCoordinateFactoryRequest
-{
+public interface DependencyCoordinateFactoryRequest extends ArtifactCoordinateFactoryRequest {
String getScope();
@@ -51,58 +48,59 @@ public interface DependencyCoordinateFactoryRequest extends ArtifactCoordinateFa
Collection<Exclusion> getExclusions();
@Nonnull
- static DependencyCoordinateFactoryRequest build( @Nonnull Session session, String groupId, String artifactId,
- String version, String classifier, String extension, String type )
- {
+ static DependencyCoordinateFactoryRequest build(
+ @Nonnull Session session,
+ String groupId,
+ String artifactId,
+ String version,
+ String classifier,
+ String extension,
+ String type) {
return DependencyCoordinateFactoryRequest.builder()
- .session( nonNull( session, "session cannot be null" ) )
- .groupId( groupId )
- .artifactId( artifactId )
- .version( version )
- .classifier( classifier )
- .extension( extension )
- .type( type )
+ .session(nonNull(session, "session cannot be null"))
+ .groupId(groupId)
+ .artifactId(artifactId)
+ .version(version)
+ .classifier(classifier)
+ .extension(extension)
+ .type(type)
.build();
}
@Nonnull
- static DependencyCoordinateFactoryRequest build( @Nonnull Session session, @Nonnull ArtifactCoordinate coordinate )
- {
+ static DependencyCoordinateFactoryRequest build(@Nonnull Session session, @Nonnull ArtifactCoordinate coordinate) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .groupId( nonNull( coordinate, "coordinate cannot be null" ).getGroupId() )
- .artifactId( coordinate.getArtifactId() )
- .version( coordinate.getVersion().asString() )
- .classifier( coordinate.getClassifier() )
- .extension( coordinate.getExtension() )
+ .session(nonNull(session, "session cannot be null"))
+ .groupId(nonNull(coordinate, "coordinate cannot be null").getGroupId())
+ .artifactId(coordinate.getArtifactId())
+ .version(coordinate.getVersion().asString())
+ .classifier(coordinate.getClassifier())
+ .extension(coordinate.getExtension())
.build();
}
@Nonnull
- static DependencyCoordinateFactoryRequest build( @Nonnull Session session, @Nonnull Dependency dependency )
- {
+ static DependencyCoordinateFactoryRequest build(@Nonnull Session session, @Nonnull Dependency dependency) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .groupId( nonNull( dependency, "dependency" ).getGroupId() )
- .artifactId( dependency.getArtifactId() )
- .version( dependency.getVersion().asString() )
- .classifier( dependency.getClassifier() )
- .extension( dependency.getExtension() )
- .type( dependency.getType().getName() )
- .scope( dependency.getScope().id() )
- .optional( dependency.isOptional() )
+ .session(nonNull(session, "session cannot be null"))
+ .groupId(nonNull(dependency, "dependency").getGroupId())
+ .artifactId(dependency.getArtifactId())
+ .version(dependency.getVersion().asString())
+ .classifier(dependency.getClassifier())
+ .extension(dependency.getExtension())
+ .type(dependency.getType().getName())
+ .scope(dependency.getScope().id())
+ .optional(dependency.isOptional())
.build();
}
@Nonnull
- static DependencyCoordinateFactoryRequestBuilder builder()
- {
+ static DependencyCoordinateFactoryRequestBuilder builder() {
return new DependencyCoordinateFactoryRequestBuilder();
}
@NotThreadSafe
- class DependencyCoordinateFactoryRequestBuilder
- {
+ class DependencyCoordinateFactoryRequestBuilder {
private Session session;
private String groupId;
private String artifactId;
@@ -114,100 +112,80 @@ public interface DependencyCoordinateFactoryRequest extends ArtifactCoordinateFa
private boolean optional;
private Collection<Exclusion> exclusions = Collections.emptyList();
- DependencyCoordinateFactoryRequestBuilder()
- {
- }
+ DependencyCoordinateFactoryRequestBuilder() {}
- public DependencyCoordinateFactoryRequestBuilder session( Session session )
- {
+ public DependencyCoordinateFactoryRequestBuilder session(Session session) {
this.session = session;
return this;
}
- public DependencyCoordinateFactoryRequestBuilder groupId( String groupId )
- {
+ public DependencyCoordinateFactoryRequestBuilder groupId(String groupId) {
this.groupId = groupId;
return this;
}
- public DependencyCoordinateFactoryRequestBuilder artifactId( String artifactId )
- {
+ public DependencyCoordinateFactoryRequestBuilder artifactId(String artifactId) {
this.artifactId = artifactId;
return this;
}
- public DependencyCoordinateFactoryRequestBuilder version( String version )
- {
+ public DependencyCoordinateFactoryRequestBuilder version(String version) {
this.version = version;
return this;
}
- public DependencyCoordinateFactoryRequestBuilder classifier( String classifier )
- {
+ public DependencyCoordinateFactoryRequestBuilder classifier(String classifier) {
this.classifier = classifier;
return this;
}
- public DependencyCoordinateFactoryRequestBuilder extension( String extension )
- {
+ public DependencyCoordinateFactoryRequestBuilder extension(String extension) {
this.extension = extension;
return this;
}
- public DependencyCoordinateFactoryRequestBuilder type( String type )
- {
+ public DependencyCoordinateFactoryRequestBuilder type(String type) {
this.type = type;
return this;
}
- public DependencyCoordinateFactoryRequestBuilder scope( String scope )
- {
+ public DependencyCoordinateFactoryRequestBuilder scope(String scope) {
this.scope = scope;
return this;
}
- public DependencyCoordinateFactoryRequestBuilder optional( boolean optional )
- {
+ public DependencyCoordinateFactoryRequestBuilder optional(boolean optional) {
this.optional = optional;
return this;
}
- public DependencyCoordinateFactoryRequestBuilder exclusions( Collection<Exclusion> exclusions )
- {
- if ( exclusions != null )
- {
- if ( this.exclusions.isEmpty() )
- {
+ public DependencyCoordinateFactoryRequestBuilder exclusions(Collection<Exclusion> exclusions) {
+ if (exclusions != null) {
+ if (this.exclusions.isEmpty()) {
this.exclusions = new ArrayList<>();
}
- this.exclusions.addAll( exclusions );
+ this.exclusions.addAll(exclusions);
}
return this;
}
- public DependencyCoordinateFactoryRequestBuilder exclusion( Exclusion exclusion )
- {
- if ( exclusion != null )
- {
- if ( this.exclusions.isEmpty() )
- {
+ public DependencyCoordinateFactoryRequestBuilder exclusion(Exclusion exclusion) {
+ if (exclusion != null) {
+ if (this.exclusions.isEmpty()) {
this.exclusions = new ArrayList<>();
}
- this.exclusions.add( exclusion );
+ this.exclusions.add(exclusion);
}
return this;
}
- public DependencyCoordinateFactoryRequest build()
- {
- return new DefaultDependencyCoordinateFactoryRequest( session, groupId, artifactId, version,
- classifier, extension, type, scope, optional, exclusions );
+ public DependencyCoordinateFactoryRequest build() {
+ return new DefaultDependencyCoordinateFactoryRequest(
+ session, groupId, artifactId, version, classifier, extension, type, scope, optional, exclusions);
}
- private static class DefaultDependencyCoordinateFactoryRequest
- extends BaseRequest
- implements DependencyCoordinateFactoryRequest
- {
+ private static class DefaultDependencyCoordinateFactoryRequest extends BaseRequest
+ implements DependencyCoordinateFactoryRequest {
private final String groupId;
private final String artifactId;
private final String version;
@@ -218,19 +196,19 @@ public interface DependencyCoordinateFactoryRequest extends ArtifactCoordinateFa
private final boolean optional;
private final Collection<Exclusion> exclusions;
- @SuppressWarnings( "checkstyle:ParameterNumber" )
+ @SuppressWarnings("checkstyle:ParameterNumber")
private DefaultDependencyCoordinateFactoryRequest(
- @Nonnull Session session, String groupId,
- String artifactId,
- String version,
- String classifier,
- String extension,
- String type,
- String scope,
- boolean optional,
- Collection<Exclusion> exclusions )
- {
- super( session );
+ @Nonnull Session session,
+ String groupId,
+ String artifactId,
+ String version,
+ String classifier,
+ String extension,
+ String type,
+ String scope,
+ boolean optional,
+ Collection<Exclusion> exclusions) {
+ super(session);
this.groupId = groupId;
this.artifactId = artifactId;
this.version = version;
@@ -243,60 +221,50 @@ public interface DependencyCoordinateFactoryRequest extends ArtifactCoordinateFa
}
@Override
- public String getGroupId()
- {
+ public String getGroupId() {
return groupId;
}
@Override
- public String getArtifactId()
- {
+ public String getArtifactId() {
return artifactId;
}
@Override
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
@Override
- public String getClassifier()
- {
+ public String getClassifier() {
return classifier;
}
@Override
- public String getExtension()
- {
+ public String getExtension() {
return extension;
}
@Override
- public String getType()
- {
+ public String getType() {
return type;
}
@Override
- public String getScope()
- {
+ public String getScope() {
return scope;
}
@Override
- public boolean isOptional()
- {
+ public boolean isOptional() {
return optional;
}
@Nonnull
@Override
- public Collection<Exclusion> getExclusions()
- {
+ public Collection<Exclusion> getExclusions() {
return exclusions;
}
}
}
-
}
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 ce813462c..ffc798b37 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,9 +16,9 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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;
@@ -33,11 +31,9 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public interface LocalRepositoryManager extends Service
-{
-
- Path getPathForLocalArtifact( Session session, LocalRepository local, Artifact artifact );
+public interface LocalRepositoryManager extends Service {
- Path getPathForRemoteArtifact( Session session, LocalRepository local, RemoteRepository remote, Artifact artifact );
+ Path getPathForLocalArtifact(Session session, LocalRepository local, Artifact artifact);
+ Path getPathForRemoteArtifact(Session session, LocalRepository local, RemoteRepository remote, Artifact artifact);
}
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 93e24994e..3dc7e8a0b 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,21 +16,19 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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
-{
-
- <T> T lookup( Class<T> type );
+public interface Lookup extends Service {
- <T> T lookup( Class<T> type, String name );
+ <T> T lookup(Class<T> type);
- <T> List<T> lookupList( Class<T> type );
+ <T> T lookup(Class<T> type, String name);
- <T> Map<String, T> lookupMap( Class<T> type );
+ <T> List<T> lookupList(Class<T> type);
+ <T> Map<String, T> lookupMap(Class<T> type);
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/LookupException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/LookupException.java
index abfa15da1..a2041e6de 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/LookupException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/LookupException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Experimental;
@@ -27,24 +26,19 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public class LookupException
- extends MavenException
-{
+public class LookupException extends MavenException {
/**
* @param message the message to give
* @param e the {@link Exception}
*/
- public LookupException( String message, Exception e )
- {
- super( message, e );
+ public LookupException(String message, Exception e) {
+ super(message, e);
}
/**
* @param e the {@link Exception}
*/
- public LookupException( Exception e )
- {
- super( e );
+ public LookupException(Exception e) {
+ super(e);
}
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/MavenException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/MavenException.java
index aba7dd721..851e11f5e 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/MavenException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/MavenException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Experimental;
@@ -27,25 +26,18 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public class MavenException extends RuntimeException
-{
- public MavenException()
- {
- }
+public class MavenException extends RuntimeException {
+ public MavenException() {}
- public MavenException( String message )
- {
- super( message );
+ public MavenException(String message) {
+ super(message);
}
- public MavenException( String message, Throwable cause )
- {
- super( message, cause );
+ public MavenException(String message, Throwable cause) {
+ super(message, cause);
}
- public MavenException( Throwable cause )
- {
- super( cause );
+ public MavenException(Throwable cause) {
+ super(cause);
}
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/MessageBuilder.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/MessageBuilder.java
index 446d0bc69..963a06c6a 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/MessageBuilder.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/MessageBuilder.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Nonnull;
@@ -27,8 +26,7 @@ import org.apache.maven.api.annotations.Nonnull;
* @since 4.0
* @see MessageBuilderFactory
*/
-public interface MessageBuilder
-{
+public interface MessageBuilder {
/**
* Append message content in success style.
* By default, bold green
@@ -36,8 +34,8 @@ public interface MessageBuilder
* @return the current builder
*/
@Nonnull
- MessageBuilder success( Object message );
-
+ MessageBuilder success(Object message);
+
/**
* Append message content in warning style.
* By default, bold yellow
@@ -45,8 +43,8 @@ public interface MessageBuilder
* @return the current builder
*/
@Nonnull
- MessageBuilder warning( Object message );
-
+ MessageBuilder warning(Object message);
+
/**
* Append message content in failure style.
* By default, bold red
@@ -54,7 +52,7 @@ public interface MessageBuilder
* @return the current builder
*/
@Nonnull
- MessageBuilder failure( Object message );
+ MessageBuilder failure(Object message);
/**
* Append message content in strong style.
@@ -63,8 +61,8 @@ public interface MessageBuilder
* @return the current builder
*/
@Nonnull
- MessageBuilder strong( Object message );
-
+ MessageBuilder strong(Object message);
+
/**
* Append message content in mojo style.
* By default, green
@@ -72,8 +70,8 @@ public interface MessageBuilder
* @return the current builder
*/
@Nonnull
- MessageBuilder mojo( Object message );
-
+ MessageBuilder mojo(Object message);
+
/**
* Append message content in project style.
* By default, cyan
@@ -81,8 +79,8 @@ public interface MessageBuilder
* @return the current builder
*/
@Nonnull
- MessageBuilder project( Object message );
-
+ MessageBuilder project(Object message);
+
//
// message building methods modelled after Ansi methods
//
@@ -94,7 +92,7 @@ public interface MessageBuilder
* @return the current builder
*/
@Nonnull
- MessageBuilder a( char[] value, int offset, int len );
+ MessageBuilder a(char[] value, int offset, int len);
/**
* Append content to the message buffer.
@@ -102,7 +100,7 @@ public interface MessageBuilder
* @return the current builder
*/
@Nonnull
- MessageBuilder a( char[] value );
+ MessageBuilder a(char[] value);
/**
* Append content to the message buffer.
@@ -112,7 +110,7 @@ public interface MessageBuilder
* @return the current builder
*/
@Nonnull
- MessageBuilder a( CharSequence value, int start, int end );
+ MessageBuilder a(CharSequence value, int start, int end);
/**
* Append content to the message buffer.
@@ -120,7 +118,7 @@ public interface MessageBuilder
* @return the current builder
*/
@Nonnull
- MessageBuilder a( CharSequence value );
+ MessageBuilder a(CharSequence value);
/**
* Append content to the message buffer.
@@ -128,7 +126,7 @@ public interface MessageBuilder
* @return the current builder
*/
@Nonnull
- MessageBuilder a( Object value );
+ MessageBuilder a(Object value);
/**
* Append newline to the message buffer.
@@ -145,7 +143,7 @@ public interface MessageBuilder
* @return the current builder
*/
@Nonnull
- MessageBuilder format( String pattern, Object... args );
+ MessageBuilder format(String pattern, Object... args);
/**
* Return the built message.
@@ -153,5 +151,4 @@ public interface MessageBuilder
*/
@Nonnull
String build();
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/MessageBuilderFactory.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/MessageBuilderFactory.java
index 5290dab14..030c815d7 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/MessageBuilderFactory.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/MessageBuilderFactory.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.Service;
import org.apache.maven.api.annotations.Experimental;
@@ -29,8 +28,7 @@ import org.apache.maven.api.annotations.Nonnull;
* @since 4.0
*/
@Experimental
-public interface MessageBuilderFactory extends Service
-{
+public interface MessageBuilderFactory extends Service {
/**
* Checks if the underlying output does support styling or not.
* @return whether color styling is supported or not
@@ -56,7 +54,7 @@ public interface MessageBuilderFactory extends Service
* @return a new message builder
*/
@Nonnull
- MessageBuilder builder( @Nonnull StringBuilder stringBuilder );
+ MessageBuilder builder(@Nonnull StringBuilder stringBuilder);
/**
* Creates a new message builder of the specified size.
@@ -64,8 +62,7 @@ public interface MessageBuilderFactory extends Service
* @return a new message builder
*/
@Nonnull
- default MessageBuilder builder( int size )
- {
- return builder( new StringBuilder( size ) );
+ default MessageBuilder builder(int size) {
+ return builder(new StringBuilder(size));
}
}
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 303cdb342..cfe7bed41 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,23 +16,21 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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;
+import org.apache.maven.api.Session;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
-import java.nio.file.Path;
-
-import org.apache.maven.api.Session;
-import org.apache.maven.api.Artifact;
-
/**
* @since 4.0
*/
@Experimental
-public interface ProjectBuilder extends Service
-{
+public interface ProjectBuilder extends Service {
/**
* Creates a {@link org.apache.maven.api.Project} from a POM file.
@@ -45,7 +41,7 @@ public interface ProjectBuilder extends Service
* @throws IllegalArgumentException if an argument is {@code null} or invalid
*/
@Nonnull
- ProjectBuilderResult build( ProjectBuilderRequest request );
+ ProjectBuilderResult build(ProjectBuilderRequest request);
/**
* Creates a {@link org.apache.maven.api.Project} from a POM file.
@@ -57,9 +53,8 @@ public interface ProjectBuilder extends Service
* @see #build(ProjectBuilderRequest)
*/
@Nonnull
- default ProjectBuilderResult build( @Nonnull Session session, @Nonnull Source source )
- {
- return build( ProjectBuilderRequest.build( session, source ) );
+ default ProjectBuilderResult build(@Nonnull Session session, @Nonnull Source source) {
+ return build(ProjectBuilderRequest.build(session, source));
}
/**
@@ -72,9 +67,8 @@ public interface ProjectBuilder extends Service
* @see #build(ProjectBuilderRequest)
*/
@Nonnull
- default ProjectBuilderResult build( @Nonnull Session session, @Nonnull Path path )
- {
- return build( ProjectBuilderRequest.build( session, path ) );
+ default ProjectBuilderResult build(@Nonnull Session session, @Nonnull Path path) {
+ return build(ProjectBuilderRequest.build(session, path));
}
/**
@@ -87,9 +81,8 @@ public interface ProjectBuilder extends Service
* @see #build(ProjectBuilderRequest)
*/
@Nonnull
- default ProjectBuilderResult build( @Nonnull Session session, @Nonnull Artifact artifact )
- {
- return build( ProjectBuilderRequest.build( session, artifact ) );
+ default ProjectBuilderResult build(@Nonnull Session session, @Nonnull Artifact artifact) {
+ return build(ProjectBuilderRequest.build(session, artifact));
}
/**
@@ -102,9 +95,7 @@ public interface ProjectBuilder extends Service
* @see #build(ProjectBuilderRequest)
*/
@Nonnull
- default ProjectBuilderResult build( @Nonnull Session session, @Nonnull ArtifactCoordinate coordinate )
- {
- return build( ProjectBuilderRequest.build( session, coordinate ) );
+ default ProjectBuilderResult build(@Nonnull Session session, @Nonnull ArtifactCoordinate coordinate) {
+ return build(ProjectBuilderRequest.build(session, coordinate));
}
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderException.java
index 918913c0a..8149f6fe3 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Experimental;
@@ -27,16 +26,12 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public class ProjectBuilderException
- extends MavenException
-{
+public class ProjectBuilderException extends MavenException {
/**
* @param message the message to give
* @param e the {@link Exception}
*/
- public ProjectBuilderException( String message, Exception e )
- {
- super( message, e );
+ public ProjectBuilderException(String message, Exception e) {
+ super(message, e);
}
-
}
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 174bcadbd..20b6969e5 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,22 +16,21 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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;
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 org.apache.maven.api.annotations.Nullable;
-import java.nio.file.Path;
-import java.util.Optional;
-
-import org.apache.maven.api.Session;
-import org.apache.maven.api.Artifact;
-
-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.
@@ -42,8 +39,7 @@ import static org.apache.maven.api.services.BaseRequest.nonNull;
*/
@Experimental
@Immutable
-public interface ProjectBuilderRequest
-{
+public interface ProjectBuilderRequest {
@Nonnull
Session getSession();
@@ -69,50 +65,44 @@ public interface ProjectBuilderRequest
boolean isResolveDependencies();
@Nonnull
- static ProjectBuilderRequest build( @Nonnull Session session, @Nonnull Source source )
- {
+ static ProjectBuilderRequest build(@Nonnull Session session, @Nonnull Source source) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .source( nonNull( source, "source cannot be null" ) )
+ .session(nonNull(session, "session cannot be null"))
+ .source(nonNull(source, "source cannot be null"))
.build();
}
@Nonnull
- static ProjectBuilderRequest build( @Nonnull Session session, @Nonnull Path path )
- {
+ static ProjectBuilderRequest build(@Nonnull Session session, @Nonnull Path path) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .path( nonNull( path, "path cannot be null" ) )
+ .session(nonNull(session, "session cannot be null"))
+ .path(nonNull(path, "path cannot be null"))
.build();
}
@Nonnull
- static ProjectBuilderRequest build( @Nonnull Session session, @Nonnull Artifact artifact )
- {
+ static ProjectBuilderRequest build(@Nonnull Session session, @Nonnull Artifact artifact) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .artifact( nonNull( artifact, "artifact cannot be null" ) )
+ .session(nonNull(session, "session cannot be null"))
+ .artifact(nonNull(artifact, "artifact cannot be null"))
.build();
}
@Nonnull
- static ProjectBuilderRequest build( @Nonnull Session session, @Nonnull ArtifactCoordinate coordinate )
- {
+ static ProjectBuilderRequest build(@Nonnull Session session, @Nonnull ArtifactCoordinate coordinate) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .coordinate( nonNull( coordinate, "coordinate cannot be null" ) )
+ .session(nonNull(session, "session cannot be null"))
+ .coordinate(nonNull(coordinate, "coordinate cannot be null"))
.build();
}
@Nonnull
- static ProjectBuilderRequestBuilder builder()
- {
+ static ProjectBuilderRequestBuilder builder() {
return new ProjectBuilderRequestBuilder();
}
@NotThreadSafe
- class ProjectBuilderRequestBuilder
- {
+ class ProjectBuilderRequestBuilder {
Session session;
Path path;
Source source;
@@ -123,61 +113,57 @@ public interface ProjectBuilderRequest
boolean processPlugins = true;
boolean resolveDependencies = true;
- ProjectBuilderRequestBuilder()
- {
- }
+ ProjectBuilderRequestBuilder() {}
- public ProjectBuilderRequestBuilder session( Session session )
- {
+ public ProjectBuilderRequestBuilder session(Session session) {
this.session = session;
return this;
}
- public ProjectBuilderRequestBuilder path( Path path )
- {
+ public ProjectBuilderRequestBuilder path(Path path) {
this.path = path;
return this;
}
- public ProjectBuilderRequestBuilder source( Source source )
- {
+ public ProjectBuilderRequestBuilder source(Source source) {
this.source = source;
return this;
}
- public ProjectBuilderRequestBuilder artifact( Artifact artifact )
- {
+ public ProjectBuilderRequestBuilder artifact(Artifact artifact) {
this.artifact = artifact;
return this;
}
- public ProjectBuilderRequestBuilder coordinate( ArtifactCoordinate coordinate )
- {
+ public ProjectBuilderRequestBuilder coordinate(ArtifactCoordinate coordinate) {
this.coordinate = coordinate;
return this;
}
- public ProjectBuilderRequestBuilder processPlugins( boolean processPlugins )
- {
+ public ProjectBuilderRequestBuilder processPlugins(boolean processPlugins) {
this.processPlugins = processPlugins;
return this;
}
- public ProjectBuilderRequestBuilder resolveDependencies( boolean resolveDependencies )
- {
+ public ProjectBuilderRequestBuilder resolveDependencies(boolean resolveDependencies) {
this.resolveDependencies = resolveDependencies;
return this;
}
- public ProjectBuilderRequest build()
- {
- return new DefaultProjectBuilderRequest( session, path, source, artifact, coordinate,
- allowStubModel, recursive, processPlugins, resolveDependencies );
+ public ProjectBuilderRequest build() {
+ return new DefaultProjectBuilderRequest(
+ session,
+ path,
+ source,
+ artifact,
+ coordinate,
+ allowStubModel,
+ recursive,
+ processPlugins,
+ resolveDependencies);
}
- private static class DefaultProjectBuilderRequest extends BaseRequest
- implements ProjectBuilderRequest
- {
+ private static class DefaultProjectBuilderRequest extends BaseRequest implements ProjectBuilderRequest {
private final Path path;
private final Source source;
private final Artifact artifact;
@@ -187,18 +173,18 @@ public interface ProjectBuilderRequest
private final boolean processPlugins;
private final boolean resolveDependencies;
- @SuppressWarnings( "checkstyle:ParameterNumber" )
- DefaultProjectBuilderRequest( @Nonnull Session session,
- @Nullable Path path,
- @Nullable Source source,
- @Nullable Artifact artifact,
- @Nullable ArtifactCoordinate coordinate,
- boolean allowStubModel,
- boolean recursive,
- boolean processPlugins,
- boolean resolveDependencies )
- {
- super( session );
+ @SuppressWarnings("checkstyle:ParameterNumber")
+ DefaultProjectBuilderRequest(
+ @Nonnull Session session,
+ @Nullable Path path,
+ @Nullable Source source,
+ @Nullable Artifact artifact,
+ @Nullable ArtifactCoordinate coordinate,
+ boolean allowStubModel,
+ boolean recursive,
+ boolean processPlugins,
+ boolean resolveDependencies) {
+ super(session);
this.path = path;
this.source = source;
this.artifact = artifact;
@@ -211,56 +197,47 @@ public interface ProjectBuilderRequest
@Nonnull
@Override
- public Optional<Path> getPath()
- {
- return Optional.ofNullable( path );
+ public Optional<Path> getPath() {
+ return Optional.ofNullable(path);
}
@Nonnull
@Override
- public Optional<Source> getSource()
- {
- return Optional.ofNullable( source );
+ public Optional<Source> getSource() {
+ return Optional.ofNullable(source);
}
@Nonnull
@Override
- public Optional<Artifact> getArtifact()
- {
- return Optional.ofNullable( artifact );
+ public Optional<Artifact> getArtifact() {
+ return Optional.ofNullable(artifact);
}
@Nonnull
@Override
- public Optional<ArtifactCoordinate> getCoordinate()
- {
- return Optional.ofNullable( coordinate );
+ public Optional<ArtifactCoordinate> getCoordinate() {
+ return Optional.ofNullable(coordinate);
}
@Override
- public boolean isAllowStubModel()
- {
+ public boolean isAllowStubModel() {
return allowStubModel;
}
@Override
- public boolean isRecursive()
- {
+ public boolean isRecursive() {
return recursive;
}
@Override
- public boolean isProcessPlugins()
- {
+ public boolean isProcessPlugins() {
return processPlugins;
}
@Override
- public boolean isResolveDependencies()
- {
+ public boolean isResolveDependencies() {
return resolveDependencies;
}
}
-
}
}
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 0019b66aa..4826fe46f 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,15 +16,14 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
-
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Nonnull;
+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;
/**
* Result of a project build call.
@@ -34,8 +31,7 @@ import org.apache.maven.api.Project;
* @since 4.0
*/
@Experimental
-public interface ProjectBuilderResult
-{
+public interface ProjectBuilderResult {
/**
* Gets the identifier of the project that could not be built. The general format of the identifier is {@code
@@ -79,5 +75,4 @@ public interface ProjectBuilderResult
*/
@Nonnull
Optional<DependencyCollectorResult> getDependencyResolverResult();
-
}
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 a908bf19a..e19d9f0d8 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,22 +16,21 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
-
-import org.apache.maven.api.Service;
-import org.apache.maven.api.annotations.Experimental;
-import org.apache.maven.api.annotations.Nonnull;
+package org.apache.maven.api.services;
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;
import org.apache.maven.api.RemoteRepository;
import org.apache.maven.api.ResolutionScope;
+import org.apache.maven.api.Service;
import org.apache.maven.api.Session;
+import org.apache.maven.api.annotations.Experimental;
+import org.apache.maven.api.annotations.Nonnull;
/**
* Interface to manage the project during its lifecycle.
@@ -41,8 +38,7 @@ import org.apache.maven.api.Session;
* @since 4.0
*/
@Experimental
-public interface ProjectManager extends Service
-{
+public interface ProjectManager extends Service {
/**
* Returns the path to the resolved file in the local repository
* if the artifact has been resolved.
@@ -50,44 +46,41 @@ public interface ProjectManager extends Service
* @return the path of the resolved artifact
*/
@Nonnull
- Optional<Path> getPath( Project project );
+ Optional<Path> getPath(Project project);
@Nonnull
- Collection<Artifact> getAttachedArtifacts( Project project );
+ Collection<Artifact> getAttachedArtifacts(Project project);
- default void attachArtifact( Session session, Project project, Path path )
- {
+ default void attachArtifact(Session session, Project project, Path path) {
String name = path.getFileName().toString();
- int dot = name.lastIndexOf( '.' );
- String ext = dot >= 1 ? name.substring( dot + 1 ) : "";
- Artifact artifact = session.createArtifact( project.getGroupId(), project.getArtifactId(),
- project.getVersion(), ext );
- attachArtifact( project, artifact, path );
+ int dot = name.lastIndexOf('.');
+ String ext = dot >= 1 ? name.substring(dot + 1) : "";
+ Artifact artifact =
+ session.createArtifact(project.getGroupId(), project.getArtifactId(), project.getVersion(), ext);
+ attachArtifact(project, artifact, path);
}
- default void attachArtifact( Session session, Project project, String type, Path path )
- {
- Artifact artifact = session.createArtifact( project.getGroupId(), project.getArtifactId(),
- project.getVersion(), null, null, type );
- attachArtifact( project, artifact, path );
+ default void attachArtifact(Session session, Project project, String type, Path path) {
+ Artifact artifact = session.createArtifact(
+ project.getGroupId(), project.getArtifactId(), project.getVersion(), null, null, type);
+ attachArtifact(project, artifact, path);
}
- void attachArtifact( Project project, Artifact artifact, Path path );
-
- List<String> getCompileSourceRoots( Project project );
+ void attachArtifact(Project project, Artifact artifact, Path path);
- void addCompileSourceRoot( Project project, String sourceRoot );
+ List<String> getCompileSourceRoots(Project project);
- List<String> getTestCompileSourceRoots( Project project );
+ void addCompileSourceRoot(Project project, String sourceRoot);
- void addTestCompileSourceRoot( Project project, String sourceRoot );
+ List<String> getTestCompileSourceRoots(Project project);
- List<RemoteRepository> getRepositories( Project project );
+ void addTestCompileSourceRoot(Project project, String sourceRoot);
- List<Artifact> getResolvedDependencies( Project project, ResolutionScope scope );
+ List<RemoteRepository> getRepositories(Project project);
- Node getCollectedDependencies( Project project, ResolutionScope scope );
+ List<Artifact> getResolvedDependencies(Project project, ResolutionScope scope);
- void setProperty( Project project, String key, String value );
+ Node getCollectedDependencies(Project project, ResolutionScope scope);
+ void setProperty(Project project, String key, String value);
}
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 a5229f4b4..7e0d5c67f 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,9 +16,9 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import java.util.List;
-
import org.apache.maven.api.Service;
import org.apache.maven.api.annotations.Experimental;
@@ -30,8 +28,7 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public interface Prompter extends Service
-{
+public interface Prompter extends Service {
/**
* Prompts the user for a string.
*
@@ -39,10 +36,8 @@ public interface Prompter extends Service
* @return the string entered by the user
* @throws PrompterException if an exception occurs
*/
- default String prompt( String message )
- throws PrompterException
- {
- return prompt( message, null, null );
+ default String prompt(String message) throws PrompterException {
+ return prompt(message, null, null);
}
/**
@@ -53,10 +48,8 @@ public interface Prompter extends Service
* @return the string entered by the user
* @throws PrompterException if an exception occurs
*/
- default String prompt( String message, String defaultReply )
- throws PrompterException
- {
- return prompt( message, null, defaultReply );
+ default String prompt(String message, String defaultReply) throws PrompterException {
+ return prompt(message, null, defaultReply);
}
/**
@@ -67,10 +60,8 @@ public interface Prompter extends Service
* @return the string entered by the user
* @throws PrompterException if an exception occurs
*/
- default String prompt( String message, List<String> possibleValues )
- throws PrompterException
- {
- return prompt( message, possibleValues, null );
+ default String prompt(String message, List<String> possibleValues) throws PrompterException {
+ return prompt(message, possibleValues, null);
}
/**
@@ -82,8 +73,7 @@ public interface Prompter extends Service
* @return the string entered by the user
* @throws PrompterException if an exception occurs
*/
- String prompt( String message, List<String> possibleValues, String defaultReply )
- throws PrompterException;
+ String prompt(String message, List<String> possibleValues, String defaultReply) throws PrompterException;
/**
* Prompts the user for a password.
@@ -92,8 +82,7 @@ public interface Prompter extends Service
* @return the password entered by the user
* @throws PrompterException if an exception occurs
*/
- String promptForPassword( String message )
- throws PrompterException;
+ String promptForPassword(String message) throws PrompterException;
/**
* Displays a message to the user.
@@ -101,6 +90,5 @@ public interface Prompter extends Service
* @param message the message to display
* @throws PrompterException if an exception occurs
*/
- void showMessage( String message )
- throws PrompterException;
+ void showMessage(String message) throws PrompterException;
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/PrompterException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/PrompterException.java
index 9a0de36c2..44e80c160 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/PrompterException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/PrompterException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Experimental;
@@ -27,16 +26,12 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public class PrompterException
- extends MavenException
-{
+public class PrompterException extends MavenException {
/**
* @param message the message to give
* @param e the {@link Exception}
*/
- public PrompterException( String message, Exception e )
- {
- super( message, e );
+ public PrompterException(String message, Exception e) {
+ super(message, e);
}
-
}
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 727a3e485..e140b7edf 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,9 +16,9 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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;
@@ -34,16 +32,14 @@ import org.apache.maven.api.model.Repository;
* @since 4.0
*/
@Experimental
-public interface RepositoryFactory extends Service
-{
+public interface RepositoryFactory extends Service {
@Nonnull
- LocalRepository createLocal( @Nonnull Path path );
+ LocalRepository createLocal(@Nonnull Path path);
@Nonnull
- RemoteRepository createRemote( @Nonnull String id, @Nonnull String url );
+ RemoteRepository createRemote(@Nonnull String id, @Nonnull String url);
@Nonnull
- RemoteRepository createRemote( @Nonnull Repository repository );
-
+ RemoteRepository createRemote(@Nonnull Repository repository);
}
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 624a74f91..dc3e25968 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,9 +16,9 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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;
@@ -28,8 +26,7 @@ import org.apache.maven.api.annotations.Nonnull;
/**
* Builds the effective settings from a user settings file and/or a global settings file.
*/
-public interface SettingsBuilder extends Service
-{
+public interface SettingsBuilder extends Service {
/**
* Builds the effective settings of the specified settings files.
@@ -39,7 +36,7 @@ public interface SettingsBuilder extends Service
* @throws SettingsBuilderException if the effective settings could not be built
*/
@Nonnull
- SettingsBuilderResult build( @Nonnull SettingsBuilderRequest request );
+ SettingsBuilderResult build(@Nonnull SettingsBuilderRequest request);
/**
* Builds the effective settings of the specified settings sources.
@@ -48,11 +45,9 @@ public interface SettingsBuilder extends Service
* @throws SettingsBuilderException if the effective settings could not be built
*/
@Nonnull
- default SettingsBuilderResult build( @Nonnull Session session,
- @Nonnull Source globalSettingsSource,
- @Nonnull Source userSettingsSource )
- {
- return build( SettingsBuilderRequest.build( session, globalSettingsSource, userSettingsSource ) );
+ default SettingsBuilderResult build(
+ @Nonnull Session session, @Nonnull Source globalSettingsSource, @Nonnull Source userSettingsSource) {
+ return build(SettingsBuilderRequest.build(session, globalSettingsSource, userSettingsSource));
}
/**
@@ -62,10 +57,8 @@ public interface SettingsBuilder extends Service
* @throws SettingsBuilderException if the effective settings could not be built
*/
@Nonnull
- default SettingsBuilderResult build( @Nonnull Session session,
- @Nonnull Path globalSettingsPath,
- @Nonnull Path userSettingsPath )
- {
- return build( SettingsBuilderRequest.build( session, globalSettingsPath, userSettingsPath ) );
+ default SettingsBuilderResult build(
+ @Nonnull Session session, @Nonnull Path globalSettingsPath, @Nonnull Path userSettingsPath) {
+ return build(SettingsBuilderRequest.build(session, globalSettingsPath, userSettingsPath));
}
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderException.java
index 665b9086e..28292ab20 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Experimental;
@@ -27,16 +26,13 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public class SettingsBuilderException
- extends MavenException
-{
+public class SettingsBuilderException extends MavenException {
/**
* @param message the message to give
* @param e the {@link Exception}
*/
- public SettingsBuilderException( String message, Exception e )
- {
- super( message, e );
+ public SettingsBuilderException(String message, Exception e) {
+ super(message, e);
}
// TODO: add SettingsBuilderResult
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 0523f4d23..b2c8bad7f 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,10 +16,12 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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,15 +29,12 @@ 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.
*/
@Experimental
@Immutable
-public interface SettingsBuilderRequest
-{
+public interface SettingsBuilderRequest {
@Nonnull
Session getSession();
@@ -75,97 +72,82 @@ public interface SettingsBuilderRequest
Optional<Source> getUserSettingsSource();
@Nonnull
- static SettingsBuilderRequest build( @Nonnull Session session,
- @Nonnull Source globalSettingsSource,
- @Nonnull Source userSettingsSource )
- {
+ static SettingsBuilderRequest build(
+ @Nonnull Session session, @Nonnull Source globalSettingsSource, @Nonnull Source userSettingsSource) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .globalSettingsSource( nonNull( globalSettingsSource, "globalSettingsSource cannot be null" ) )
- .userSettingsSource( nonNull( userSettingsSource, "userSettingsSource cannot be null" ) )
+ .session(nonNull(session, "session cannot be null"))
+ .globalSettingsSource(nonNull(globalSettingsSource, "globalSettingsSource cannot be null"))
+ .userSettingsSource(nonNull(userSettingsSource, "userSettingsSource cannot be null"))
.build();
}
@Nonnull
- static SettingsBuilderRequest build( @Nonnull Session session,
- @Nonnull Path globalSettingsPath,
- @Nonnull Path userSettingsPath )
- {
+ static SettingsBuilderRequest build(
+ @Nonnull Session session, @Nonnull Path globalSettingsPath, @Nonnull Path userSettingsPath) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .globalSettingsPath( nonNull( globalSettingsPath, "globalSettingsPath cannot be null" ) )
- .userSettingsPath( nonNull( userSettingsPath, "userSettingsPath cannot be null" ) )
+ .session(nonNull(session, "session cannot be null"))
+ .globalSettingsPath(nonNull(globalSettingsPath, "globalSettingsPath cannot be null"))
+ .userSettingsPath(nonNull(userSettingsPath, "userSettingsPath cannot be null"))
.build();
}
@Nonnull
- static SettingsBuilderRequestBuilder builder()
- {
+ static SettingsBuilderRequestBuilder builder() {
return new SettingsBuilderRequestBuilder();
}
@NotThreadSafe
- class SettingsBuilderRequestBuilder
- {
+ class SettingsBuilderRequestBuilder {
Session session;
Path globalSettingsPath;
Source globalSettingsSource;
Path userSettingsPath;
Source userSettingsSource;
- public SettingsBuilderRequestBuilder session( Session session )
- {
+ public SettingsBuilderRequestBuilder session(Session session) {
this.session = session;
return this;
}
- public SettingsBuilderRequestBuilder globalSettingsPath( Path globalSettingsPath )
- {
+ public SettingsBuilderRequestBuilder globalSettingsPath(Path globalSettingsPath) {
this.globalSettingsPath = globalSettingsPath;
return this;
}
- public SettingsBuilderRequestBuilder globalSettingsSource( Source globalSettingsSource )
- {
+ public SettingsBuilderRequestBuilder globalSettingsSource(Source globalSettingsSource) {
this.globalSettingsSource = globalSettingsSource;
return this;
}
- public SettingsBuilderRequestBuilder userSettingsPath( Path userSettingsPath )
- {
+ public SettingsBuilderRequestBuilder userSettingsPath(Path userSettingsPath) {
this.userSettingsPath = userSettingsPath;
return this;
}
- public SettingsBuilderRequestBuilder userSettingsSource( Source userSettingsSource )
- {
+ public SettingsBuilderRequestBuilder userSettingsSource(Source userSettingsSource) {
this.userSettingsSource = userSettingsSource;
return this;
}
- public SettingsBuilderRequest build()
- {
- return new DefaultSettingsBuilderRequest( session,
- globalSettingsPath, globalSettingsSource,
- userSettingsPath, userSettingsSource );
+ public SettingsBuilderRequest build() {
+ return new DefaultSettingsBuilderRequest(
+ session, globalSettingsPath, globalSettingsSource, userSettingsPath, userSettingsSource);
}
- private static class DefaultSettingsBuilderRequest extends BaseRequest
- implements SettingsBuilderRequest
- {
+ private static class DefaultSettingsBuilderRequest extends BaseRequest implements SettingsBuilderRequest {
private final Path globalSettingsPath;
private final Source globalSettingsSource;
private final Path userSettingsPath;
private final Source userSettingsSource;
- @SuppressWarnings( "checkstyle:ParameterNumber" )
- DefaultSettingsBuilderRequest( @Nonnull Session session,
- @Nullable Path globalSettingsPath,
- @Nullable Source globalSettingsSource,
- @Nullable Path userSettingsPath,
- @Nullable Source userSettingsSource )
- {
- super( session );
+ @SuppressWarnings("checkstyle:ParameterNumber")
+ DefaultSettingsBuilderRequest(
+ @Nonnull Session session,
+ @Nullable Path globalSettingsPath,
+ @Nullable Source globalSettingsSource,
+ @Nullable Path userSettingsPath,
+ @Nullable Source userSettingsSource) {
+ super(session);
this.globalSettingsPath = globalSettingsPath;
this.globalSettingsSource = globalSettingsSource;
this.userSettingsPath = userSettingsPath;
@@ -174,30 +156,26 @@ public interface SettingsBuilderRequest
@Nonnull
@Override
- public Optional<Path> getGlobalSettingsPath()
- {
- return Optional.ofNullable( globalSettingsPath );
+ public Optional<Path> getGlobalSettingsPath() {
+ return Optional.ofNullable(globalSettingsPath);
}
@Nonnull
@Override
- public Optional<Source> getGlobalSettingsSource()
- {
- return Optional.ofNullable( globalSettingsSource );
+ public Optional<Source> getGlobalSettingsSource() {
+ return Optional.ofNullable(globalSettingsSource);
}
@Nonnull
@Override
- public Optional<Path> getUserSettingsPath()
- {
- return Optional.ofNullable( userSettingsPath );
+ public Optional<Path> getUserSettingsPath() {
+ return Optional.ofNullable(userSettingsPath);
}
@Nonnull
@Override
- public Optional<Source> getUserSettingsSource()
- {
- return Optional.ofNullable( userSettingsSource );
+ public Optional<Source> getUserSettingsSource() {
+ return Optional.ofNullable(userSettingsSource);
}
}
}
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 8cd1fc575..2b91d6299 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,14 +16,13 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import java.util.List;
-
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.settings.Settings;
-public interface SettingsBuilderResult
-{
+public interface SettingsBuilderResult {
/**
* Gets the assembled settings.
@@ -44,5 +41,4 @@ public interface SettingsBuilderResult
*/
@Nonnull
List<BuilderProblem> getProblems();
-
}
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 08eea48c3..631e8c7d7 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,10 +16,10 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import java.io.IOException;
import java.io.InputStream;
-
import org.apache.maven.api.annotations.Experimental;
/**
@@ -30,8 +28,7 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public interface Source
-{
+public interface Source {
InputStream getInputStream() throws IOException;
String getLocation();
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainFactory.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainFactory.java
index 9b0c54d55..b3bf5ae5d 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainFactory.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainFactory.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Consumer;
import org.apache.maven.api.annotations.Experimental;
@@ -27,7 +26,6 @@ import org.apache.maven.api.annotations.Experimental;
*/
@Experimental
@Consumer
-public interface ToolchainFactory
-{
+public interface ToolchainFactory {
// TODO: implement ToolchainFactory
}
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 d5c6c5779..d430a6a09 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,11 +16,11 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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;
@@ -35,8 +33,7 @@ import org.apache.maven.api.annotations.Nonnull;
* @since 4.0
*/
@Experimental
-public interface ToolchainManager extends Service
-{
+public interface ToolchainManager extends Service {
/**
*
@@ -47,7 +44,7 @@ public interface ToolchainManager extends Service
* @throws ToolchainManagerException if an exception occurs
*/
@Nonnull
- List<Toolchain> getToolchains( @Nonnull Session session, String type, Map<String, String> requirements );
+ List<Toolchain> getToolchains(@Nonnull Session session, String type, Map<String, String> requirements);
/**
*
@@ -57,7 +54,7 @@ public interface ToolchainManager extends Service
* @throws ToolchainManagerException if an exception occurs
*/
@Nonnull
- Optional<Toolchain> getToolchainFromBuildContext( @Nonnull Session session, String type )
+ Optional<Toolchain> getToolchainFromBuildContext(@Nonnull Session session, String type)
throws ToolchainManagerException;
/**
@@ -68,8 +65,7 @@ public interface ToolchainManager extends Service
* @throws ToolchainManagerException if an exception occurs
*/
@Nonnull
- List<Toolchain> getToolchainsForType( @Nonnull Session session, String type )
- throws ToolchainManagerException;
+ List<Toolchain> getToolchainsForType(@Nonnull Session session, String type) throws ToolchainManagerException;
/**
*
@@ -77,6 +73,5 @@ public interface ToolchainManager extends Service
* @param toolchain
* @throws ToolchainManagerException if an exception occurs
*/
- void storeToolchainToBuildContext( @Nonnull Session session, Toolchain toolchain )
- throws ToolchainManagerException;
+ void storeToolchainToBuildContext(@Nonnull Session session, Toolchain toolchain) throws ToolchainManagerException;
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainManagerException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainManagerException.java
index eb5438180..8263a760b 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainManagerException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainManagerException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Experimental;
@@ -27,16 +26,12 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public class ToolchainManagerException
- extends MavenException
-{
+public class ToolchainManagerException extends MavenException {
/**
* @param message the message to give
* @param e the {@link Exception}
*/
- public ToolchainManagerException( String message, Exception e )
- {
- super( message, e );
+ public ToolchainManagerException(String message, Exception e) {
+ super(message, e);
}
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilder.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilder.java
index 5e57291cf..7f75f9918 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilder.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilder.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.Service;
import org.apache.maven.api.annotations.Experimental;
@@ -26,9 +25,7 @@ import org.apache.maven.api.annotations.Experimental;
* Builds the effective toolchains from a user toolchains file and/or a global toolchains file.
*/
@Experimental
-
-public interface ToolchainsBuilder extends Service
-{
+public interface ToolchainsBuilder extends Service {
/**
* Builds the effective toolchains of the specified toolchains files.
@@ -37,6 +34,5 @@ public interface ToolchainsBuilder extends Service
* @return the result of the toolchains building, never {@code null}
* @throws ToolchainsBuilderException if the effective toolchains could not be built
*/
- ToolchainsBuilderResult build( ToolchainsBuilderRequest request );
-
+ ToolchainsBuilderResult build(ToolchainsBuilderRequest request);
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderException.java
index 19bd724ed..67e7c3ae1 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Experimental;
@@ -27,16 +26,13 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public class ToolchainsBuilderException
- extends MavenException
-{
+public class ToolchainsBuilderException extends MavenException {
/**
* @param message the message to give
* @param e the {@link Exception}
*/
- public ToolchainsBuilderException( String message, Exception e )
- {
- super( message, e );
+ public ToolchainsBuilderException(String message, Exception e) {
+ super(message, e);
}
// TODO: add ToolchainsBuilderResult
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 085950b2f..963b94e8c 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,19 +16,18 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+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
-{
+public interface ToolchainsBuilderRequest {
@Nonnull
Session getSession();
@@ -67,97 +64,82 @@ public interface ToolchainsBuilderRequest
Optional<Source> getUserToolchainsSource();
@Nonnull
- static ToolchainsBuilderRequest build( @Nonnull Session session,
- @Nonnull Source globalToolchainsSource,
- @Nonnull Source userToolchainsSource )
- {
+ static ToolchainsBuilderRequest build(
+ @Nonnull Session session, @Nonnull Source globalToolchainsSource, @Nonnull Source userToolchainsSource) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .globalToolchainsSource( nonNull( globalToolchainsSource, "globalToolchainsSource cannot be null" ) )
- .userToolchainsSource( nonNull( userToolchainsSource, "userToolchainsSource cannot be null" ) )
+ .session(nonNull(session, "session cannot be null"))
+ .globalToolchainsSource(nonNull(globalToolchainsSource, "globalToolchainsSource cannot be null"))
+ .userToolchainsSource(nonNull(userToolchainsSource, "userToolchainsSource cannot be null"))
.build();
}
@Nonnull
- static ToolchainsBuilderRequest build( @Nonnull Session session,
- @Nonnull Path globalToolchainsPath,
- @Nonnull Path userToolchainsPath )
- {
+ static ToolchainsBuilderRequest build(
+ @Nonnull Session session, @Nonnull Path globalToolchainsPath, @Nonnull Path userToolchainsPath) {
return builder()
- .session( nonNull( session, "session cannot be null" ) )
- .globalToolchainsPath( nonNull( globalToolchainsPath, "globalToolchainsPath cannot be null" ) )
- .userToolchainsPath( nonNull( userToolchainsPath, "userToolchainsPath cannot be null" ) )
+ .session(nonNull(session, "session cannot be null"))
+ .globalToolchainsPath(nonNull(globalToolchainsPath, "globalToolchainsPath cannot be null"))
+ .userToolchainsPath(nonNull(userToolchainsPath, "userToolchainsPath cannot be null"))
.build();
}
@Nonnull
- static ToolchainsBuilderRequestBuilder builder()
- {
+ static ToolchainsBuilderRequestBuilder builder() {
return new ToolchainsBuilderRequestBuilder();
}
@NotThreadSafe
- class ToolchainsBuilderRequestBuilder
- {
+ class ToolchainsBuilderRequestBuilder {
Session session;
Path globalToolchainsPath;
Source globalToolchainsSource;
Path userToolchainsPath;
Source userToolchainsSource;
- public ToolchainsBuilderRequestBuilder session( Session session )
- {
+ public ToolchainsBuilderRequestBuilder session(Session session) {
this.session = session;
return this;
}
- public ToolchainsBuilderRequestBuilder globalToolchainsPath( Path globalToolchainsPath )
- {
+ public ToolchainsBuilderRequestBuilder globalToolchainsPath(Path globalToolchainsPath) {
this.globalToolchainsPath = globalToolchainsPath;
return this;
}
- public ToolchainsBuilderRequestBuilder globalToolchainsSource( Source globalToolchainsSource )
- {
+ public ToolchainsBuilderRequestBuilder globalToolchainsSource(Source globalToolchainsSource) {
this.globalToolchainsSource = globalToolchainsSource;
return this;
}
- public ToolchainsBuilderRequestBuilder userToolchainsPath( Path userToolchainsPath )
- {
+ public ToolchainsBuilderRequestBuilder userToolchainsPath(Path userToolchainsPath) {
this.userToolchainsPath = userToolchainsPath;
return this;
}
- public ToolchainsBuilderRequestBuilder userToolchainsSource( Source userToolchainsSource )
- {
+ public ToolchainsBuilderRequestBuilder userToolchainsSource(Source userToolchainsSource) {
this.userToolchainsSource = userToolchainsSource;
return this;
}
- public ToolchainsBuilderRequest build()
- {
- return new ToolchainsBuilderRequestBuilder.DefaultToolchainsBuilderRequest( session,
- globalToolchainsPath, globalToolchainsSource,
- userToolchainsPath, userToolchainsSource );
+ public ToolchainsBuilderRequest build() {
+ return new ToolchainsBuilderRequestBuilder.DefaultToolchainsBuilderRequest(
+ session, globalToolchainsPath, globalToolchainsSource, userToolchainsPath, userToolchainsSource);
}
- private static class DefaultToolchainsBuilderRequest extends BaseRequest
- implements ToolchainsBuilderRequest
- {
+ private static class DefaultToolchainsBuilderRequest extends BaseRequest implements ToolchainsBuilderRequest {
private final Path globalToolchainsPath;
private final Source globalToolchainsSource;
private final Path userToolchainsPath;
private final Source userToolchainsSource;
- @SuppressWarnings( "checkstyle:ParameterNumber" )
- DefaultToolchainsBuilderRequest( @Nonnull Session session,
- @Nullable Path globalToolchainsPath,
- @Nullable Source globalToolchainsSource,
- @Nullable Path userToolchainsPath,
- @Nullable Source userToolchainsSource )
- {
- super( session );
+ @SuppressWarnings("checkstyle:ParameterNumber")
+ DefaultToolchainsBuilderRequest(
+ @Nonnull Session session,
+ @Nullable Path globalToolchainsPath,
+ @Nullable Source globalToolchainsSource,
+ @Nullable Path userToolchainsPath,
+ @Nullable Source userToolchainsSource) {
+ super(session);
this.globalToolchainsPath = globalToolchainsPath;
this.globalToolchainsSource = globalToolchainsSource;
this.userToolchainsPath = userToolchainsPath;
@@ -166,30 +148,26 @@ public interface ToolchainsBuilderRequest
@Nonnull
@Override
- public Optional<Path> getGlobalToolchainsPath()
- {
- return Optional.ofNullable( globalToolchainsPath );
+ public Optional<Path> getGlobalToolchainsPath() {
+ return Optional.ofNullable(globalToolchainsPath);
}
@Nonnull
@Override
- public Optional<Source> getGlobalToolchainsSource()
- {
- return Optional.ofNullable( globalToolchainsSource );
+ public Optional<Source> getGlobalToolchainsSource() {
+ return Optional.ofNullable(globalToolchainsSource);
}
@Nonnull
@Override
- public Optional<Path> getUserToolchainsPath()
- {
- return Optional.ofNullable( userToolchainsPath );
+ public Optional<Path> getUserToolchainsPath() {
+ return Optional.ofNullable(userToolchainsPath);
}
@Nonnull
@Override
- public Optional<Source> getUserToolchainsSource()
- {
- return Optional.ofNullable( userToolchainsSource );
+ public Optional<Source> getUserToolchainsSource() {
+ return Optional.ofNullable(userToolchainsSource);
}
}
}
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 5be2cea19..464542124 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,14 +16,13 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import java.util.List;
-
import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.toolchain.PersistedToolchains;
-public interface ToolchainsBuilderResult
-{
+public interface ToolchainsBuilderResult {
/**
* Gets the assembled toolchains.
*
@@ -43,5 +40,4 @@ public interface ToolchainsBuilderResult
*/
@Nonnull
List<BuilderProblem> getProblems();
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/TypeRegistry.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/TypeRegistry.java
index 21482ba40..240e1680b 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/TypeRegistry.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/TypeRegistry.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.Service;
import org.apache.maven.api.Type;
@@ -30,8 +29,7 @@ import org.apache.maven.api.annotations.Nonnull;
* @since 4.0
*/
@Experimental
-public interface TypeRegistry extends Service
-{
+public interface TypeRegistry extends Service {
/**
* Obtain the {@link Type} from the specified {@code id}.
@@ -42,6 +40,5 @@ public interface TypeRegistry extends Service
* @return the type
*/
@Nonnull
- Type getType( @Nonnull String id );
-
+ Type getType(@Nonnull String id);
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/VersionParser.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/VersionParser.java
index 700019d71..afac591c1 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/VersionParser.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/VersionParser.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.Service;
import org.apache.maven.api.Version;
@@ -27,22 +26,21 @@ import org.apache.maven.api.annotations.Nonnull;
/**
* Service interface to parse {@link Version} and {@link VersionRange}.
- *
+ *
* @since 4.0
*/
@Experimental
-public interface VersionParser extends Service
-{
+public interface VersionParser extends Service {
/**
* Parses the specified version string, for example "1.0".
*
* @param version the version string to parse, must not be {@code null}
* @return the parsed version, never {@code null}
* @throws VersionParserException if the string violates the syntax rules of this scheme
- * @see org.apache.maven.api.Session#parseVersion(String)
+ * @see org.apache.maven.api.Session#parseVersion(String)
*/
@Nonnull
- Version parseVersion( @Nonnull String version );
+ Version parseVersion(@Nonnull String version);
/**
* Parses the specified version range specification, for example "[1.0,2.0)".
@@ -52,11 +50,10 @@ public interface VersionParser extends Service
* @throws VersionParserException if the range specification violates the syntax rules of this scheme
*/
@Nonnull
- VersionRange parseVersionRange( @Nonnull String range );
+ VersionRange parseVersionRange(@Nonnull String range);
/**
* Checks whether a given artifact version is considered a {@code SNAPSHOT} or not.
*/
- boolean isSnapshot( @Nonnull String version );
-
+ boolean isSnapshot(@Nonnull String version);
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/VersionParserException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/VersionParserException.java
index ba016dc0f..83e2f09f5 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/VersionParserException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/VersionParserException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services;
import org.apache.maven.api.annotations.Experimental;
@@ -27,16 +26,12 @@ import org.apache.maven.api.annotations.Experimental;
* @since 4.0
*/
@Experimental
-public class VersionParserException
- extends MavenException
-{
+public class VersionParserException extends MavenException {
/**
* @param message the message to give
* @param e the {@link Exception}
*/
- public VersionParserException( String message, Exception e )
- {
- super( message, e );
+ public VersionParserException(String message, Exception e) {
+ super(message, e);
}
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/ModelXmlFactory.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/ModelXmlFactory.java
index 8de030ff7..67bda332a 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/ModelXmlFactory.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/ModelXmlFactory.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services.xml;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services.xml;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services.xml;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.model.Model;
@@ -28,7 +27,4 @@ import org.apache.maven.api.model.Model;
* @since 4.0
*/
@Experimental
-public interface ModelXmlFactory extends XmlFactory<Model>
-{
-
-}
+public interface ModelXmlFactory extends XmlFactory<Model> {}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/SettingsXmlFactory.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/SettingsXmlFactory.java
index 0d6672ae9..1c39e4cc8 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/SettingsXmlFactory.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/SettingsXmlFactory.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services.xml;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services.xml;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services.xml;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.settings.Settings;
@@ -28,7 +27,4 @@ import org.apache.maven.api.settings.Settings;
* @since 4.0
*/
@Experimental
-public interface SettingsXmlFactory extends XmlFactory<Settings>
-{
-
-}
+public interface SettingsXmlFactory extends XmlFactory<Settings> {}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/ToolchainsXmlFactory.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/ToolchainsXmlFactory.java
index 854cb9791..ea0a99b79 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/ToolchainsXmlFactory.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/ToolchainsXmlFactory.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services.xml;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services.xml;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services.xml;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.toolchain.PersistedToolchains;
@@ -28,7 +27,4 @@ import org.apache.maven.api.toolchain.PersistedToolchains;
* @since 4.0
*/
@Experimental
-public interface ToolchainsXmlFactory extends XmlFactory<PersistedToolchains>
-{
-
-}
+public interface ToolchainsXmlFactory extends XmlFactory<PersistedToolchains> {}
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 f3ee6b775..8ebc3ae5d 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services.xml;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services.xml;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services.xml;
import java.io.InputStream;
import java.io.OutputStream;
@@ -26,10 +25,9 @@ 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;
-import org.apache.maven.api.Service;
/**
* Generic interface to read/write objects to/from XML.
@@ -38,91 +36,81 @@ import org.apache.maven.api.Service;
* @since 4.0
*/
@Experimental
-public interface XmlFactory<T> extends Service
-{
+public interface XmlFactory<T> extends Service {
@Nonnull
- default T read( @Nonnull Path path ) throws XmlReaderException
- {
- return read( path, true );
+ default T read(@Nonnull Path path) throws XmlReaderException {
+ return read(path, true);
}
@Nonnull
- default T read( @Nonnull Path path, boolean strict ) throws XmlReaderException
- {
- return read( XmlReaderRequest.builder().path( path ).strict( strict ).build() );
+ default T read(@Nonnull Path path, boolean strict) throws XmlReaderException {
+ return read(XmlReaderRequest.builder().path(path).strict(strict).build());
}
@Nonnull
- default T read( @Nonnull InputStream input ) throws XmlReaderException
- {
- return read( input, true );
+ default T read(@Nonnull InputStream input) throws XmlReaderException {
+ return read(input, true);
}
@Nonnull
- default T read( @Nonnull InputStream input, boolean strict ) throws XmlReaderException
- {
- return read( XmlReaderRequest.builder().inputStream( input ).strict( strict ).build() );
+ default T read(@Nonnull InputStream input, boolean strict) throws XmlReaderException {
+ return read(XmlReaderRequest.builder().inputStream(input).strict(strict).build());
}
@Nonnull
- default T read( @Nonnull Reader reader ) throws XmlReaderException
- {
- return read( reader, true );
+ default T read(@Nonnull Reader reader) throws XmlReaderException {
+ return read(reader, true);
}
@Nonnull
- default T read( @Nonnull Reader reader, boolean strict ) throws XmlReaderException
- {
- return read( XmlReaderRequest.builder().reader( reader ).strict( strict ).build() );
+ default T read(@Nonnull Reader reader, boolean strict) throws XmlReaderException {
+ return read(XmlReaderRequest.builder().reader(reader).strict(strict).build());
}
@Nonnull
- T read( @Nonnull XmlReaderRequest request ) throws XmlReaderException;
+ T read(@Nonnull XmlReaderRequest request) throws XmlReaderException;
- default void write( @Nonnull T content, @Nonnull Path path ) throws XmlWriterException
- {
- write( XmlWriterRequest.<T>builder().content( content ).path( path ).build() );
+ default void write(@Nonnull T content, @Nonnull Path path) throws XmlWriterException {
+ write(XmlWriterRequest.<T>builder().content(content).path(path).build());
}
- default void write( @Nonnull T content, @Nonnull OutputStream outputStream ) throws XmlWriterException
- {
- write( XmlWriterRequest.<T>builder().content( content ).outputStream( outputStream ).build() );
+ default void write(@Nonnull T content, @Nonnull OutputStream outputStream) throws XmlWriterException {
+ write(XmlWriterRequest.<T>builder()
+ .content(content)
+ .outputStream(outputStream)
+ .build());
}
- default void write( @Nonnull T content, @Nonnull Writer writer ) throws XmlWriterException
- {
- write( XmlWriterRequest.<T>builder().content( content ).writer( writer ).build() );
+ default void write(@Nonnull T content, @Nonnull Writer writer) throws XmlWriterException {
+ write(XmlWriterRequest.<T>builder().content(content).writer(writer).build());
}
- void write( @Nonnull XmlWriterRequest<T> request ) throws XmlWriterException;
+ void write(@Nonnull XmlWriterRequest<T> request) throws XmlWriterException;
/**
* Simply parse the given xml string.
- *
+ *
* @param xml the input xml string
* @return the parsed object
* @throws XmlReaderException if an error occurs during the parsing
- * @see #toXmlString(Object)
+ * @see #toXmlString(Object)
*/
- default T fromXmlString( @Nonnull String xml ) throws XmlReaderException
- {
- return read( new StringReader( xml ) );
+ default T fromXmlString(@Nonnull String xml) throws XmlReaderException {
+ return read(new StringReader(xml));
}
-
+
/**
* Simply converts the given content to an xml string.
- *
+ *
* @param content the object to convert
* @return the xml string representation
* @throws XmlWriterException if an error occurs during the transformation
- * @see #fromXmlString(String)
+ * @see #fromXmlString(String)
*/
- default String toXmlString( @Nonnull T content ) throws XmlWriterException
- {
+ default String toXmlString(@Nonnull T content) throws XmlWriterException {
StringWriter sw = new StringWriter();
- write( content, sw );
+ write(content, sw);
return sw.toString();
}
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderException.java
index 23141db4c..5abfb1004 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services.xml;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services.xml;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services.xml;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.services.MavenException;
@@ -28,17 +27,13 @@ import org.apache.maven.api.services.MavenException;
* @since 4.0
*/
@Experimental
-public class XmlReaderException
- extends MavenException
-{
+public class XmlReaderException extends MavenException {
/**
* @param message the message for the exception
* @param e the exception itself
*/
- public XmlReaderException( String message, Exception e )
- {
- super( message, e );
+ public XmlReaderException(String message, Exception e) {
+ super(message, e);
}
-
}
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 086594d62..e9df19e0a 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services.xml;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,12 +16,12 @@ package org.apache.maven.api.services.xml;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services.xml;
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;
@@ -36,8 +34,7 @@ import org.apache.maven.api.annotations.NotThreadSafe;
*/
@Experimental
@Immutable
-public interface XmlReaderRequest
-{
+public interface XmlReaderRequest {
Path getPath();
@@ -57,8 +54,7 @@ public interface XmlReaderRequest
boolean isAddDefaultEntities();
- interface Transformer
- {
+ interface Transformer {
/**
* Interpolate the value read from the xml document
*
@@ -67,18 +63,16 @@ public interface XmlReaderRequest
* log stuff.
* @return the interpolated value
*/
- String transform( String source, String fieldName );
+ String transform(String source, String fieldName);
}
@Nonnull
- static XmlReaderRequestBuilder builder()
- {
+ static XmlReaderRequestBuilder builder() {
return new XmlReaderRequestBuilder();
}
@NotThreadSafe
- class XmlReaderRequestBuilder
- {
+ class XmlReaderRequestBuilder {
Path path;
URL url;
InputStream inputStream;
@@ -89,68 +83,57 @@ public interface XmlReaderRequest
String location;
boolean addDefaultEntities = true;
- public XmlReaderRequestBuilder path( Path path )
- {
+ public XmlReaderRequestBuilder path(Path path) {
this.path = path;
return this;
}
- public XmlReaderRequestBuilder url( URL url )
- {
+ public XmlReaderRequestBuilder url(URL url) {
this.url = url;
return this;
}
- public XmlReaderRequestBuilder inputStream( InputStream inputStream )
- {
+ public XmlReaderRequestBuilder inputStream(InputStream inputStream) {
this.inputStream = inputStream;
return this;
}
- public XmlReaderRequestBuilder reader( Reader reader )
- {
+ public XmlReaderRequestBuilder reader(Reader reader) {
this.reader = reader;
return this;
}
- public XmlReaderRequestBuilder transformer( Transformer transformer )
- {
+ public XmlReaderRequestBuilder transformer(Transformer transformer) {
this.transformer = transformer;
return this;
}
- public XmlReaderRequestBuilder strict( boolean strict )
- {
+ public XmlReaderRequestBuilder strict(boolean strict) {
this.strict = strict;
return this;
}
- public XmlReaderRequestBuilder modelId( String modelId )
- {
+ public XmlReaderRequestBuilder modelId(String modelId) {
this.modelId = modelId;
return this;
}
- public XmlReaderRequestBuilder location( String location )
- {
+ public XmlReaderRequestBuilder location(String location) {
this.location = location;
return this;
}
- public XmlReaderRequestBuilder addDefaultEntities( boolean addDefaultEntities )
- {
+ public XmlReaderRequestBuilder addDefaultEntities(boolean addDefaultEntities) {
this.addDefaultEntities = addDefaultEntities;
return this;
}
- public XmlReaderRequest build()
- {
- return new DefaultXmlReaderRequest( path, url, inputStream, reader, transformer, strict,
- modelId, location, addDefaultEntities );
+ public XmlReaderRequest build() {
+ return new DefaultXmlReaderRequest(
+ path, url, inputStream, reader, transformer, strict, modelId, location, addDefaultEntities);
}
- private static class DefaultXmlReaderRequest implements XmlReaderRequest
- {
+ private static class DefaultXmlReaderRequest implements XmlReaderRequest {
final Path path;
final URL url;
final InputStream inputStream;
@@ -161,12 +144,17 @@ public interface XmlReaderRequest
final String location;
final boolean addDefaultEntities;
- @SuppressWarnings( "checkstyle:ParameterNumber" )
- DefaultXmlReaderRequest( Path path, URL url, InputStream inputStream, Reader reader,
- Transformer transformer, boolean strict,
- String modelId, String location,
- boolean addDefaultEntities )
- {
+ @SuppressWarnings("checkstyle:ParameterNumber")
+ DefaultXmlReaderRequest(
+ Path path,
+ URL url,
+ InputStream inputStream,
+ Reader reader,
+ Transformer transformer,
+ boolean strict,
+ String modelId,
+ String location,
+ boolean addDefaultEntities) {
this.path = path;
this.url = url;
this.inputStream = inputStream;
@@ -179,58 +167,48 @@ public interface XmlReaderRequest
}
@Override
- public Path getPath()
- {
+ public Path getPath() {
return path;
}
@Override
- public URL getURL()
- {
+ public URL getURL() {
return null;
}
@Override
- public InputStream getInputStream()
- {
+ public InputStream getInputStream() {
return inputStream;
}
- public Reader getReader()
- {
+ public Reader getReader() {
return reader;
}
@Override
- public Transformer getTransformer()
- {
+ public Transformer getTransformer() {
return transformer;
}
@Override
- public boolean isStrict()
- {
+ public boolean isStrict() {
return strict;
}
@Override
- public String getModelId()
- {
+ public String getModelId() {
return modelId;
}
@Override
- public String getLocation()
- {
+ public String getLocation() {
return location;
}
@Override
- public boolean isAddDefaultEntities()
- {
+ public boolean isAddDefaultEntities() {
return addDefaultEntities;
}
}
}
-
}
diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlWriterException.java b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlWriterException.java
index 4202ab2ef..e76b891b0 100644
--- a/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlWriterException.java
+++ b/api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlWriterException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services.xml;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.services.xml;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.services.xml;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.services.MavenException;
@@ -28,17 +27,13 @@ import org.apache.maven.api.services.MavenException;
* @since 4.0
*/
@Experimental
-public class XmlWriterException
- extends MavenException
-{
+public class XmlWriterException extends MavenException {
/**
* @param message the message for the exception
* @param e the exception itself
*/
- public XmlWriterException( String message, Exception e )
- {
- super( message, e );
+ public XmlWriterException(String message, Exception e) {
+ super(message, e);
}
-
}
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 15f0319dd..4cf92ffcd 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
@@ -1,5 +1,3 @@
-package org.apache.maven.api.services.xml;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.services.xml;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,11 +16,11 @@ package org.apache.maven.api.services.xml;
* specific language governing permissions and limitations
* under the License.
*/
+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;
/**
@@ -32,8 +30,7 @@ import org.apache.maven.api.annotations.Experimental;
* @param <T> the object type to read
*/
@Experimental
-public interface XmlWriterRequest<T>
-{
+public interface XmlWriterRequest<T> {
Path getPath();
@@ -43,56 +40,47 @@ public interface XmlWriterRequest<T>
T getContent();
- static <T> XmlWriterRequestBuilder<T> builder()
- {
+ static <T> XmlWriterRequestBuilder<T> builder() {
return new XmlWriterRequestBuilder<>();
}
- class XmlWriterRequestBuilder<T>
- {
+ class XmlWriterRequestBuilder<T> {
Path path;
OutputStream outputStream;
Writer writer;
T content;
- public XmlWriterRequestBuilder<T> path( Path path )
- {
+ public XmlWriterRequestBuilder<T> path(Path path) {
this.path = path;
return this;
}
- public XmlWriterRequestBuilder<T> outputStream( OutputStream outputStream )
- {
+ public XmlWriterRequestBuilder<T> outputStream(OutputStream outputStream) {
this.outputStream = outputStream;
return this;
}
- public XmlWriterRequestBuilder<T> writer( Writer writer )
- {
+ public XmlWriterRequestBuilder<T> writer(Writer writer) {
this.writer = writer;
return this;
}
- public XmlWriterRequestBuilder<T> content( T content )
- {
+ public XmlWriterRequestBuilder<T> content(T content) {
this.content = content;
return this;
}
- public XmlWriterRequest<T> build()
- {
- return new DefaultXmlWriterRequest<>( path, outputStream, writer, content );
+ public XmlWriterRequest<T> build() {
+ return new DefaultXmlWriterRequest<>(path, outputStream, writer, content);
}
- private static class DefaultXmlWriterRequest<T> implements XmlWriterRequest<T>
- {
+ private static class DefaultXmlWriterRequest<T> implements XmlWriterRequest<T> {
final Path path;
final OutputStream outputStream;
final Writer writer;
final T content;
- DefaultXmlWriterRequest( Path path, OutputStream outputStream, Writer writer, T content )
- {
+ DefaultXmlWriterRequest(Path path, OutputStream outputStream, Writer writer, T content) {
this.path = path;
this.outputStream = outputStream;
this.writer = writer;
@@ -100,26 +88,22 @@ public interface XmlWriterRequest<T>
}
@Override
- public Path getPath()
- {
+ public Path getPath() {
return path;
}
@Override
- public OutputStream getOutputStream()
- {
+ public OutputStream getOutputStream() {
return outputStream;
}
@Override
- public Writer getWriter()
- {
+ public Writer getWriter() {
return writer;
}
@Override
- public T getContent()
- {
+ public T getContent() {
return content;
}
}
diff --git a/api/maven-api-meta/pom.xml b/api/maven-api-meta/pom.xml
index 1ceeefb75..b545efe4b 100644
--- a/api/maven-api-meta/pom.xml
+++ b/api/maven-api-meta/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Consumer.java b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Consumer.java
index f8de92bb3..d17a166a1 100644
--- a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Consumer.java
+++ b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Consumer.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.annotations;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -40,8 +39,6 @@ import java.lang.annotation.Target;
*/
@Experimental
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( { ElementType.TYPE, ElementType.PACKAGE } )
-public @interface Consumer
-{
-}
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.TYPE, ElementType.PACKAGE})
+public @interface Consumer {}
diff --git a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Experimental.java b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Experimental.java
index bb706d893..e22899d6c 100644
--- a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Experimental.java
+++ b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Experimental.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.annotations;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
@@ -31,7 +30,5 @@ import java.lang.annotation.RetentionPolicy;
*/
@Experimental
@Documented
-@Retention( RetentionPolicy.CLASS )
-public @interface Experimental
-{
-}
+@Retention(RetentionPolicy.CLASS)
+public @interface Experimental {}
diff --git a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Generated.java b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Generated.java
index 9813f69d5..dd73ff4da 100644
--- a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Generated.java
+++ b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Generated.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.annotations;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -32,8 +31,6 @@ import java.lang.annotation.Target;
*/
@Experimental
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( ElementType.TYPE )
-public @interface Generated
-{
-}
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE)
+public @interface Generated {}
diff --git a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Immutable.java b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Immutable.java
index ea8df9a06..3fdf9116c 100644
--- a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Immutable.java
+++ b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Immutable.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.annotations;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -35,9 +34,7 @@ import java.lang.annotation.Target;
*/
@Experimental
@Documented
-@Retention( RetentionPolicy.CLASS )
+@Retention(RetentionPolicy.CLASS)
@ThreadSafe
-@Target( ElementType.TYPE )
-public @interface Immutable
-{
-}
+@Target(ElementType.TYPE)
+public @interface Immutable {}
diff --git a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Nonnull.java b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Nonnull.java
index 0668a3bc8..f34b7afe9 100644
--- a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Nonnull.java
+++ b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Nonnull.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.annotations;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -37,8 +36,6 @@ import java.lang.annotation.Target;
*/
@Experimental
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( { ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD } )
-public @interface Nonnull
-{
-}
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD})
+public @interface Nonnull {}
diff --git a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/NotThreadSafe.java b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/NotThreadSafe.java
index b33381dd7..67697ab2c 100644
--- a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/NotThreadSafe.java
+++ b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/NotThreadSafe.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.annotations;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -34,8 +33,6 @@ import java.lang.annotation.Target;
*/
@Experimental
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( ElementType.TYPE )
-public @interface NotThreadSafe
-{
-}
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE)
+public @interface NotThreadSafe {}
diff --git a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Nullable.java b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Nullable.java
index e21a6de6a..cd68190ed 100644
--- a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Nullable.java
+++ b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Nullable.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.annotations;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
@@ -31,7 +30,5 @@ import java.lang.annotation.RetentionPolicy;
*/
@Experimental
@Documented
-@Retention( RetentionPolicy.CLASS )
-public @interface Nullable
-{
-}
+@Retention(RetentionPolicy.CLASS)
+public @interface Nullable {}
diff --git a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Provider.java b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Provider.java
index ea5174def..b604a8806 100644
--- a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Provider.java
+++ b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/Provider.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.annotations;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -40,8 +39,6 @@ import java.lang.annotation.Target;
*/
@Experimental
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( { ElementType.TYPE, ElementType.PACKAGE } )
-public @interface Provider
-{
-}
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.TYPE, ElementType.PACKAGE})
+public @interface Provider {}
diff --git a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java
index 82d7b8463..d5c09744e 100644
--- a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java
+++ b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/ThreadSafe.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.annotations;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.api.annotations;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.api.annotations;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -35,8 +34,6 @@ import java.lang.annotation.Target;
*/
@Experimental
@Documented
-@Retention( RetentionPolicy.CLASS )
-@Target( ElementType.TYPE )
-public @interface ThreadSafe
-{
-}
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE)
+public @interface ThreadSafe {}
diff --git a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/package-info.java b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/package-info.java
index 2a0d276c7..763cf897b 100644
--- a/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/package-info.java
+++ b/api/maven-api-meta/src/main/java/org/apache/maven/api/annotations/package-info.java
@@ -8,23 +8,3 @@
*/
@Experimental
package org.apache.maven.api.annotations;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
diff --git a/api/maven-api-model/pom.xml b/api/maven-api-model/pom.xml
index 4c7c1f0b1..30f5d8c5c 100644
--- a/api/maven-api-model/pom.xml
+++ b/api/maven-api-model/pom.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
diff --git a/api/maven-api-model/src/main/java/org/apache/maven/api/model/ImmutableCollections.java b/api/maven-api-model/src/main/java/org/apache/maven/api/model/ImmutableCollections.java
index e47fa1a8b..6c70c7400 100644
--- a/api/maven-api-model/src/main/java/org/apache/maven/api/model/ImmutableCollections.java
+++ b/api/maven-api-model/src/main/java/org/apache/maven/api/model/ImmutableCollections.java
@@ -1,5 +1,3 @@
-package org.apache.maven.api.model;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.maven.api.model;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.api.model;
import java.io.Serializable;
import java.util.AbstractList;
@@ -38,541 +37,435 @@ import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
-class ImmutableCollections
-{
+class ImmutableCollections {
- private static final List<?> EMPTY_LIST = new AbstractImmutableList<Object>()
- {
+ private static final List<?> EMPTY_LIST = new AbstractImmutableList<Object>() {
@Override
- public Object get( int index )
- {
+ public Object get(int index) {
throw new IndexOutOfBoundsException();
}
+
@Override
- public int size()
- {
+ public int size() {
return 0;
}
};
- private static final Map<?, ?> EMPTY_MAP = new AbstractImmutableMap<Object, Object>()
- {
+ private static final Map<?, ?> EMPTY_MAP = new AbstractImmutableMap<Object, Object>() {
@Override
- public Set<Entry<Object, Object>> entrySet()
- {
- return new AbstractImmutableSet<Entry<Object, Object>>()
- {
+ public Set<Entry<Object, Object>> entrySet() {
+ return new AbstractImmutableSet<Entry<Object, Object>>() {
@Override
- public Iterator<Entry<Object, Object>> iterator()
- {
- return new Iterator<Entry<Object, Object>>()
- {
+ public Iterator<Entry<Object, Object>> iterator() {
+ return new Iterator<Entry<Object, Object>>() {
@Override
- public boolean hasNext()
- {
+ public boolean hasNext() {
return false;
}
+
@Override
... 194550 lines suppressed ...