You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/12/27 14:32:55 UTC
[maven] branch MNG-7571 updated (d17c60a38 -> 8eb7a994d)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-7571
in repository https://gitbox.apache.org/repos/asf/maven.git
omit d17c60a38 [MNG-7571] add Maven API javadoc
add d857c3a91 [MNG-7566] Allow a Maven plugin to require a Java version (#827)
add daa8e1690 [MNG-7570] Plugin descriptor can carry the required Maven version (#832)
add 18eff3bae Restore compatibility with 3.x (#836)
add 0d70f7295 Fix references to old snapshots
add 79b6dd0ba [MNG-6609] expose packaging via property "project.packaging" (#835)
add cb424b93e [MNG-7582] Reformat apiv4 javadoc according to usual rules
add e13176829 DOC - spelling fix in maven.mdo file (#851)
add 31b3af084 [MNG-7584] The properties-maven-plugin fails to load project properties (#856)
add 9beb2ed45 Add a README for plexus-utils (#847)
add bc8c6be26 [MNG-7564] Check if session is null when generating metadata
add 9c6013891 [MNG-7556] Clean up notion between user properties and system properties
add 1ada7a590 [MNG-7569] Fix Plugin Model: Add new v4Api element (#842)
add 3c1b8a060 add Reproducible Builds badge
add 431e2b3ee [MNG-7561] never resolve version ranges with same lower and upper bound (#823)
add 4d3a82f59 [MPLUGIN-439] Support custom lifecycle phase ids in Execute annotation (#865)
add dfcf5791f [MNG-7583] Allow concurrent access to the MavenPluginManager (#855)
add fa15fcf15 [MNG-7590] Allow to configure resolver by properties in settings.xml
add a6b1ebb1c Update actions in GH build
add 113919a5e [MNG-7586] Update Maven Resolver to 1.9.1 (#870)
add 724ac0b54 Revert "[MNG-7586] Update Maven Resolver to 1.9.1 (#870)"
add 6a27f5f2f [MNG-7597] Fix infinite loop when iterating PropertiesAsMap (#872)
add 3f03f0e7b [MNG-7576] Restore compatibility with maven 3.x (#841)
add dc88c6193 [MNG-7580] Introduce new SettingsBuilder and ToolchainsBuilder services (#852)
add b1c1f7556 [MNG-7600] LocalRepositoryManager is created too early
add 49572e46c [MNG-7601] Upgrade Apache Maven parent POM to version 38
add de19cfcd2 [MNG-7601] Reformat sources
add 001eef845 [MNG-7601] Ignore reformat commit in blame
add 19c897de6 [MNG-7601] Fix git blame rev
add 5da32ae7f [MNG-7602] Move back model version from 5.0 to 4.2 and reactivate modello site generation (#843)
add c6ecff992 [MNG-7586] Update Maven Resolver to 1.9.2 (#882)
add f70b0019c [MNG-7607] Add M4 Transport API (#884)
add 3d0939662 [MNG-7611] Change semantics of plugin descriptor's "requiredJavaVersion" (#888)
add 615390f6f [MNG-7596] Upgrade to plexus 3.5.0 (#866)
add f0cc176b3 [MNG-7616] Add missing exported artifacts for the new API (#894)
add 249c0fe0f [MNG-7617] Small optimisations and cleanup in the project/model building (#816)
add a840ba91e [MNG-7608] Make native transport the default (#892)
add 69ef6a61b [MNG-7612] Chained LRM
add 97e8bf671 fix version comparison (#845)
add 0d4a1a125 [MNG-7609] Clarify extension descriptor documentation (#896)
add 6773c0512 [MNG-7619] Reverse Dependency Tree (#902)
add dc47da436 [MNG-7618] Use goalPrefix instead of artifactId 4to display mojos being executed (#898)
add f27b975dd [MNG-7576] Restore compatibility for flatten-maven-plugin (#903)
add 55431cd26 [MNG-7578] Fallback on Linux executable in Windows for findTool utility (#861)
add adf89ef63 [MNG-7505] Remove ReportingConverter (#906)
add 2ccf57baa [maven-release-plugin] prepare release maven-4.0.0-alpha-3
add 0e82026f2 [maven-release-plugin] prepare for next development iteration
add 3f336e4f6 simplify build and get rid of withMaven (#908)
add 034290176 fix pom
add 984f73dc7 fix pom format
add ce18c5620 [MNG-7598] Enforce binary backwards-compatibility (#874)
add 9e0cae423 Update soap with 4.x alpha releases
add 4e38415b6 [MNG-7624] Use groupId:artifactId instead of empty goal (#911)
add 828de7e1a [MNG-7621] Parameter '-f' causes ignoring any 'maven.config' (only on Windows)
add 7a1cc12a4 [MNG-7637] Possible NPE in MavenProject#hashCode()
add 3eec6b82d [MNG-7636] Document MavenProject#getAttachedArtifacts() as read-only
add 933b46eed [MNG-7626] maven-bom should have the same parent version as project
add f0364acb2 Directories, not folders
add 29e7b0ea3 Revert "fix version comparison (#845)"
add 968c1a25f [MNG-7634] Revert MNG-5982 and MNG-7417
add 29f96a359 Update bundled license for SLF4J
add 342c16436 [MNG-7643] Each atomic task should have its own bullet
add 8833330b0 [MNG-7645] Implement some #toString() methods
add 35c81bedd [MNG-7644] Fix version comparison where .X1 < -X2 for any string qualifier X
add e73a0b00f [MNG-7641] Upgrade Maven Wagon to 3.5.3
add 538a6b40a [MNG-7352] org.apache.maven.toolchain.java.JavaToolchainImpl should be public
add aaced1b0d Fix test Javadoc issue
add 67941c22d [MNG-7650] Upgrade Apache Maven parent POM to version 39
add 8150c6274 [MNG-7650] Reformat
new 8eb7a994d [MNG-7571] add Maven API javadoc
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d17c60a38)
\
N -- N -- N refs/heads/MNG-7571 (8eb7a994d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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 +-
.github/pull_request_template.md | 7 +-
.github/workflows/maven.yml | 26 +-
.github/workflows/maven_build_itself.yml | 14 +-
Jenkinsfile | 36 +-
README.md | 1 +
apache-maven/pom.xml | 54 +-
apache-maven/src/assembly/maven/conf/settings.xml | 9 +-
apache-maven/src/assembly/shared/init.cmd | 3 +-
.../licenses/MIT-slf4j-api-1.7.36.txt | 7 +-
.../apache/maven/settings/GlobalSettingsTest.java | 22 +-
api/maven-api-core/pom.xml | 15 +-
.../main/java/org/apache/maven/api/Artifact.java | 38 +-
.../org/apache/maven/api/ArtifactCoordinate.java | 24 +-
.../main/java/org/apache/maven/api/Dependency.java | 12 +-
.../org/apache/maven/api/DependencyCoordinate.java | 15 +-
.../src/main/java/org/apache/maven/api/Event.java | 21 +-
.../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 | 7 +-
.../java/org/apache/maven/api/MetadataStorage.java | 6 +-
.../java/org/apache/maven/api/MojoExecution.java | 9 +-
.../src/main/java/org/apache/maven/api/Node.java | 30 +-
.../java/org/apache/maven/api/NodeVisitor.java | 17 +-
.../main/java/org/apache/maven/api/Project.java | 20 +-
.../org/apache/maven/api/RemoteRepository.java | 7 +-
.../main/java/org/apache/maven/api/Repository.java | 13 +-
.../java/org/apache/maven/api/ResolutionScope.java | 41 +-
.../src/main/java/org/apache/maven/api/Scope.java | 29 +-
.../main/java/org/apache/maven/api/Service.java | 11 +-
.../main/java/org/apache/maven/api/Session.java | 92 +-
.../java/org/apache/maven/api/SessionData.java | 56 +-
.../main/java/org/apache/maven/api/Toolchain.java | 16 +-
.../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 | 14 +-
.../main/java/org/apache/maven/api/plugin/Log.java | 49 +-
.../java/org/apache/maven/api/plugin/Mojo.java | 14 +-
.../org/apache/maven/api/plugin/MojoException.java | 48 +-
.../maven/api/plugin/annotations/Component.java | 10 +-
.../maven/api/plugin/annotations/Execute.java | 26 +-
.../plugin/annotations/InstantiationStrategy.java | 20 +-
.../api/plugin/annotations/LifecyclePhase.java | 76 +-
.../apache/maven/api/plugin/annotations/Mojo.java | 13 +-
.../maven/api/plugin/annotations/Parameter.java | 14 +-
.../api/services/ArtifactCoordinateFactory.java | 45 +-
.../services/ArtifactCoordinateFactoryRequest.java | 142 +-
.../maven/api/services/ArtifactDeployer.java | 23 +-
.../api/services/ArtifactDeployerException.java | 19 +-
.../api/services/ArtifactDeployerRequest.java | 86 +-
.../apache/maven/api/services/ArtifactFactory.java | 31 +-
.../maven/api/services/ArtifactFactoryRequest.java | 127 +-
.../maven/api/services/ArtifactInstaller.java | 27 +-
.../api/services/ArtifactInstallerException.java | 19 +-
.../api/services/ArtifactInstallerRequest.java | 63 +-
.../apache/maven/api/services/ArtifactManager.java | 18 +-
.../maven/api/services/ArtifactResolver.java | 23 +-
.../api/services/ArtifactResolverException.java | 19 +-
.../api/services/ArtifactResolverRequest.java | 54 +-
.../maven/api/services/ArtifactResolverResult.java | 11 +-
.../org/apache/maven/api/services/BaseRequest.java | 35 +-
...jectBuilderProblem.java => BuilderProblem.java} | 42 +-
.../maven/api/services/DependencyCollector.java | 68 +-
.../api/services/DependencyCollectorException.java | 18 +-
.../api/services/DependencyCollectorRequest.java | 162 +-
.../api/services/DependencyCollectorResult.java | 33 +-
.../api/services/DependencyCoordinateFactory.java | 56 +-
.../DependencyCoordinateFactoryRequest.java | 191 +-
.../maven/api/services/LocalRepositoryManager.java | 13 +-
.../java/org/apache/maven/api/services/Lookup.java | 15 +-
.../apache/maven/api/services/LookupException.java | 26 +-
.../apache/maven/api/services/MavenException.java | 28 +-
.../apache/maven/api/services/MessageBuilder.java | 45 +-
.../maven/api/services/MessageBuilderFactory.java | 15 +-
.../apache/maven/api/services/ProjectBuilder.java | 54 +-
.../api/services/ProjectBuilderException.java | 19 +-
.../maven/api/services/ProjectBuilderRequest.java | 158 +-
.../maven/api/services/ProjectBuilderResult.java | 22 +-
.../apache/maven/api/services/ProjectManager.java | 58 +-
.../org/apache/maven/api/services/Prompter.java | 33 +-
.../maven/api/services/PrompterException.java | 19 +-
.../maven/api/services/RepositoryFactory.java | 15 +-
.../apache/maven/api/services/SettingsBuilder.java | 65 +
...erSource.java => SettingsBuilderException.java} | 21 +-
.../maven/api/services/SettingsBuilderRequest.java | 183 ++
.../maven/api/services/SettingsBuilderResult.java | 27 +-
.../{ProjectBuilderSource.java => Source.java} | 6 +-
.../maven/api/services/ToolchainFactory.java | 8 +-
.../maven/api/services/ToolchainManager.java | 18 +-
.../api/services/ToolchainManagerException.java | 19 +-
.../maven/api/services}/ToolchainsBuilder.java | 23 +-
...verity.java => ToolchainsBuilderException.java} | 20 +-
.../api/services/ToolchainsBuilderRequest.java | 175 ++
.../api/services/ToolchainsBuilderResult.java | 32 +-
.../org/apache/maven/api/services/Transport.java | 116 +
...rtifactDeployer.java => TransportProvider.java} | 48 +-
...verity.java => TransportProviderException.java} | 18 +-
.../apache/maven/api/services/TypeRegistry.java | 11 +-
.../apache/maven/api/services/VersionParser.java | 31 +-
.../maven/api/services/VersionParserException.java | 19 +-
.../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 | 83 +-
.../maven/api/services/xml/XmlReaderException.java | 19 +-
.../maven/api/services/xml/XmlReaderRequest.java | 103 +-
.../maven/api/services/xml/XmlWriterException.java | 19 +-
.../maven/api/services/xml/XmlWriterRequest.java | 49 +-
api/maven-api-meta/pom.xml | 5 +-
.../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 | 12 +-
.../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 | 21 +-
api/maven-api-model/src/main/mdo/common.vm | 2 +-
api/maven-api-model/src/main/mdo/maven.mdo | 204 +-
api/maven-api-settings/pom.xml | 10 +-
.../maven/api/settings/ImmutableCollections.java | 488 ++--
api/maven-api-settings/src/main/mdo/settings.mdo | 2 +-
api/maven-api-toolchain/pom.xml | 150 +-
.../maven/api/toolchain/ImmutableCollections.java | 488 ++--
api/maven-api-xml/pom.xml | 9 +-
.../main/java/org/apache/maven/api/xml/Dom.java | 48 +-
api/modello-plugin-velocity/pom.xml | 8 +-
.../codehaus/modello/plugin/velocity/Helper.java | 112 +-
.../plugin/velocity/ModelloVelocityMojo.java | 42 +-
.../modello/plugin/velocity/VelocityGenerator.java | 126 +-
api/pom.xml | 7 +-
doap_Maven.rdf | 22 +
maven-artifact/pom.xml | 4 +-
.../java/org/apache/maven/artifact/Artifact.java | 60 +-
.../org/apache/maven/artifact/ArtifactUtils.java | 183 +-
.../org/apache/maven/artifact/DefaultArtifact.java | 452 ++--
.../maven/artifact/InvalidArtifactRTException.java | 49 +-
.../maven/artifact/handler/ArtifactHandler.java | 8 +-
.../maven/artifact/metadata/ArtifactMetadata.java | 11 +-
.../artifact/repository/ArtifactRepository.java | 39 +-
.../repository/ArtifactRepositoryPolicy.java | 161 +-
.../maven/artifact/repository/Authentication.java | 34 +-
.../layout/ArtifactRepositoryLayout.java | 14 +-
.../layout/ArtifactRepositoryLayout2.java | 13 +-
.../metadata/RepositoryMetadataStoreException.java | 20 +-
.../AbstractArtifactResolutionException.java | 383 ++--
.../resolver/ArtifactNotFoundException.java | 115 +-
.../resolver/ArtifactResolutionException.java | 63 +-
.../resolver/CyclicDependencyException.java | 18 +-
.../MultipleArtifactsNotFoundException.java | 84 +-
.../artifact/resolver/filter/ArtifactFilter.java | 10 +-
.../maven/artifact/versioning/ArtifactVersion.java | 11 +-
.../artifact/versioning/ComparableVersion.java | 545 ++---
.../versioning/DefaultArtifactVersion.java | 172 +-
.../InvalidVersionSpecificationException.java | 14 +-
.../OverConstrainedVersionException.java | 23 +-
.../maven/artifact/versioning/Restriction.java | 121 +-
.../maven/artifact/versioning/VersionRange.java | 445 ++--
.../java/org/apache/maven/repository/Proxy.java | 54 +-
.../legacy/metadata/ArtifactMetadata.java | 17 +-
.../apache/maven/artifact/ArtifactUtilsTest.java | 60 +-
.../apache/maven/artifact/DefaultArtifactTest.java | 133 +-
.../artifact/handler/ArtifactHandlerMock.java | 53 +-
.../artifact/versioning/ComparableVersionIT.java | 60 +-
.../artifact/versioning/ComparableVersionTest.java | 364 +--
.../versioning/DefaultArtifactVersionTest.java | 284 ++-
.../artifact/versioning/VersionRangeTest.java | 1280 ++++++-----
maven-bom/pom.xml | 18 +-
maven-builder-support/pom.xml | 4 +-
.../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 | 62 +-
.../apache/maven/building/DefaultProblemTest.java | 127 +-
.../org/apache/maven/building/FileSourceTest.java | 49 +-
.../building/ProblemCollectorFactoryTest.java | 22 +-
.../apache/maven/building/StringSourceTest.java | 42 +-
.../org/apache/maven/building/UrlSourceTest.java | 41 +-
maven-compat/pom.xml | 4 +-
.../apache/maven/artifact/ArtifactScopeEnum.java | 82 +-
.../org/apache/maven/artifact/ArtifactStatus.java | 56 +-
.../artifact/UnknownRepositoryLayoutException.java | 23 +-
.../maven/artifact/deployer/ArtifactDeployer.java | 24 +-
.../deployer/ArtifactDeploymentException.java | 25 +-
.../artifact/deployer/DefaultArtifactDeployer.java | 119 +-
.../installer/ArtifactInstallationException.java | 25 +-
.../artifact/installer/ArtifactInstaller.java | 16 +-
.../installer/DefaultArtifactInstaller.java | 88 +-
.../artifact/manager/DefaultWagonManager.java | 111 +-
.../manager/WagonConfigurationException.java | 17 +-
.../maven/artifact/manager/WagonManager.java | 24 +-
.../repository/ArtifactRepositoryFactory.java | 53 +-
.../repository/DefaultArtifactRepository.java | 171 +-
.../DefaultArtifactRepositoryFactory.java | 97 +-
.../repository/layout/FlatRepositoryLayout.java | 53 +-
.../metadata/DefaultRepositoryMetadataManager.java | 547 ++---
.../metadata/GroupRepositoryMetadata.java | 74 +-
.../repository/metadata/MetadataBridge.java | 103 +-
.../repository/metadata/MetadataUtils.java | 13 +-
.../metadata/RepositoryMetadataReadException.java | 20 +-
.../SnapshotArtifactRepositoryMetadata.java | 52 +-
.../maven/artifact/resolver/ArtifactCollector.java | 24 +-
.../maven/artifact/resolver/ArtifactResolver.java | 106 +-
.../artifact/resolver/DebugResolutionListener.java | 115 +-
.../resolver/DefaultArtifactCollector.java | 14 +-
.../artifact/resolver/DefaultArtifactResolver.java | 639 +++---
.../resolver/ResolutionListenerForDepMgmt.java | 17 +-
.../artifact/resolver/UnresolvedArtifacts.java | 23 +-
.../resolver/WarningResolutionListener.java | 62 +-
.../resolver/filter/InversionArtifactFilter.java | 32 +-
.../artifact/resolver/filter/OrArtifactFilter.java | 44 +-
.../resolver/filter/TypeArtifactFilter.java | 32 +-
.../artifact/versioning/ManagedVersionMap.java | 32 +-
.../maven/execution/DefaultRuntimeInformation.java | 26 +-
.../apache/maven/execution/RuntimeInformation.java | 8 +-
.../profiles/DefaultMavenProfilesBuilder.java | 65 +-
.../maven/profiles/DefaultProfileManager.java | 184 +-
.../maven/profiles/MavenProfilesBuilder.java | 15 +-
.../org/apache/maven/profiles/ProfileManager.java | 30 +-
.../maven/profiles/ProfilesConversionUtils.java | 113 +-
.../activation/DetectedProfileActivator.java | 17 +-
.../profiles/activation/FileProfileActivator.java | 68 +-
.../activation/JdkPrefixProfileActivator.java | 68 +-
.../OperatingSystemProfileActivator.java | 109 +-
.../activation/ProfileActivationException.java | 20 +-
.../profiles/activation/ProfileActivator.java | 14 +-
.../activation/SystemPropertyProfileActivator.java | 71 +-
.../maven/project/DefaultMavenProjectBuilder.java | 290 ++-
.../DefaultProjectBuilderConfiguration.java | 47 +-
.../project/InvalidProjectModelException.java | 37 +-
.../apache/maven/project/MavenProjectBuilder.java | 62 +-
.../project/MissingRepositoryElementException.java | 21 +-
.../java/org/apache/maven/project/ModelUtils.java | 26 +-
.../maven/project/ProjectBuilderConfiguration.java | 19 +-
.../org/apache/maven/project/ProjectUtils.java | 82 +-
.../DefaultModelInheritanceAssembler.java | 25 +-
.../inheritance/ModelInheritanceAssembler.java | 16 +-
.../AbstractStringBasedModelInterpolator.java | 351 ++-
.../interpolation/BuildTimestampValueSource.java | 26 +-
.../interpolation/ModelInterpolationException.java | 38 +-
.../project/interpolation/ModelInterpolator.java | 36 +-
.../PathTranslatingPostProcessor.java | 35 +-
.../interpolation/RegexBasedModelInterpolator.java | 28 +-
.../StringSearchModelInterpolator.java | 403 ++--
.../maven/project/path/DefaultPathTranslator.java | 184 +-
.../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 | 138 +-
.../maven/repository/MavenArtifactMetadata.java | 56 +-
.../org/apache/maven/repository/MetadataGraph.java | 38 +-
.../apache/maven/repository/MetadataGraphNode.java | 52 +-
.../repository/MetadataResolutionRequest.java | 105 +-
.../maven/repository/MetadataResolutionResult.java | 208 +-
.../apache/maven/repository/MirrorSelector.java | 9 +-
.../repository/UserLocalArtifactRepository.java | 35 +-
.../maven/repository/VersionNotFoundException.java | 37 +-
.../repository/legacy/ChecksumFailedException.java | 20 +-
.../legacy/DefaultUpdateCheckManager.java | 367 ++--
.../repository/legacy/DefaultWagonManager.java | 825 +++----
.../repository/legacy/LegacyRepositorySystem.java | 812 +++----
.../maven/repository/legacy/MavenArtifact.java | 49 +-
.../repository/legacy/TransferListenerAdapter.java | 150 +-
.../repository/legacy/UpdateCheckManager.java | 19 +-
.../legacy/WagonConfigurationException.java | 29 +-
.../maven/repository/legacy/WagonManager.java | 64 +-
.../repository/ArtifactRepositoryFactory.java | 51 +-
.../DefaultArtifactRepositoryFactory.java | 120 +-
.../resolver/DefaultLegacyArtifactCollector.java | 772 +++----
.../legacy/resolver/LegacyArtifactCollector.java | 54 +-
.../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 | 87 +-
.../resolver/transform/ArtifactTransformation.java | 32 +-
.../transform/ArtifactTransformationManager.java | 28 +-
.../DefaultArtifactTransformationManager.java | 62 +-
.../transform/LatestArtifactTransformation.java | 50 +-
.../transform/ReleaseArtifactTransformation.java | 70 +-
.../resolver/transform/SnapshotTransformation.java | 134 +-
.../repository/metadata/ArtifactMetadata.java | 264 ++-
.../repository/metadata/ClasspathContainer.java | 88 +-
.../metadata/ClasspathTransformation.java | 12 +-
.../metadata/DefaultClasspathTransformation.java | 157 +-
.../DefaultGraphConflictResolutionPolicy.java | 36 +-
.../metadata/DefaultGraphConflictResolver.java | 196 +-
.../metadata/GraphConflictResolutionException.java | 29 +-
.../metadata/GraphConflictResolutionPolicy.java | 11 +-
.../repository/metadata/GraphConflictResolver.java | 12 +-
.../maven/repository/metadata/MetadataGraph.java | 425 ++--
.../repository/metadata/MetadataGraphEdge.java | 128 +-
.../MetadataGraphTransformationException.java | 29 +-
.../repository/metadata/MetadataGraphVertex.java | 150 +-
.../repository/metadata/MetadataResolution.java | 40 +-
.../metadata/MetadataResolutionException.java | 28 +-
.../metadata/MetadataResolutionRequest.java | 45 +-
.../MetadataResolutionRequestTypeEnum.java | 29 +-
.../metadata/MetadataResolutionResult.java | 141 +-
.../metadata/MetadataRetrievalException.java | 34 +-
.../maven/repository/metadata/MetadataSource.java | 16 +-
.../repository/metadata/MetadataTreeNode.java | 95 +-
.../plugin/ExpressionDocumentationException.java | 20 +-
.../usability/plugin/ExpressionDocumenter.java | 105 +-
maven-compat/src/main/mdo/profiles.mdo | 2 +-
.../AbstractArtifactComponentTestCase.java | 267 +--
.../artifact/deployer/ArtifactDeployerTest.java | 45 +-
.../deployer/SimpleArtifactMetadataSource.java | 45 +-
.../factory/DefaultArtifactFactoryTest.java | 51 +-
.../artifact/installer/ArtifactInstallerTest.java | 39 +-
.../artifact/metadata/TestMetadataSource.java | 89 +-
.../repository/MavenArtifactRepositoryTest.java | 37 +-
.../resolver/ArtifactResolutionExceptionTest.java | 24 +-
.../artifact/resolver/ArtifactResolverTest.java | 228 +-
.../resolver/DefaultArtifactResolverTest.java | 61 +-
.../maven/artifact/resolver/TestFileWagon.java | 63 +-
.../artifact/resolver/TestTransferListener.java | 18 +-
.../resolver/filter/AndArtifactFilterTest.java | 25 +-
.../resolver/filter/FilterHashEqualsTest.java | 27 +-
.../resolver/filter/OrArtifactFilterTest.java | 25 +-
.../resolver/filter/ScopeArtifactFilterTest.java | 97 +-
.../maven/artifact/testutils/TestFileManager.java | 150 +-
.../transform/TransformationManagerTest.java | 52 +-
.../manager/DefaultProfileManagerTest.java | 144 +-
.../project/AbstractMavenProjectTestCase.java | 137 +-
.../maven/project/ClasspathArtifactResolver.java | 66 +-
.../maven/project/EmptyLifecycleExecutor.java | 67 +-
.../project/EmptyLifecyclePluginAnalyzer.java | 46 +-
.../project/LegacyLocalRepositoryManager.java | 137 +-
.../apache/maven/project/ProjectClasspathTest.java | 146 +-
.../apache/maven/project/TestArtifactResolver.java | 41 +-
.../maven/project/TestMavenRepositorySystem.java | 39 +-
.../apache/maven/project/TestProjectBuilder.java | 77 +-
.../AbstractProjectInheritanceTestCase.java | 29 +-
.../inheritance/t00/ProjectInheritanceTest.java | 29 +-
.../inheritance/t01/ProjectInheritanceTest.java | 33 +-
.../inheritance/t02/ProjectInheritanceTest.java | 79 +-
.../inheritance/t03/ProjectInheritanceTest.java | 23 +-
.../inheritance/t04/ProjectInheritanceTest.java | 46 +-
.../inheritance/t05/ProjectInheritanceTest.java | 40 +-
.../inheritance/t06/ProjectInheritanceTest.java | 41 +-
.../inheritance/t07/ProjectInheritanceTest.java | 43 +-
.../inheritance/t08/ProjectInheritanceTest.java | 42 +-
.../inheritance/t09/ProjectInheritanceTest.java | 66 +-
.../inheritance/t10/ProjectInheritanceTest.java | 42 +-
.../inheritance/t11/ProjectInheritanceTest.java | 28 +-
.../inheritance/t12/ProjectInheritanceTest.java | 32 +-
.../inheritance/t12scm/ProjectInheritanceTest.java | 125 +-
.../project/path/DefaultPathTranslatorTest.java | 39 +-
.../repository/DefaultMirrorSelectorTest.java | 15 +-
.../repository/LegacyRepositorySystemTest.java | 183 +-
.../maven/repository/MirrorProcessorTest.java | 257 +--
.../legacy/DefaultUpdateCheckManagerTest.java | 190 +-
.../repository/legacy/DefaultWagonManagerTest.java | 305 ++-
.../legacy/LegacyRepositorySystemTest.java | 64 +-
.../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 | 1101 +++++-----
.../conflict/AbstractConflictResolverTest.java | 80 +-
.../conflict/FarthestConflictResolverTest.java | 53 +-
.../conflict/NearestConflictResolverTest.java | 53 +-
.../conflict/NewestConflictResolverTest.java | 53 +-
.../conflict/OldestConflictResolverTest.java | 54 +-
.../DefaultClasspathTransformationTest.java | 117 +-
.../DefaultGraphConflictResolutionPolicyTest.java | 68 +-
.../metadata/DefaultGraphConflictResolverTest.java | 242 +-
.../repository/metadata/TestMetadataSource.java | 79 +-
maven-core/pom.xml | 47 +-
.../maven/AbstractMavenLifecycleParticipant.java | 20 +-
.../org/apache/maven/ArtifactFilterManager.java | 11 +-
.../maven/ArtifactFilterManagerDelegate.java | 13 +-
.../src/main/java/org/apache/maven/BuildAbort.java | 18 +-
.../org/apache/maven/BuildFailureException.java | 19 +-
.../apache/maven/DefaultArtifactFilterManager.java | 64 +-
.../main/java/org/apache/maven/DefaultMaven.java | 644 +++---
.../maven/DefaultProjectDependenciesResolver.java | 178 +-
.../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 | 27 +-
.../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 | 35 +-
.../main/java/org/apache/maven/ReactorReader.java | 273 +--
.../java/org/apache/maven/RepositoryUtils.java | 387 ++--
.../main/java/org/apache/maven/SessionScoped.java | 17 +-
.../DependencyResolutionRequiredException.java | 14 +-
.../maven/artifact/InvalidRepositoryException.java | 32 +-
.../maven/artifact/factory/ArtifactFactory.java | 63 +-
.../artifact/factory/DefaultArtifactFactory.java | 186 +-
.../artifact/handler/DefaultArtifactHandler.java | 109 +-
.../handler/manager/ArtifactHandlerManager.java | 12 +-
.../manager/DefaultArtifactHandlerManager.java | 50 +-
.../providers/EarArtifactHandlerProvider.java | 28 +-
.../providers/EjbArtifactHandlerProvider.java | 28 +-
.../EjbClientArtifactHandlerProvider.java | 29 +-
.../providers/JarArtifactHandlerProvider.java | 28 +-
.../JavaSourceArtifactHandlerProvider.java | 29 +-
.../providers/JavadocArtifactHandlerProvider.java | 28 +-
.../MavenPluginArtifactHandlerProvider.java | 28 +-
.../providers/PomArtifactHandlerProvider.java | 28 +-
.../providers/RarArtifactHandlerProvider.java | 28 +-
.../providers/TestJarArtifactHandlerProvider.java | 28 +-
.../providers/WarArtifactHandlerProvider.java | 28 +-
.../metadata/AbstractArtifactMetadata.java | 15 +-
.../ArtifactMetadataRetrievalException.java | 29 +-
.../artifact/metadata/ArtifactMetadataSource.java | 37 +-
.../maven/artifact/metadata/ResolutionGroup.java | 28 +-
.../repository/DefaultRepositoryRequest.java | 63 +-
.../repository/LegacyLocalRepositoryManager.java | 301 +--
.../repository/MavenArtifactRepository.java | 280 +--
.../maven/artifact/repository/RepositoryCache.java | 11 +-
.../artifact/repository/RepositoryRequest.java | 15 +-
.../repository/layout/DefaultRepositoryLayout.java | 77 +-
.../metadata/AbstractRepositoryMetadata.java | 175 +-
.../metadata/ArtifactRepositoryMetadata.java | 68 +-
.../repository/metadata/RepositoryMetadata.java | 16 +-
.../RepositoryMetadataDeploymentException.java | 20 +-
.../RepositoryMetadataInstallationException.java | 20 +-
.../metadata/RepositoryMetadataManager.java | 35 +-
.../RepositoryMetadataResolutionException.java | 20 +-
.../metadata/io/DefaultMetadataReader.java | 63 +-
.../metadata/io/MetadataParseException.java | 26 +-
.../repository/metadata/io/MetadataReader.java | 16 +-
.../resolver/ArtifactResolutionRequest.java | 150 +-
.../resolver/ArtifactResolutionResult.java | 214 +-
.../resolver/DefaultResolutionErrorHandler.java | 64 +-
.../artifact/resolver/ResolutionErrorHandler.java | 11 +-
.../artifact/resolver/ResolutionListener.java | 40 +-
.../maven/artifact/resolver/ResolutionNode.java | 155 +-
.../filter/AbstractScopeArtifactFilter.java | 58 +-
.../resolver/filter/AndArtifactFilter.java | 50 +-
.../filter/CumulativeScopeArtifactFilter.java | 61 +-
.../resolver/filter/ExcludesArtifactFilter.java | 19 +-
.../resolver/filter/ExclusionArtifactFilter.java | 41 +-
.../resolver/filter/ExclusionSetFilter.java | 40 +-
.../resolver/filter/IncludesArtifactFilter.java | 42 +-
.../resolver/filter/ScopeArtifactFilter.java | 34 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 809 +++----
.../classrealm/ArtifactClassRealmConstituent.java | 32 +-
.../maven/classrealm/ClassRealmConstituent.java | 7 +-
.../apache/maven/classrealm/ClassRealmManager.java | 19 +-
.../classrealm/ClassRealmManagerDelegate.java | 10 +-
.../apache/maven/classrealm/ClassRealmRequest.java | 10 +-
.../maven/classrealm/DefaultClassRealmManager.java | 329 ++-
.../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 | 141 +-
.../internal/EnhancedComponentConfigurator.java | 44 +-
.../internal/EnhancedConfigurationConverter.java | 114 +-
.../internal/EnhancedConverterLookup.java | 26 +-
.../apache/maven/eventspy/AbstractEventSpy.java | 23 +-
.../java/org/apache/maven/eventspy/EventSpy.java | 22 +-
.../eventspy/internal/EventSpyDispatcher.java | 108 +-
.../internal/EventSpyExecutionListener.java | 130 +-
.../internal/EventSpyRepositoryListener.java | 144 +-
.../maven/exception/DefaultExceptionHandler.java | 227 +-
.../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 | 18 +-
.../execution/DefaultBuildResumptionAnalyzer.java | 46 +-
.../DefaultBuildResumptionDataRepository.java | 113 +-
.../execution/DefaultMavenExecutionRequest.java | 712 +++---
.../DefaultMavenExecutionRequestPopulator.java | 229 +-
.../execution/DefaultMavenExecutionResult.java | 62 +-
.../org/apache/maven/execution/ExecutionEvent.java | 10 +-
.../apache/maven/execution/ExecutionListener.java | 41 +-
.../maven/execution/MavenExecutionRequest.java | 134 +-
.../MavenExecutionRequestPopulationException.java | 25 +-
.../execution/MavenExecutionRequestPopulator.java | 20 +-
.../maven/execution/MavenExecutionResult.java | 24 +-
.../org/apache/maven/execution/MavenSession.java | 321 ++-
.../apache/maven/execution/MojoExecutionEvent.java | 31 +-
.../maven/execution/MojoExecutionListener.java | 14 +-
.../apache/maven/execution/ProfileActivation.java | 88 +-
.../apache/maven/execution/ProjectActivation.java | 105 +-
.../maven/execution/ProjectDependencyGraph.java | 11 +-
.../maven/execution/ProjectExecutionEvent.java | 39 +-
.../maven/execution/ProjectExecutionListener.java | 17 +-
.../org/apache/maven/execution/ReactorManager.java | 135 +-
.../maven/execution/scope/MojoExecutionScoped.java | 17 +-
.../execution/scope/WeakMojoExecutionListener.java | 14 +-
.../scope/internal/MojoExecutionScope.java | 130 +-
.../internal/MojoExecutionScopeCoreModule.java | 20 +-
.../scope/internal/MojoExecutionScopeModule.java | 45 +-
.../maven/extension/internal/CoreExports.java | 26 +-
.../extension/internal/CoreExportsProvider.java | 23 +-
.../extension/internal/CoreExtensionEntry.java | 83 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 359 ++-
.../maven/graph/DefaultProjectDependencyGraph.java | 112 +-
.../graph/FilteredProjectDependencyGraph.java | 59 +-
.../java/org/apache/maven/graph/GraphBuilder.java | 10 +-
.../org/apache/maven/graph/ProjectSelector.java | 127 +-
.../maven/internal/MultilineMessageHelper.java | 73 +-
.../aether/ConsumerModelSourceTransformer.java | 23 +-
.../DefaultRepositorySystemSessionFactory.java | 446 ++--
.../internal/aether/LoggingRepositoryListener.java | 120 +-
.../aether/MavenChainedWorkspaceReader.java | 52 +-
.../aether/ResolverLifecycle.java} | 40 +-
.../aether/ReverseTreeRepositoryListener.java | 137 ++
.../apache/maven/internal/impl/AbstractNode.java | 45 +-
.../maven/internal/impl/AbstractSession.java | 382 ++--
.../maven/internal/impl/DefaultArtifact.java | 71 +-
.../internal/impl/DefaultArtifactCoordinate.java | 62 +-
.../impl/DefaultArtifactCoordinateFactory.java | 44 +-
.../internal/impl/DefaultArtifactDeployer.java | 47 +-
.../internal/impl/DefaultArtifactFactory.java | 45 +-
.../internal/impl/DefaultArtifactInstaller.java | 39 +-
.../internal/impl/DefaultArtifactManager.java | 80 +-
.../internal/impl/DefaultArtifactResolver.java | 59 +-
.../maven/internal/impl/DefaultDependency.java | 91 +-
.../internal/impl/DefaultDependencyCollector.java | 72 +-
.../internal/impl/DefaultDependencyCoordinate.java | 72 +-
.../impl/DefaultDependencyCoordinateFactory.java | 34 +-
.../apache/maven/internal/impl/DefaultEvent.java | 32 +-
.../internal/impl/DefaultLocalRepository.java | 28 +-
.../impl/DefaultLocalRepositoryManager.java | 39 +-
.../org/apache/maven/internal/impl/DefaultLog.java | 153 +-
.../apache/maven/internal/impl/DefaultLookup.java | 67 +-
.../maven/internal/impl/DefaultMessageBuilder.java | 77 +-
.../impl/DefaultMessageBuilderFactory.java | 25 +-
.../internal/impl/DefaultModelXmlFactory.java | 106 +-
.../maven/internal/impl/DefaultMojoExecution.java | 32 +-
.../apache/maven/internal/impl/DefaultNode.java | 131 +-
.../apache/maven/internal/impl/DefaultProject.java | 146 +-
.../maven/internal/impl/DefaultProjectBuilder.java | 210 +-
.../maven/internal/impl/DefaultProjectManager.java | 126 +-
.../maven/internal/impl/DefaultPrompter.java | 71 +-
.../internal/impl/DefaultRemoteRepository.java | 29 +-
.../internal/impl/DefaultRepositoryFactory.java | 54 +-
.../apache/maven/internal/impl/DefaultSession.java | 250 +--
.../maven/internal/impl/DefaultSessionFactory.java | 31 +-
.../internal/impl/DefaultSettingsBuilder.java | 162 ++
.../internal/impl/DefaultSettingsXmlFactory.java | 80 +-
.../internal/impl/DefaultToolchainManager.java | 86 +-
.../internal/impl/DefaultToolchainsBuilder.java | 158 ++
.../internal/impl/DefaultToolchainsXmlFactory.java | 81 +-
.../maven/internal/impl/DefaultTransport.java | 156 ++
.../internal/impl/DefaultTransportProvider.java | 63 +
.../maven/internal/impl/DefaultTypeRegistry.java | 37 +-
.../maven/internal/impl/DefaultVersionParser.java | 107 +-
.../apache/maven/internal/impl/EventSpyImpl.java | 38 +-
.../maven/internal/impl/MappedCollection.java | 28 +-
.../org/apache/maven/internal/impl/MappedList.java | 19 +-
.../maven/internal/impl/PropertiesAsMap.java | 101 +-
.../java/org/apache/maven/internal/impl/Utils.java | 33 +-
.../apache/maven/internal/impl/WrapperNode.java | 33 +-
.../maven/lifecycle/DefaultLifecycleExecutor.java | 97 +-
.../apache/maven/lifecycle/DefaultLifecycles.java | 123 +-
.../maven/lifecycle/LifeCyclePluginAnalyzer.java | 11 +-
.../java/org/apache/maven/lifecycle/Lifecycle.java | 33 +-
.../lifecycle/LifecycleExecutionException.java | 91 +-
.../apache/maven/lifecycle/LifecycleExecutor.java | 50 +-
.../maven/lifecycle/LifecycleMappingDelegate.java | 16 +-
.../lifecycle/LifecycleNotFoundException.java | 18 +-
.../lifecycle/LifecyclePhaseNotFoundException.java | 18 +-
.../apache/maven/lifecycle/MavenExecutionPlan.java | 123 +-
.../maven/lifecycle/MissingProjectException.java | 13 +-
.../maven/lifecycle/MojoExecutionConfigurator.java | 8 +-
.../maven/lifecycle/NoGoalSpecifiedException.java | 13 +-
.../lifecycle/internal/BuildListCalculator.java | 51 +-
.../lifecycle/internal/BuildThreadFactory.java | 12 +-
.../internal/CompoundProjectExecutionListener.java | 47 +-
.../lifecycle/internal/DefaultExecutionEvent.java | 26 +-
.../internal/DefaultExecutionEventCatapult.java | 62 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 561 +++--
.../internal/DefaultLifecycleMappingDelegate.java | 110 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 208 +-
.../DefaultLifecycleTaskSegmentCalculator.java | 101 +-
.../internal/DefaultMojoExecutionConfigurator.java | 160 +-
.../internal/DefaultProjectArtifactFactory.java | 26 +-
.../lifecycle/internal/DependencyContext.java | 58 +-
.../lifecycle/internal/ExecutionEventCatapult.java | 11 +-
.../lifecycle/internal/ExecutionPlanItem.java | 45 +-
.../apache/maven/lifecycle/internal/GoalTask.java | 14 +-
.../lifecycle/internal/LifecycleDebugLogger.java | 129 +-
.../internal/LifecycleDependencyResolver.java | 358 ++-
.../internal/LifecycleExecutionPlanCalculator.java | 54 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 93 +-
.../internal/LifecyclePluginResolver.java | 61 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 103 +-
.../maven/lifecycle/internal/LifecycleTask.java | 17 +-
.../internal/LifecycleTaskSegmentCalculator.java | 31 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 198 +-
.../maven/lifecycle/internal/MojoExecutor.java | 462 ++--
.../maven/lifecycle/internal/PhaseRecorder.java | 42 +-
.../lifecycle/internal/ProjectArtifactFactory.java | 11 +-
.../maven/lifecycle/internal/ProjectBuildList.java | 90 +-
.../maven/lifecycle/internal/ProjectIndex.java | 38 +-
.../maven/lifecycle/internal/ProjectSegment.java | 37 +-
.../lifecycle/internal/ReactorBuildStatus.java | 49 +-
.../maven/lifecycle/internal/ReactorContext.java | 29 +-
.../maven/lifecycle/internal/TaskSegment.java | 25 +-
.../maven/lifecycle/internal/builder/Builder.java | 18 +-
.../lifecycle/internal/builder/BuilderCommon.java | 185 +-
.../internal/builder/BuilderNotFoundException.java | 14 +-
.../multithreaded/ConcurrencyDependencyGraph.java | 85 +-
.../multithreaded/MultiThreadedBuilder.java | 200 +-
.../builder/multithreaded/ThreadOutputMuxer.java | 340 ++-
.../singlethreaded/SingleThreadedBuilder.java | 47 +-
.../lifecycle/mapping/DefaultLifecycleMapping.java | 82 +-
.../apache/maven/lifecycle/mapping/Lifecycle.java | 44 +-
.../maven/lifecycle/mapping/LifecycleMapping.java | 13 +-
.../maven/lifecycle/mapping/LifecycleMojo.java | 26 +-
.../maven/lifecycle/mapping/LifecyclePhase.java | 73 +-
.../providers/AbstractLifecycleProvider.java | 41 +-
.../providers/CleanLifecycleProvider.java | 22 +-
.../providers/DefaultLifecycleProvider.java | 23 +-
.../lifecycle/providers/SiteLifecycleProvider.java | 25 +-
.../providers/WrapperLifecycleProvider.java | 25 +-
.../AbstractLifecycleMappingProvider.java | 39 +-
.../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 | 164 +-
.../maven/monitor/event/EventDispatcher.java | 19 +-
.../apache/maven/monitor/event/EventMonitor.java | 17 +-
.../apache/maven/plugin/BuildPluginManager.java | 31 +-
.../java/org/apache/maven/plugin/CacheUtils.java | 109 +-
.../plugin/CompoundMojoExecutionListener.java | 39 +-
.../CycleDetectedInPluginGraphException.java | 19 +-
.../maven/plugin/DebugConfigurationListener.java | 68 +-
.../maven/plugin/DefaultBuildPluginManager.java | 232 +-
.../maven/plugin/DefaultExtensionRealmCache.java | 112 +-
.../plugin/DefaultMojosExecutionStrategy.java | 24 +-
.../maven/plugin/DefaultPluginArtifactsCache.java | 145 +-
.../maven/plugin/DefaultPluginDescriptorCache.java | 173 +-
.../maven/plugin/DefaultPluginRealmCache.java | 178 +-
.../apache/maven/plugin/ExtensionRealmCache.java | 35 +-
.../plugin/InvalidPluginDescriptorException.java | 25 +-
.../maven/plugin/InvalidPluginException.java | 25 +-
.../org/apache/maven/plugin/LegacySupport.java | 9 +-
.../apache/maven/plugin/MavenPluginManager.java | 55 +-
...r.java => MavenPluginPrerequisitesChecker.java} | 20 +-
.../org/apache/maven/plugin/MojoExecution.java | 120 +-
.../apache/maven/plugin/MojoExecutionRunner.java | 8 +-
.../maven/plugin/MojosExecutionStrategy.java | 13 +-
.../apache/maven/plugin/PluginArtifactsCache.java | 40 +-
.../maven/plugin/PluginConfigurationException.java | 40 +-
.../maven/plugin/PluginContainerException.java | 45 +-
.../apache/maven/plugin/PluginDescriptorCache.java | 25 +-
.../plugin/PluginDescriptorParsingException.java | 27 +-
.../maven/plugin/PluginExecutionException.java | 59 +-
.../maven/plugin/PluginIncompatibleException.java | 17 +-
.../apache/maven/plugin/PluginLoaderException.java | 78 +-
.../org/apache/maven/plugin/PluginManager.java | 57 +-
.../maven/plugin/PluginManagerException.java | 90 +-
.../maven/plugin/PluginNotFoundException.java | 43 +-
.../maven/plugin/PluginParameterException.java | 199 +-
.../plugin/PluginParameterExpressionEvaluator.java | 405 ++--
.../PluginParameterExpressionEvaluatorV4.java | 422 ++--
.../org/apache/maven/plugin/PluginRealmCache.java | 45 +-
.../maven/plugin/PluginResolutionException.java | 21 +-
.../AbstractMavenPluginParametersValidator.java | 107 +-
.../plugin/internal/DefaultLegacySupport.java | 40 +-
.../plugin/internal/DefaultMavenPluginManager.java | 943 ++++----
.../internal/DefaultMavenPluginValidator.java | 33 +-
.../DefaultPluginDependenciesResolver.java | 297 ++-
.../plugin/internal/DefaultPluginManager.java | 203 +-
.../plugin/internal/DeprecatedPluginValidator.java | 66 +-
.../MavenPluginConfigurationValidator.java | 15 +-
.../MavenPluginJavaPrerequisiteChecker.java | 74 +
.../MavenPluginMavenPrerequisiteChecker.java | 64 +
.../plugin/internal/MavenPluginValidator.java | 12 +-
.../maven/plugin/internal/MojoLogWrapper.java | 96 +-
.../internal/PluginDependenciesResolver.java | 21 +-
.../ReadOnlyPluginParametersValidator.java | 43 +-
.../internal/ValidatingConfigurationListener.java | 54 +-
.../plugin/prefix/DefaultPluginPrefixRequest.java | 76 +-
.../prefix/NoPluginFoundForPrefixException.java | 53 +-
.../maven/plugin/prefix/PluginPrefixRequest.java | 17 +-
.../maven/plugin/prefix/PluginPrefixResolver.java | 10 +-
.../maven/plugin/prefix/PluginPrefixResult.java | 9 +-
.../internal/DefaultPluginPrefixResolver.java | 245 +--
.../prefix/internal/DefaultPluginPrefixResult.java | 35 +-
.../version/DefaultPluginVersionRequest.java | 78 +-
.../version/PluginVersionNotFoundException.java | 21 +-
.../maven/plugin/version/PluginVersionRequest.java | 17 +-
.../version/PluginVersionResolutionException.java | 73 +-
.../plugin/version/PluginVersionResolver.java | 10 +-
.../maven/plugin/version/PluginVersionResult.java | 7 +-
.../internal/DefaultPluginVersionResolver.java | 399 ++--
.../internal/DefaultPluginVersionResult.java | 26 +-
.../DefaultDependencyResolutionRequest.java | 36 +-
.../project/DefaultDependencyResolutionResult.java | 62 +-
.../maven/project/DefaultMavenProjectHelper.java | 103 +-
.../project/DefaultModelBuildingListener.java | 96 +-
.../maven/project/DefaultProjectBuilder.java | 997 ++++-----
.../project/DefaultProjectBuildingHelper.java | 190 +-
.../project/DefaultProjectBuildingRequest.java | 218 +-
.../project/DefaultProjectBuildingResult.java | 64 +-
.../DefaultProjectDependenciesResolver.java | 305 ++-
.../maven/project/DefaultProjectRealmCache.java | 90 +-
.../project/DependencyResolutionException.java | 16 +-
.../maven/project/DependencyResolutionRequest.java | 13 +-
.../maven/project/DependencyResolutionResult.java | 9 +-
.../DuplicateArtifactAttachmentException.java | 23 +-
.../maven/project/DuplicateProjectException.java | 35 +-
.../apache/maven/project/ExtensionDescriptor.java | 46 +-
.../maven/project/ExtensionDescriptorBuilder.java | 99 +-
.../project/InvalidProjectVersionException.java | 37 +-
.../org/apache/maven/project/MavenProject.java | 1318 +++++------
.../apache/maven/project/MavenProjectHelper.java | 20 +-
.../org/apache/maven/project/ProjectBuilder.java | 28 +-
.../maven/project/ProjectBuildingException.java | 63 +-
.../maven/project/ProjectBuildingHelper.java | 23 +-
.../maven/project/ProjectBuildingRequest.java | 46 +-
.../maven/project/ProjectBuildingResult.java | 7 +-
.../maven/project/ProjectDependenciesResolver.java | 10 +-
.../apache/maven/project/ProjectModelResolver.java | 285 ++-
.../apache/maven/project/ProjectRealmCache.java | 31 +-
.../org/apache/maven/project/ProjectSorter.java | 268 +--
.../org/apache/maven/project/ReactorModelPool.java | 96 +-
.../maven/project/RepositorySessionDecorator.java | 8 +-
.../project/artifact/ActiveProjectArtifact.java | 252 +--
.../project/artifact/ArtifactWithDependencies.java | 9 +-
.../maven/project/artifact/AttachedArtifact.java | 154 +-
.../artifact/DefaultMavenMetadataCache.java | 291 ++-
.../project/artifact/DefaultMetadataSource.java | 17 +-
.../artifact/DefaultProjectArtifactsCache.java | 185 +-
.../InvalidDependencyVersionException.java | 24 +-
.../maven/project/artifact/MavenMetadataCache.java | 25 +-
.../project/artifact/MavenMetadataSource.java | 643 +++---
.../maven/project/artifact/PluginArtifact.java | 58 +-
.../maven/project/artifact/ProjectArtifact.java | 66 +-
.../project/artifact/ProjectArtifactMetadata.java | 77 +-
.../project/artifact/ProjectArtifactsCache.java | 42 +-
.../project/collector/DefaultProjectsSelector.java | 74 +-
.../collector/MultiModuleCollectionStrategy.java | 176 +-
.../collector/PomlessCollectionStrategy.java | 40 +-
.../collector/ProjectCollectionStrategy.java | 13 +-
.../maven/project/collector/ProjectsSelector.java | 15 +-
.../collector/RequestPomCollectionStrategy.java | 27 +-
.../apache/maven/project/path/PathTranslator.java | 16 +-
.../properties/internal/EnvironmentUtils.java | 29 +-
.../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 | 117 +-
.../maven/repository/LocalArtifactRepository.java | 9 +-
.../LocalRepositoryNotAccessibleException.java | 20 +-
.../apache/maven/repository/RepositorySystem.java | 89 +-
.../legacy/metadata/AbstractArtifactMetadata.java | 34 +-
.../ArtifactMetadataRetrievalException.java | 35 +-
.../legacy/metadata/ArtifactMetadataSource.java | 33 +-
.../metadata/DefaultMetadataResolutionRequest.java | 65 +-
.../legacy/metadata/MetadataResolutionRequest.java | 18 +-
.../legacy/metadata/ResolutionGroup.java | 40 +-
.../apache/maven/rtinfo/RuntimeInformation.java | 9 +-
.../rtinfo/internal/DefaultRuntimeInformation.java | 110 +-
.../maven/session/scope/internal/SessionScope.java | 94 +-
.../session/scope/internal/SessionScopeModule.java | 39 +-
.../settings/DefaultMavenSettingsBuilder.java | 113 +-
.../maven/settings/MavenSettingsBuilder.java | 24 +-
.../settings/SettingsConfigurationException.java | 37 +-
.../org/apache/maven/settings/SettingsUtils.java | 286 +--
.../org/apache/maven/settings/SettingsUtilsV4.java | 300 +++
.../apache/maven/toolchain/DefaultToolchain.java | 99 +-
.../maven/toolchain/DefaultToolchainManager.java | 116 +-
.../toolchain/DefaultToolchainManagerPrivate.java | 74 +-
.../maven/toolchain/DefaultToolchainsBuilder.java | 50 +-
.../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 | 13 +-
.../maven/toolchain/ToolchainManagerPrivate.java | 14 +-
.../apache/maven/toolchain/ToolchainPrivate.java | 14 +-
.../apache/maven/toolchain/ToolchainsBuilder.java | 12 +-
.../maven/toolchain/java/DefaultJavaToolChain.java | 25 +-
.../apache/maven/toolchain/java/JavaToolchain.java | 75 +-
.../maven/toolchain/java/JavaToolchainFactory.java | 90 +-
.../maven/toolchain/java/JavaToolchainImpl.java | 58 +-
.../DefaultConsumerPomXMLFilterFactory.java | 13 +-
maven-core/src/main/mdo/extension.mdo | 13 +-
.../main/resources/META-INF/maven/extension.xml | 8 +
maven-core/src/site/apt/core-extensions.apt.vm | 2 +-
.../apt/getting-to-container-configured-mojos.apt | 2 +-
maven-core/src/site/site.xml | 1 +
.../maven/AbstractCoreMavenComponentTestCase.java | 279 +--
.../java/org/apache/maven/DefaultMavenTest.java | 86 +-
.../maven/MavenLifecycleParticipantTest.java | 165 +-
.../src/test/java/org/apache/maven/MavenTest.java | 65 +-
.../maven/ProjectDependenciesResolverTest.java | 79 +-
.../artifact/handler/ArtifactHandlerTest.java | 101 +-
.../filter/ExclusionArtifactFilterTest.java | 135 +-
.../DefaultBeanConfiguratorPathTest.java | 82 +-
.../configuration/DefaultBeanConfiguratorTest.java | 81 +-
.../exception/DefaultExceptionHandlerTest.java | 51 +-
.../DefaultBuildResumptionAnalyzerTest.java | 140 +-
.../DefaultBuildResumptionDataRepositoryTest.java | 71 +-
.../DefaultMavenExecutionRequestPopulatorTest.java | 36 +-
.../maven/execution/DefaultMavenExecutionTest.java | 39 +-
.../scope/internal/MojoExecutionScopeTest.java | 86 +-
.../maven/graph/DefaultGraphBuilderTest.java | 570 ++---
.../graph/DefaultProjectDependencyGraphTest.java | 178 +-
.../apache/maven/graph/ProjectSelectorTest.java | 198 +-
.../maven/internal/MultilineMessageHelperTest.java | 67 +-
.../aether/ConsumerModelSourceTransformerTest.java | 39 +-
.../aether/ReverseTreeRepositoryListenerTest.java | 88 +
.../maven/internal/impl/PropertiesAsMapTest.java | 58 +
.../org/apache/maven/internal/impl/TestApi.java | 84 +-
.../maven/internal/impl/TestArtifactHandler.java | 37 +-
.../maven/internal/impl/TestRepositorySystem.java | 307 ++-
.../maven/lifecycle/DefaultLifecyclesTest.java | 126 +-
.../lifecycle/DelegatingMojoExecutionListener.java | 52 +-
.../DelegatingProjectExecutionListener.java | 60 +-
.../lifecycle/EmptyLifecyclePluginAnalyzer.java | 46 +-
.../lifecycle/LifecycleExecutorSubModulesTest.java | 62 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 719 +++---
.../maven/lifecycle/MavenExecutionPlanTest.java | 64 +-
.../lifecycle/MojoExecutionXPathContainer.java | 47 +-
.../internal/BuildListCalculatorTest.java | 59 +-
.../internal/ConcurrencyDependencyGraphTest.java | 91 +-
.../internal/LifecycleDependencyResolverTest.java | 55 +-
.../LifecycleExecutionPlanCalculatorTest.java | 93 +-
.../internal/LifecycleModuleBuilderTest.java | 86 +-
.../LifecycleTaskSegmentCalculatorImplTest.java | 33 +-
.../lifecycle/internal/PhaseRecorderTest.java | 48 +-
.../lifecycle/internal/ProjectBuildListTest.java | 60 +-
.../internal/builder/BuilderCommonTest.java | 107 +-
.../ConcurrencyDependencyGraphTest.java | 81 +-
.../multithreaded/ThreadOutputMuxerTest.java | 137 +-
.../internal/stub/BuildPluginManagerStub.java | 49 +-
.../internal/stub/CompletionServiceStub.java | 74 +-
.../internal/stub/DefaultLifecyclesStub.java | 85 +-
.../internal/stub/ExecutionEventCatapultStub.java | 18 +-
.../internal/stub/LifeCyclePluginAnalyzerStub.java | 76 +-
.../stub/LifecycleExecutionPlanCalculatorStub.java | 276 ++-
.../stub/LifecycleTaskSegmentCalculatorStub.java | 84 +-
.../lifecycle/internal/stub/MojoExecutorStub.java | 79 +-
.../internal/stub/PluginPrefixResolverStub.java | 46 +-
.../internal/stub/PluginVersionResolverStub.java | 43 +-
.../stub/ProjectDependenciesResolverStub.java | 103 +-
.../internal/stub/ProjectDependencyGraphStub.java | 199 +-
.../stub/ProjectDependencyGraphStubTest.java | 65 +-
.../lifecycle/mapping/LifecyclePhaseTest.java | 80 +-
.../org/apache/maven/plugin/PluginManagerTest.java | 215 +-
.../maven/plugin/PluginParameterExceptionTest.java | 187 +-
.../PluginParameterExpressionEvaluatorTest.java | 357 ++-
.../plugin/internal/DefaultLegacySupportTest.java | 15 +-
.../MavenPluginJavaPrerequisiteCheckerTest.java | 36 +-
.../plugin/internal/MavenPluginValidatorTest.java | 106 +-
.../project/AbstractMavenProjectTestCase.java | 144 +-
.../project/DefaultMavenProjectBuilderTest.java | 440 ++--
.../maven/project/EmptyLifecycleExecutor.java | 67 +-
.../maven/project/EmptyProjectBuildingHelper.java | 34 +-
.../project/ExtensionDescriptorBuilderTest.java | 53 +-
.../project/LegacyLocalRepositoryManager.java | 137 +-
.../org/apache/maven/project/MavenProjectTest.java | 198 +-
.../apache/maven/project/PomConstructionTest.java | 2321 +++++++++-----------
.../apache/maven/project/ProjectBuilderTest.java | 369 ++--
.../ProjectBuildingResultWithLocationMatcher.java | 58 +-
...ectBuildingResultWithProblemMessageMatcher.java | 52 +-
.../maven/project/ProjectModelResolverTest.java | 201 +-
.../apache/maven/project/ProjectSorterTest.java | 355 ++-
.../apache/maven/project/TestMetadataSource.java | 42 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 48 +-
.../artifact/DefaultProjectArtifactsCacheTest.java | 54 +-
.../project/artifact/MavenMetadataSourceTest.java | 23 +-
.../canonical/CanonicalProjectBuilderTest.java | 51 +-
.../maven/project/harness/PomTestWrapper.java | 69 +-
.../project/harness/Xpp3DomAttributeIterator.java | 37 +-
.../project/harness/Xpp3DomAttributePointer.java | 47 +-
.../maven/project/harness/Xpp3DomNodeIterator.java | 82 +-
.../maven/project/harness/Xpp3DomNodePointer.java | 88 +-
.../project/harness/Xpp3DomPointerFactory.java | 39 +-
.../maven/repository/TestArtifactHandler.java | 37 +-
.../maven/repository/TestRepositoryConnector.java | 127 +-
.../repository/TestRepositoryConnectorFactory.java | 20 +-
.../maven/repository/TestRepositorySystem.java | 317 ++-
.../internal/DefaultRuntimeInformationTest.java | 41 +-
.../settings/PomConstructionWithSettingsTest.java | 92 +-
.../apache/maven/settings/SettingsUtilsTest.java | 149 +-
.../DefaultToolchainManagerPrivateTest.java | 117 +-
.../toolchain/DefaultToolchainManagerTest.java | 122 +-
.../maven/toolchain/DefaultToolchainTest.java | 140 +-
.../toolchain/RequirementMatcherFactoryTest.java | 46 +-
maven-embedder/pom.xml | 4 +-
.../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 | 265 ++-
.../org/apache/maven/cli/CLIReportingUtils.java | 170 +-
.../java/org/apache/maven/cli/CleanArgument.java | 80 +-
.../main/java/org/apache/maven/cli/CliRequest.java | 49 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 1667 ++++++--------
.../java/org/apache/maven/cli/ResolveFile.java | 28 +-
.../cli/configuration/ConfigurationProcessor.java | 9 +-
.../SettingsXmlConfigurationProcessor.java | 201 +-
.../maven/cli/event/DefaultEventSpyContext.java | 11 +-
.../maven/cli/event/ExecutionEventLogger.java | 471 ++--
.../internal/BootstrapCoreExtensionManager.java | 181 +-
.../cli/internal/ExtensionResolutionException.java | 22 +-
.../maven/cli/logging/BaseSlf4jConfiguration.java | 19 +-
.../maven/cli/logging/Slf4jConfiguration.java | 15 +-
.../cli/logging/Slf4jConfigurationFactory.java | 35 +-
.../org/apache/maven/cli/logging/Slf4jLogger.java | 89 +-
.../maven/cli/logging/Slf4jLoggerManager.java | 47 +-
.../maven/cli/logging/Slf4jStdoutLogger.java | 252 +--
.../cli/logging/impl/Log4j2Configuration.java | 18 +-
.../cli/logging/impl/LogbackConfiguration.java | 18 +-
.../cli/logging/impl/Slf4jSimpleConfiguration.java | 18 +-
.../impl/UnsupportedSlf4jBindingConfiguration.java | 31 +-
.../transfer/AbstractMavenTransferListener.java | 199 +-
.../transfer/BatchModeMavenTransferListener.java | 15 +-
.../cli/transfer/ConsoleMavenTransferListener.java | 126 +-
.../cli/transfer/QuietMavenTransferListener.java | 11 +-
.../cli/transfer/Slf4jMavenTransferListener.java | 67 +-
.../sisu/plexus/PlexusXmlBeanConverter.java | 339 ++-
.../src/main/java/org/slf4j/MavenSlf4jFriend.java | 9 +-
.../org/slf4j/impl/MavenSlf4jSimpleFriend.java | 14 +-
.../maven/cli/CLIManagerDocumentationTest.java | 92 +-
.../apache/maven/cli/CLIReportingUtilsTest.java | 27 +-
.../org/apache/maven/cli/CleanArgumentTest.java | 48 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 553 +++--
.../maven/cli/event/ExecutionEventLoggerTest.java | 309 ++-
.../maven/cli/transfer/FileSizeFormatTest.java | 335 ++-
maven-model-builder/pom.xml | 6 +-
.../java/org/apache/maven/feature/Features.java | 33 +-
.../building/AbstractModelBuildingListener.java | 11 +-
.../building/AbstractModelSourceTransformer.java | 11 +-
.../maven/model/building/ArtifactModelSource.java | 43 +-
.../building/BuildModelSourceTransformer.java | 22 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 60 +-
.../maven/model/building/DefaultModelBuilder.java | 2080 +++++++++---------
.../model/building/DefaultModelBuilderFactory.java | 195 +-
.../model/building/DefaultModelBuildingEvent.java | 20 +-
.../building/DefaultModelBuildingRequest.java | 238 +-
.../model/building/DefaultModelBuildingResult.java | 117 +-
.../maven/model/building/DefaultModelProblem.java | 110 +-
.../building/DefaultModelProblemCollector.java | 130 +-
.../model/building/DefaultModelProcessor.java | 48 +-
.../building/DefaultModelSourceTransformer.java | 12 +-
.../model/building/DefaultTransformerContext.java | 87 +-
.../maven/model/building/FileModelSource.java | 54 +-
.../maven/model/building/FileToRawModelMerger.java | 191 +-
.../model/building/FilterModelBuildingRequest.java | 164 +-
.../apache/maven/model/building/ModelBuilder.java | 15 +-
.../maven/model/building/ModelBuildingEvent.java | 7 +-
.../model/building/ModelBuildingEventCatapult.java | 9 +-
.../model/building/ModelBuildingException.java | 110 +-
.../model/building/ModelBuildingListener.java | 9 +-
.../maven/model/building/ModelBuildingRequest.java | 45 +-
.../maven/model/building/ModelBuildingResult.java | 11 +-
.../apache/maven/model/building/ModelCache.java | 41 +-
.../apache/maven/model/building/ModelCacheTag.java | 57 +-
.../org/apache/maven/model/building/ModelData.java | 44 +-
.../apache/maven/model/building/ModelProblem.java | 17 +-
.../model/building/ModelProblemCollector.java | 9 +-
.../model/building/ModelProblemCollectorExt.java | 7 +-
.../building/ModelProblemCollectorRequest.java | 37 +-
.../maven/model/building/ModelProblemUtils.java | 112 +-
.../maven/model/building/ModelProcessor.java | 10 +-
.../apache/maven/model/building/ModelSource.java | 8 +-
.../apache/maven/model/building/ModelSource2.java | 9 +-
.../model/building/ModelSourceTransformer.java | 10 +-
.../org/apache/maven/model/building/Result.java | 154 +-
.../maven/model/building/StringModelSource.java | 17 +-
.../maven/model/building/TransformerContext.java | 12 +-
.../model/building/TransformerContextBuilder.java | 8 +-
.../maven/model/building/TransformerException.java | 19 +-
.../maven/model/building/UrlModelSource.java | 12 +-
.../DefaultDependencyManagementImporter.java | 48 +-
.../composition/DependencyManagementImporter.java | 14 +-
.../inheritance/DefaultInheritanceAssembler.java | 321 ++-
.../model/inheritance/InheritanceAssembler.java | 11 +-
.../AbstractStringBasedModelInterpolator.java | 162 +-
.../interpolation/BuildTimestampValueSource.java | 28 +-
.../DefaultModelVersionProcessor.java | 42 +-
.../model/interpolation/MavenBuildTimestamp.java | 56 +-
.../model/interpolation/ModelInterpolator.java | 23 +-
.../model/interpolation/ModelVersionProcessor.java | 13 +-
.../PathTranslatingPostProcessor.java | 39 +-
.../StringVisitorModelInterpolator.java | 92 +-
.../interpolation/UrlNormalizingPostProcessor.java | 34 +-
.../apache/maven/model/io/DefaultModelReader.java | 152 +-
.../apache/maven/model/io/DefaultModelWriter.java | 71 +-
.../apache/maven/model/io/ModelParseException.java | 26 +-
.../org/apache/maven/model/io/ModelReader.java | 21 +-
.../org/apache/maven/model/io/ModelWriter.java | 25 +-
.../maven/model/locator/DefaultModelLocator.java | 17 +-
.../apache/maven/model/locator/ModelLocator.java | 9 +-
.../DefaultDependencyManagementInjector.java | 99 +-
.../DefaultPluginManagementInjector.java | 107 +-
.../management/DependencyManagementInjector.java | 9 +-
.../model/management/PluginManagementInjector.java | 9 +-
.../apache/maven/model/merge/MavenModelMerger.java | 670 +++---
.../normalization/DefaultModelNormalizer.java | 118 +-
.../maven/model/normalization/ModelNormalizer.java | 11 +-
.../model/path/DefaultModelPathTranslator.java | 111 +-
.../model/path/DefaultModelUrlNormalizer.java | 45 +-
.../maven/model/path/DefaultPathTranslator.java | 37 +-
.../maven/model/path/DefaultUrlNormalizer.java | 46 +-
.../maven/model/path/ModelPathTranslator.java | 11 +-
.../maven/model/path/ModelUrlNormalizer.java | 11 +-
.../apache/maven/model/path/PathTranslator.java | 11 +-
.../ProfileActivationFilePathInterpolator.java | 56 +-
.../org/apache/maven/model/path/UrlNormalizer.java | 11 +-
.../plugin/DefaultPluginConfigurationExpander.java | 43 +-
.../plugin/DefaultReportConfigurationExpander.java | 29 +-
.../model/plugin/DefaultReportingConverter.java | 274 ---
.../model/plugin/LifecycleBindingsInjector.java | 9 +-
.../model/plugin/PluginConfigurationExpander.java | 9 +-
.../model/plugin/ReportConfigurationExpander.java | 9 +-
.../maven/model/plugin/ReportingConverter.java | 44 -
.../profile/DefaultProfileActivationContext.java | 151 +-
.../model/profile/DefaultProfileInjector.java | 234 +-
.../model/profile/DefaultProfileSelector.java | 121 +-
.../model/profile/ProfileActivationContext.java | 13 +-
.../maven/model/profile/ProfileInjector.java | 9 +-
.../maven/model/profile/ProfileSelector.java | 11 +-
.../profile/activation/FileProfileActivator.java | 72 +-
.../activation/JdkVersionProfileActivator.java | 172 +-
.../OperatingSystemProfileActivator.java | 90 +-
.../model/profile/activation/ProfileActivator.java | 11 +-
.../activation/PropertyProfileActivator.java | 64 +-
.../resolution/InvalidRepositoryException.java | 21 +-
.../maven/model/resolution/ModelResolver.java | 61 +-
.../resolution/UnresolvableModelException.java | 46 +-
.../model/resolution/WorkspaceModelResolver.java | 19 +-
.../model/superpom/DefaultSuperPomProvider.java | 61 +-
.../maven/model/superpom/SuperPomProvider.java | 9 +-
.../model/validation/DefaultModelValidator.java | 1930 +++++++++-------
.../maven/model/validation/ModelValidator.java | 16 +-
maven-model-builder/src/site/apt/index.apt | 8 +-
.../model/building/ComplexActivationTest.java | 40 +-
.../building/DefaultModelBuilderFactoryTest.java | 87 +-
.../model/building/DefaultModelBuilderTest.java | 169 +-
.../maven/model/building/FileModelSourceTest.java | 45 +-
.../model/building/FileToRawModelMergerTest.java | 64 +-
.../model/building/SimpleProblemCollector.java | 41 +-
.../DefaultInheritanceAssemblerTest.java | 171 +-
.../AbstractModelInterpolatorTest.java | 412 ++--
.../interpolation/MavenBuildTimestampTest.java | 18 +-
.../StringVisitorModelInterpolatorTest.java | 13 +-
.../maven/model/merge/MavenModelMergerTest.java | 96 +-
.../maven/model/path/DefaultUrlNormalizerTest.java | 65 +-
.../activation/AbstractProfileActivatorTest.java | 24 +-
.../activation/FileProfileActivatorTest.java | 99 +-
.../activation/JdkVersionProfileActivatorTest.java | 213 +-
.../activation/PropertyProfileActivatorTest.java | 149 +-
.../validation/DefaultModelValidatorTest.java | 930 ++++----
maven-model-transform/pom.xml | 6 +-
.../transform/BuildToRawPomXMLFilterFactory.java | 56 +-
.../maven/model/transform/CiFriendlyXMLFilter.java | 46 +-
.../maven/model/transform/FastForwardFilter.java | 57 +-
.../maven/model/transform/ModulesXMLFilter.java | 16 +-
.../maven/model/transform/ParentXMLFilter.java | 124 +-
.../RawToConsumerPomXMLFilterFactory.java | 21 +-
.../transform/ReactorDependencyXMLFilter.java | 78 +-
.../model/transform/RelativePathXMLFilter.java | 39 +-
.../maven/model/transform/RelativeProject.java | 18 +-
.../model/transform/pull/BufferingParser.java | 409 ++--
.../model/transform/pull/NodeBufferingParser.java | 40 +-
.../maven/model/transform/pull/XmlUtils.java | 96 +-
.../model/transform/AbstractXMLFilterTests.java | 28 +-
.../model/transform/CiFriendlyXMLFilterTest.java | 33 +-
.../model/transform/ConsumerPomXMLFilterTest.java | 336 ++-
.../model/transform/ModulesXMLFilterTest.java | 89 +-
.../maven/model/transform/ParentXMLFilterTest.java | 387 ++--
.../transform/ReactorDependencyXMLFilterTest.java | 159 +-
.../model/transform/RelativePathXMLFilterTest.java | 151 +-
maven-model/pom.xml | 62 +-
.../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 | 284 ++-
.../maven/model/io/xpp3/MavenXpp3Reader.java | 85 +-
.../maven/model/io/xpp3/MavenXpp3ReaderEx.java | 85 +-
.../maven/model/io/xpp3/MavenXpp3Writer.java | 48 +-
.../maven/model/io/xpp3/MavenXpp3WriterEx.java | 69 +-
.../apache/maven/model/io/xpp3/package-info.java | 19 -
.../org/apache/maven/model/merge/package-info.java | 19 -
maven-model/src/main/mdo/reader-ex.vm | 5 +-
maven-model/src/main/mdo/reader.vm | 5 +-
maven-model/src/main/mdo/transformer.vm | 5 +-
.../org/apache/maven/model/ActivationFileTest.java | 27 +-
.../org/apache/maven/model/ActivationOSTest.java | 27 +-
.../apache/maven/model/ActivationPropertyTest.java | 27 +-
.../org/apache/maven/model/ActivationTest.java | 27 +-
.../java/org/apache/maven/model/BuildTest.java | 33 +-
.../org/apache/maven/model/CiManagementTest.java | 27 +-
.../org/apache/maven/model/ContributorTest.java | 27 +-
.../maven/model/DependencyManagementTest.java | 27 +-
.../org/apache/maven/model/DependencyTest.java | 27 +-
.../maven/model/DeploymentRepositoryTest.java | 27 +-
.../java/org/apache/maven/model/DeveloperTest.java | 36 +-
.../maven/model/DistributionManagementTest.java | 27 +-
.../java/org/apache/maven/model/ExclusionTest.java | 27 +-
.../java/org/apache/maven/model/ExtensionTest.java | 27 +-
.../apache/maven/model/IssueManagementTest.java | 35 +-
.../java/org/apache/maven/model/LicenseTest.java | 35 +-
.../org/apache/maven/model/MailingListTest.java | 35 +-
.../java/org/apache/maven/model/ModelTest.java | 27 +-
.../java/org/apache/maven/model/NotifierTest.java | 27 +-
.../org/apache/maven/model/OrganizationTest.java | 54 +-
.../java/org/apache/maven/model/ParentTest.java | 27 +-
.../maven/model/PluginConfigurationTest.java | 27 +-
.../apache/maven/model/PluginContainerTest.java | 27 +-
.../apache/maven/model/PluginExecutionTest.java | 27 +-
.../apache/maven/model/PluginManagementTest.java | 27 +-
.../java/org/apache/maven/model/PluginTest.java | 27 +-
.../org/apache/maven/model/PrerequisitesTest.java | 27 +-
.../java/org/apache/maven/model/ProfileTest.java | 27 +-
.../org/apache/maven/model/RelocationTest.java | 27 +-
.../org/apache/maven/model/ReportPluginTest.java | 27 +-
.../java/org/apache/maven/model/ReportSetTest.java | 27 +-
.../java/org/apache/maven/model/ReportingTest.java | 27 +-
.../apache/maven/model/RepositoryPolicyTest.java | 27 +-
.../org/apache/maven/model/RepositoryTest.java | 27 +-
.../java/org/apache/maven/model/ResourceTest.java | 27 +-
.../test/java/org/apache/maven/model/ScmTest.java | 35 +-
.../org/apache/maven/model/SerializationTest.java | 28 +-
.../test/java/org/apache/maven/model/SiteTest.java | 27 +-
.../apache/maven/model/merge/MavenMergerTest.java | 56 +-
.../org/apache/maven/model/v4/ModelXmlTest.java | 44 +-
maven-plugin-api/pom.xml | 16 +-
.../java/org/apache/maven/plugin/AbstractMojo.java | 24 +-
.../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 | 49 +-
.../DuplicateMojoDescriptorException.java | 21 +-
.../descriptor/DuplicateParameterException.java | 15 +-
.../descriptor/InvalidParameterException.java | 21 +-
.../InvalidPluginDescriptorException.java | 20 +-
.../maven/plugin/descriptor/MojoDescriptor.java | 252 +--
.../apache/maven/plugin/descriptor/Parameter.java | 105 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 296 +--
.../plugin/descriptor/PluginDescriptorBuilder.java | 369 ++--
.../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 +-
maven-plugin-api/src/main/mdo/plugin.mdo | 179 +-
.../plugin/descriptor/MojoDescriptorTest.java | 43 +-
.../descriptor/PluginDescriptorBuilderTest.java | 179 +-
maven-repository-metadata/pom.xml | 4 +-
.../artifact/repository/metadata/MetadataTest.java | 298 ++-
maven-resolver-provider/pom.xml | 5 +-
.../internal/ArtifactDescriptorReaderDelegate.java | 119 +-
.../internal/ArtifactDescriptorUtils.java | 49 +-
.../internal/DefaultArtifactDescriptorReader.java | 303 ++-
.../repository/internal/DefaultModelCache.java | 146 +-
.../internal/DefaultModelCacheFactory.java | 12 +-
.../repository/internal/DefaultModelResolver.java | 256 +--
.../internal/DefaultVersionRangeResolver.java | 271 ++-
.../internal/DefaultVersionResolver.java | 516 ++---
.../internal/DefaultVersionSchemeProvider.java | 19 +-
.../repository/internal/LocalSnapshotMetadata.java | 107 +-
.../internal/LocalSnapshotMetadataGenerator.java | 43 +-
.../maven/repository/internal/MavenMetadata.java | 94 +-
.../internal/MavenRepositorySystemUtils.java | 81 +-
.../repository/internal/MavenResolverModule.java | 58 +-
.../repository/internal/MavenSnapshotMetadata.java | 52 +-
.../repository/internal/MavenWorkspaceReader.java | 12 +-
.../repository/internal/ModelCacheFactory.java | 9 +-
.../maven/repository/internal/PluginsMetadata.java | 63 +-
.../internal/PluginsMetadataGenerator.java | 107 +-
.../internal/PluginsMetadataGeneratorFactory.java | 24 +-
.../repository/internal/RelocatedArtifact.java | 105 +-
.../internal/RemoteSnapshotMetadata.java | 103 +-
.../internal/RemoteSnapshotMetadataGenerator.java | 63 +-
.../internal/SnapshotMetadataGeneratorFactory.java | 24 +-
.../repository/internal/VersionsMetadata.java | 87 +-
.../internal/VersionsMetadataGenerator.java | 57 +-
.../internal/VersionsMetadataGeneratorFactory.java | 24 +-
.../maven/repository/internal/package-info.java | 19 -
.../internal/AbstractRepositoryTestCase.java | 38 +-
.../DefaultArtifactDescriptorReaderTest.java | 47 +-
.../internal/DefaultModelResolverTest.java | 193 +-
.../internal/DefaultVersionResolverTest.java | 57 +-
.../internal/MavenRepositorySystemUtilsTest.java | 12 +-
.../internal/RemoteSnapshotMetadataTest.java | 42 +-
.../repository/internal/RepositorySystemTest.java | 224 +-
.../internal/util/ConsoleRepositoryListener.java | 109 +-
.../internal/util/ConsoleTransferListener.java | 153 +-
maven-settings-builder/pom.xml | 4 +-
.../settings/building/DefaultSettingsBuilder.java | 235 +-
.../building/DefaultSettingsBuilderFactory.java | 23 +-
.../building/DefaultSettingsBuildingRequest.java | 72 +-
.../building/DefaultSettingsBuildingResult.java | 19 +-
.../settings/building/DefaultSettingsProblem.java | 98 +-
.../building/DefaultSettingsProblemCollector.java | 29 +-
.../settings/building/FileSettingsSource.java | 15 +-
.../maven/settings/building/SettingsBuilder.java | 10 +-
.../building/SettingsBuildingException.java | 52 +-
.../settings/building/SettingsBuildingRequest.java | 19 +-
.../settings/building/SettingsBuildingResult.java | 7 +-
.../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 | 16 +-
.../settings/crypto/DefaultSettingsDecrypter.java | 92 +-
.../crypto/DefaultSettingsDecryptionRequest.java | 46 +-
.../crypto/DefaultSettingsDecryptionResult.java | 36 +-
.../crypto/MavenSecDispatcherProvider.java | 27 +-
.../maven/settings/crypto/SettingsDecrypter.java | 9 +-
.../settings/crypto/SettingsDecryptionRequest.java | 11 +-
.../settings/crypto/SettingsDecryptionResult.java | 7 +-
.../maven/settings/io/DefaultSettingsReader.java | 63 +-
.../maven/settings/io/DefaultSettingsWriter.java | 53 +-
.../maven/settings/io/SettingsParseException.java | 26 +-
.../apache/maven/settings/io/SettingsReader.java | 16 +-
.../apache/maven/settings/io/SettingsWriter.java | 16 +-
.../maven/settings/merge/MavenSettingsMerger.java | 85 +-
.../validation/DefaultSettingsValidator.java | 276 +--
.../settings/validation/SettingsValidator.java | 11 +-
.../DefaultSettingsBuilderFactoryTest.java | 28 +-
.../validation/DefaultSettingsValidatorTest.java | 254 +--
maven-settings/pom.xml | 14 +-
.../org/apache/maven/settings/WrapperList.java | 108 +-
.../apache/maven/settings/WrapperProperties.java | 284 ++-
.../maven/settings/io/xpp3/SettingsXpp3Reader.java | 84 +-
.../maven/settings/io/xpp3/SettingsXpp3Writer.java | 47 +-
maven-slf4j-provider/pom.xml | 12 +-
.../org/slf4j/impl/MavenFailOnSeverityLogger.java | 81 +-
.../java/org/slf4j/impl/MavenLoggerFactory.java | 53 +-
.../java/org/slf4j/impl/MavenSimpleLogger.java | 88 +-
.../java/org/slf4j/impl/StaticLoggerBinder.java | 21 +-
.../org/slf4j/impl/MavenLoggerFactoryTest.java | 70 +-
maven-slf4j-wrapper/pom.xml | 10 +-
.../apache/maven/logwrapper/LogLevelRecorder.java | 47 +-
.../maven/logwrapper/MavenSlf4jWrapperFactory.java | 13 +-
.../maven/logwrapper/LogLevelRecorderTest.java | 46 +-
maven-toolchain-builder/pom.xml | 8 +-
.../building/DefaultToolchainsBuilder.java | 199 +-
.../building/DefaultToolchainsBuildingRequest.java | 20 +-
.../building/DefaultToolchainsBuildingResult.java | 19 +-
.../toolchain/building/ToolchainsBuilder.java | 10 +-
.../building/ToolchainsBuildingException.java | 51 +-
.../building/ToolchainsBuildingRequest.java | 10 +-
.../building/ToolchainsBuildingResult.java | 7 +-
.../toolchain/io/DefaultToolchainsReader.java | 63 +-
.../toolchain/io/DefaultToolchainsWriter.java | 27 +-
.../toolchain/io/ToolchainsParseException.java | 26 +-
.../maven/toolchain/io/ToolchainsReader.java | 16 +-
.../maven/toolchain/io/ToolchainsWriter.java | 15 +-
.../toolchain/merge/MavenToolchainMerger.java | 70 +-
.../building/DefaultToolchainsBuilderTest.java | 366 +--
.../building/ToolchainsBuildingExceptionTest.java | 66 +-
.../toolchain/merge/MavenToolchainMergerTest.java | 162 +-
maven-toolchain-model/pom.xml | 172 +-
.../apache/maven/toolchain/model/WrapperList.java | 108 +-
.../maven/toolchain/model/WrapperProperties.java | 284 ++-
maven-xml-impl/README.md | 23 +
maven-xml-impl/pom.xml | 58 +-
.../org/apache/maven/internal/xml/DomBuilder.java | 66 +-
.../maven/internal/xml/MavenXmlException.java | 30 +-
.../maven/internal/xml/XmlPlexusConfiguration.java | 59 +-
.../org/apache/maven/internal/xml/Xpp3Dom.java | 362 ++-
.../apache/maven/internal/xml/Xpp3DomBuilder.java | 149 +-
.../apache/maven/internal/xml/Xpp3DomWriter.java | 51 +-
.../apache/maven/internal/xml/package-info.java | 5 +
.../java/org/codehaus/plexus/util/xml/Xpp3Dom.java | 283 +--
.../codehaus/plexus/util/xml/Xpp3DomBuilder.java | 73 +-
.../org/codehaus/plexus/util/xml/package-info.java | 10 +
.../org/apache/maven/internal/xml/Xpp3DomTest.java | 189 ++
plexus-utils/README.md | 26 +
plexus-utils/pom.xml | 284 ++-
pom.xml | 268 +--
1316 files changed, 51301 insertions(+), 66586 deletions(-)
copy maven-core/src/test/resources/projects/build.properties => .git-blame-ignore-revs (91%)
rename api/maven-api-core/src/main/java/org/apache/maven/api/services/{ProjectBuilderProblem.java => BuilderProblem.java} (70%)
create mode 100644 api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilder.java
copy api/maven-api-core/src/main/java/org/apache/maven/api/services/{ProjectBuilderSource.java => SettingsBuilderException.java} (72%)
create mode 100644 api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderRequest.java
copy maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java => api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderResult.java (62%)
rename api/maven-api-core/src/main/java/org/apache/maven/api/services/{ProjectBuilderSource.java => Source.java} (96%)
copy {maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building => api/maven-api-core/src/main/java/org/apache/maven/api/services}/ToolchainsBuilder.java (65%)
copy api/maven-api-core/src/main/java/org/apache/maven/api/services/{ProjectBuilderProblemSeverity.java => ToolchainsBuilderException.java} (72%)
create mode 100644 api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderRequest.java
copy maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java => api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderResult.java (58%)
create mode 100644 api/maven-api-core/src/main/java/org/apache/maven/api/services/Transport.java
copy api/maven-api-core/src/main/java/org/apache/maven/api/services/{ArtifactDeployer.java => TransportProvider.java} (50%)
rename api/maven-api-core/src/main/java/org/apache/maven/api/services/{ProjectBuilderProblemSeverity.java => TransportProviderException.java} (80%)
copy maven-core/src/main/java/org/apache/maven/{extension/internal/CoreExportsProvider.java => internal/aether/ResolverLifecycle.java} (56%)
create mode 100644 maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java
create mode 100644 maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java
create mode 100644 maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java
create mode 100644 maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java
create mode 100644 maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java
copy maven-core/src/main/java/org/apache/maven/plugin/{MojoExecutionRunner.java => MavenPluginPrerequisitesChecker.java} (66%)
create mode 100644 maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteChecker.java
create mode 100644 maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginMavenPrerequisiteChecker.java
create mode 100644 maven-core/src/main/java/org/apache/maven/settings/SettingsUtilsV4.java
create mode 100644 maven-core/src/test/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListenerTest.java
create mode 100644 maven-core/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java
copy maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionSchemeProvider.java => maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteCheckerTest.java (55%)
delete mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
delete mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java
create mode 100644 maven-xml-impl/README.md
create mode 100644 maven-xml-impl/src/main/java/org/apache/maven/internal/xml/package-info.java
create mode 100644 maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/package-info.java
create mode 100644 maven-xml-impl/src/test/java/org/apache/maven/internal/xml/Xpp3DomTest.java
create mode 100644 plexus-utils/README.md
[maven] 01/01: [MNG-7571] add Maven API javadoc
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-7571
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8eb7a994da05a696cda2d7baac0a0621f62c5ed7
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Mon Oct 17 08:07:17 2022 +0200
[MNG-7571] add Maven API javadoc
---
api/maven-api-core/pom.xml | 3 +-
api/maven-api-core/src/site/site.xml | 38 ++++++++++++++++++++++
api/maven-api-meta/pom.xml | 1 +
api/maven-api-meta/src/site/site.xml | 38 ++++++++++++++++++++++
api/maven-api-model/pom.xml | 4 +--
.../org/apache/maven/api/model/package-info.java | 2 +-
api/maven-api-model/src/main/mdo/common.vm | 2 +-
api/maven-api-model/src/main/site/site.xml | 38 ++++++++++++++++++++++
api/maven-api-settings/pom.xml | 4 +--
api/maven-api-toolchain/src/site/site.xml | 38 ++++++++++++++++++++++
api/maven-api-xml/pom.xml | 3 +-
api/maven-api-xml/src/site/site.xml | 38 ++++++++++++++++++++++
api/modello-plugin-velocity/src/site/site.xml | 38 ++++++++++++++++++++++
api/pom.xml | 35 +++++++++++++++++++-
api/src/site/site.xml | 38 ++++++++++++++++++++++
15 files changed, 311 insertions(+), 9 deletions(-)
diff --git a/api/maven-api-core/pom.xml b/api/maven-api-core/pom.xml
index 8920507f5..3895448fb 100644
--- a/api/maven-api-core/pom.xml
+++ b/api/maven-api-core/pom.xml
@@ -27,7 +27,8 @@
</parent>
<artifactId>maven-api-core</artifactId>
- <name>Apache Maven Core API</name>
+ <name>Maven 4 API - Core</name>
+ <description>Maven 4 API - Maven Core APIs.</description>
<dependencies>
<dependency>
diff --git a/api/maven-api-core/src/site/site.xml b/api/maven-api-core/src/site/site.xml
new file mode 100644
index 000000000..e475330c4
--- /dev/null
+++ b/api/maven-api-core/src/site/site.xml
@@ -0,0 +1,38 @@
+<?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
+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.
+-->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="JavaDocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ </body>
+</project>
\ No newline at end of file
diff --git a/api/maven-api-meta/pom.xml b/api/maven-api-meta/pom.xml
index 65d31dc6b..b524ebd9e 100644
--- a/api/maven-api-meta/pom.xml
+++ b/api/maven-api-meta/pom.xml
@@ -28,5 +28,6 @@
<artifactId>maven-api-meta</artifactId>
<name>Maven API Meta annotations</name>
+ <description>Java 5 annotations for Maven 4 Immutable API.</description>
</project>
diff --git a/api/maven-api-meta/src/site/site.xml b/api/maven-api-meta/src/site/site.xml
new file mode 100644
index 000000000..e475330c4
--- /dev/null
+++ b/api/maven-api-meta/src/site/site.xml
@@ -0,0 +1,38 @@
+<?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
+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.
+-->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="JavaDocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ </body>
+</project>
\ No newline at end of file
diff --git a/api/maven-api-model/pom.xml b/api/maven-api-model/pom.xml
index 34add9629..e50497794 100644
--- a/api/maven-api-model/pom.xml
+++ b/api/maven-api-model/pom.xml
@@ -28,8 +28,8 @@ under the License.
<artifactId>maven-api-model</artifactId>
- <name>Maven API Model</name>
- <description>Maven API Model for Maven POM (Project Object Model)</description>
+ <name>Maven 4 API - Model</name>
+ <description>Maven 4 API - immutable Model for Maven POM (Project Object Model)</description>
<dependencies>
<dependency>
diff --git a/api/maven-api-model/src/main/java/org/apache/maven/api/model/package-info.java b/api/maven-api-model/src/main/java/org/apache/maven/api/model/package-info.java
index 854562874..3c1c61e21 100644
--- a/api/maven-api-model/src/main/java/org/apache/maven/api/model/package-info.java
+++ b/api/maven-api-model/src/main/java/org/apache/maven/api/model/package-info.java
@@ -1,6 +1,6 @@
// CHECKSTYLE_OFF: RegexpHeader
/**
- * Maven POM (Project Object Model) classes, generated from <code>maven.mdo</code> model.
+ * Maven Immutable POM (Project Object Model) classes, generated from <code>maven.mdo</code> model.
* The root class is {@link org.apache.maven.api.model.Model}.
*/
package org.apache.maven.api.model;
diff --git a/api/maven-api-model/src/main/mdo/common.vm b/api/maven-api-model/src/main/mdo/common.vm
index 3c3f29cf7..e300b2289 100644
--- a/api/maven-api-model/src/main/mdo/common.vm
+++ b/api/maven-api-model/src/main/mdo/common.vm
@@ -20,7 +20,7 @@
##
## The following loop code is required in order to change the type of the
## pomFile attribute to a java.nio.file.Path. Modello does not support this
-## type and loading a model with such a type would fail the modello validation.
+## type and loading a model with such a type would fail the Modello validation.
##
#foreach ( $field in $model.getClass("Model", $version).allFields )
#if ( $field.name == "pomFile" )
diff --git a/api/maven-api-model/src/main/site/site.xml b/api/maven-api-model/src/main/site/site.xml
new file mode 100644
index 000000000..e475330c4
--- /dev/null
+++ b/api/maven-api-model/src/main/site/site.xml
@@ -0,0 +1,38 @@
+<?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
+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.
+-->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="JavaDocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ </body>
+</project>
\ No newline at end of file
diff --git a/api/maven-api-settings/pom.xml b/api/maven-api-settings/pom.xml
index 5f1b0f02e..511946b41 100644
--- a/api/maven-api-settings/pom.xml
+++ b/api/maven-api-settings/pom.xml
@@ -28,8 +28,8 @@ under the License.
<artifactId>maven-api-settings</artifactId>
- <name>Maven API Settings</name>
- <description>Maven API Settings model.</description>
+ <name>Maven API - Settings</name>
+ <description>Maven 4 API - immutable Settings model</description>
<dependencies>
<dependency>
diff --git a/api/maven-api-toolchain/src/site/site.xml b/api/maven-api-toolchain/src/site/site.xml
new file mode 100644
index 000000000..e475330c4
--- /dev/null
+++ b/api/maven-api-toolchain/src/site/site.xml
@@ -0,0 +1,38 @@
+<?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
+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.
+-->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="JavaDocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ </body>
+</project>
\ No newline at end of file
diff --git a/api/maven-api-xml/pom.xml b/api/maven-api-xml/pom.xml
index 3a8d0e6ad..01950a479 100644
--- a/api/maven-api-xml/pom.xml
+++ b/api/maven-api-xml/pom.xml
@@ -27,7 +27,8 @@
</parent>
<artifactId>maven-api-xml</artifactId>
- <name>Maven API XML</name>
+ <name>Maven 4 API - XML</name>
+ <description>Maven 4 API - Immutable XML helper.</description>
<dependencies>
<dependency>
diff --git a/api/maven-api-xml/src/site/site.xml b/api/maven-api-xml/src/site/site.xml
new file mode 100644
index 000000000..e475330c4
--- /dev/null
+++ b/api/maven-api-xml/src/site/site.xml
@@ -0,0 +1,38 @@
+<?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
+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.
+-->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="JavaDocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ </body>
+</project>
\ No newline at end of file
diff --git a/api/modello-plugin-velocity/src/site/site.xml b/api/modello-plugin-velocity/src/site/site.xml
new file mode 100644
index 000000000..e475330c4
--- /dev/null
+++ b/api/modello-plugin-velocity/src/site/site.xml
@@ -0,0 +1,38 @@
+<?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
+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.
+-->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="JavaDocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ </body>
+</project>
\ No newline at end of file
diff --git a/api/pom.xml b/api/pom.xml
index 3de8ccbc9..ad018b3c7 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -27,8 +27,9 @@
</parent>
<artifactId>maven-api</artifactId>
+ <name>Maven 4 API</name>
<packaging>pom</packaging>
- <name>Maven API</name>
+ <description>A new immutable API for Maven 4 to better manage what plugins and extensions can influence.</description>
<modules>
<module>modello-plugin-velocity</module>
@@ -40,4 +41,36 @@
<module>maven-api-core</module>
</modules>
+ <profiles>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <tags>
+ <tag>
+ <name>provisional</name>
+ <placement>tf</placement>
+ <head>Provisional:</head>
+ </tag>
+ </tags>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <inherited>false</inherited>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
+
</project>
diff --git a/api/src/site/site.xml b/api/src/site/site.xml
new file mode 100644
index 000000000..e475330c4
--- /dev/null
+++ b/api/src/site/site.xml
@@ -0,0 +1,38 @@
+<?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
+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.
+-->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+
+ <edit>${project.scm.url}</edit>
+
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="JavaDocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+
+ <menu ref="parent"/>
+ <menu ref="reports"/>
+ </body>
+</project>
\ No newline at end of file