You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/12/02 13:09:32 UTC

[maven] branch MNG-7612-3.9 updated (3bda1cff3 -> b33d26fa2)

This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a change to branch MNG-7612-3.9
in repository https://gitbox.apache.org/repos/asf/maven.git


 discard 3bda1cff3 [MNG-7612] Chained LRM
     add abc55589d [MNG-7613] Upgrade Apache Maven parent POM to version 38
     add 693814f0a [MNG-7613] Parent POM 38 - code reformat
     add 9127a0191 [MNG-7613] Parent POM 38 - add .git-blame-ignore-revs
     add b33d26fa2 [MNG-7612] Chained LRM

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   (3bda1cff3)
            \
             N -- N -- N   refs/heads/MNG-7612-3.9 (b33d26fa2)

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.

No new revisions were added by this update.

Summary of changes:
 .../build.properties => .git-blame-ignore-revs     |    6 +-
 apache-maven/pom.xml                               |   58 +-
 .../apache/maven/settings/GlobalSettingsTest.java  |   28 +-
 maven-artifact/pom.xml                             |    2 -
 .../java/org/apache/maven/artifact/Artifact.java   |   61 +-
 .../org/apache/maven/artifact/ArtifactUtils.java   |  182 +-
 .../org/apache/maven/artifact/DefaultArtifact.java |  451 ++-
 .../maven/artifact/InvalidArtifactRTException.java |   49 +-
 .../maven/artifact/handler/ArtifactHandler.java    |   12 +-
 .../maven/artifact/metadata/ArtifactMetadata.java  |   11 +-
 .../artifact/repository/ArtifactRepository.java    |   40 +-
 .../repository/ArtifactRepositoryPolicy.java       |  161 +-
 .../maven/artifact/repository/Authentication.java  |   34 +-
 .../layout/ArtifactRepositoryLayout.java           |   14 +-
 .../layout/ArtifactRepositoryLayout2.java          |   13 +-
 .../metadata/RepositoryMetadataStoreException.java |   20 +-
 .../AbstractArtifactResolutionException.java       |  384 ++-
 .../resolver/ArtifactNotFoundException.java        |  116 +-
 .../resolver/ArtifactResolutionException.java      |   64 +-
 .../resolver/CyclicDependencyException.java        |   18 +-
 .../MultipleArtifactsNotFoundException.java        |   85 +-
 .../artifact/resolver/filter/ArtifactFilter.java   |   10 +-
 .../maven/artifact/versioning/ArtifactVersion.java |   11 +-
 .../artifact/versioning/ComparableVersion.java     |  525 ++--
 .../versioning/DefaultArtifactVersion.java         |  178 +-
 .../InvalidVersionSpecificationException.java      |   14 +-
 .../OverConstrainedVersionException.java           |   24 +-
 .../maven/artifact/versioning/Restriction.java     |  124 +-
 .../maven/artifact/versioning/VersionRange.java    |  446 +--
 .../java/org/apache/maven/repository/Proxy.java    |   54 +-
 .../legacy/metadata/ArtifactMetadata.java          |   17 +-
 .../apache/maven/artifact/ArtifactUtilsTest.java   |   65 +-
 .../apache/maven/artifact/DefaultArtifactTest.java |  131 +-
 .../artifact/handler/ArtifactHandlerMock.java      |   53 +-
 .../artifact/versioning/ComparableVersionIT.java   |   65 +-
 .../artifact/versioning/ComparableVersionTest.java |  349 ++-
 .../versioning/DefaultArtifactVersionTest.java     |  303 +-
 .../artifact/versioning/VersionRangeTest.java      | 1316 ++++----
 maven-builder-support/pom.xml                      |    2 -
 .../org/apache/maven/building/DefaultProblem.java  |   91 +-
 .../maven/building/DefaultProblemCollector.java    |   26 +-
 .../java/org/apache/maven/building/FileSource.java |   27 +-
 .../java/org/apache/maven/building/Problem.java    |   12 +-
 .../apache/maven/building/ProblemCollector.java    |   19 +-
 .../maven/building/ProblemCollectorFactory.java    |   18 +-
 .../java/org/apache/maven/building/Source.java     |   10 +-
 .../org/apache/maven/building/StringSource.java    |   35 +-
 .../java/org/apache/maven/building/UrlSource.java  |   26 +-
 .../building/DefaultProblemCollectorTest.java      |   70 +-
 .../apache/maven/building/DefaultProblemTest.java  |  159 +-
 .../org/apache/maven/building/FileSourceTest.java  |   63 +-
 .../building/ProblemCollectorFactoryTest.java      |   27 +-
 .../apache/maven/building/StringSourceTest.java    |   47 +-
 .../org/apache/maven/building/UrlSourceTest.java   |   55 +-
 maven-compat/pom.xml                               |    2 -
 .../apache/maven/artifact/ArtifactScopeEnum.java   |   82 +-
 .../org/apache/maven/artifact/ArtifactStatus.java  |   56 +-
 .../artifact/UnknownRepositoryLayoutException.java |   23 +-
 .../maven/artifact/deployer/ArtifactDeployer.java  |   25 +-
 .../deployer/ArtifactDeploymentException.java      |   25 +-
 .../artifact/deployer/DefaultArtifactDeployer.java |  120 +-
 .../installer/ArtifactInstallationException.java   |   25 +-
 .../artifact/installer/ArtifactInstaller.java      |   17 +-
 .../installer/DefaultArtifactInstaller.java        |   89 +-
 .../artifact/manager/DefaultWagonManager.java      |  108 +-
 .../manager/WagonConfigurationException.java       |   17 +-
 .../maven/artifact/manager/WagonManager.java       |   25 +-
 .../repository/ArtifactRepositoryFactory.java      |   53 +-
 .../repository/DefaultArtifactRepository.java      |  172 +-
 .../DefaultArtifactRepositoryFactory.java          |   98 +-
 .../repository/layout/FlatRepositoryLayout.java    |   53 +-
 .../metadata/DefaultRepositoryMetadataManager.java |  546 ++--
 .../metadata/GroupRepositoryMetadata.java          |   73 +-
 .../repository/metadata/MetadataBridge.java        |  104 +-
 .../repository/metadata/MetadataUtils.java         |   13 +-
 .../metadata/RepositoryMetadataReadException.java  |   20 +-
 .../SnapshotArtifactRepositoryMetadata.java        |   52 +-
 .../maven/artifact/resolver/ArtifactCollector.java |   25 +-
 .../maven/artifact/resolver/ArtifactResolver.java  |  107 +-
 .../artifact/resolver/DebugResolutionListener.java |  116 +-
 .../resolver/DefaultArtifactCollector.java         |   14 +-
 .../artifact/resolver/DefaultArtifactResolver.java |  651 ++--
 .../resolver/ResolutionListenerForDepMgmt.java     |   17 +-
 .../artifact/resolver/UnresolvedArtifacts.java     |   24 +-
 .../resolver/WarningResolutionListener.java        |   62 +-
 .../resolver/filter/InversionArtifactFilter.java   |   32 +-
 .../artifact/resolver/filter/OrArtifactFilter.java |   45 +-
 .../resolver/filter/TypeArtifactFilter.java        |   32 +-
 .../artifact/versioning/ManagedVersionMap.java     |   33 +-
 .../maven/execution/DefaultRuntimeInformation.java |   26 +-
 .../apache/maven/execution/RuntimeInformation.java |    8 +-
 .../profiles/DefaultMavenProfilesBuilder.java      |   64 +-
 .../maven/profiles/DefaultProfileManager.java      |  192 +-
 .../maven/profiles/MavenProfilesBuilder.java       |   14 +-
 .../org/apache/maven/profiles/ProfileManager.java  |   29 +-
 .../maven/profiles/ProfilesConversionUtils.java    |  112 +-
 .../activation/DetectedProfileActivator.java       |   17 +-
 .../profiles/activation/FileProfileActivator.java  |   69 +-
 .../activation/JdkPrefixProfileActivator.java      |   68 +-
 .../OperatingSystemProfileActivator.java           |  109 +-
 .../activation/ProfileActivationException.java     |   20 +-
 .../profiles/activation/ProfileActivator.java      |   14 +-
 .../activation/SystemPropertyProfileActivator.java |   70 +-
 .../maven/project/DefaultMavenProjectBuilder.java  |  291 +-
 .../DefaultProjectBuilderConfiguration.java        |   48 +-
 .../project/InvalidProjectModelException.java      |   38 +-
 .../apache/maven/project/MavenProjectBuilder.java  |   63 +-
 .../project/MissingRepositoryElementException.java |   21 +-
 .../java/org/apache/maven/project/ModelUtils.java  |  240 +-
 .../maven/project/ProjectBuilderConfiguration.java |   20 +-
 .../org/apache/maven/project/ProjectUtils.java     |   83 +-
 .../DefaultModelInheritanceAssembler.java          |  562 ++--
 .../inheritance/ModelInheritanceAssembler.java     |   16 +-
 .../AbstractStringBasedModelInterpolator.java      |  350 +--
 .../interpolation/BuildTimestampValueSource.java   |   27 +-
 .../interpolation/ModelInterpolationException.java |   38 +-
 .../project/interpolation/ModelInterpolator.java   |   35 +-
 .../PathTranslatingPostProcessor.java              |   34 +-
 .../interpolation/RegexBasedModelInterpolator.java |   29 +-
 .../StringSearchModelInterpolator.java             |  406 +--
 .../maven/project/path/DefaultPathTranslator.java  |  185 +-
 .../project/validation/DefaultModelValidator.java  |   35 +-
 .../project/validation/ModelValidationResult.java  |   70 +-
 .../maven/project/validation/ModelValidator.java   |   11 +-
 .../maven/reporting/MavenReportException.java      |   18 +-
 .../maven/repository/DefaultMirrorSelector.java    |  139 +-
 .../maven/repository/MavenArtifactMetadata.java    |   56 +-
 .../org/apache/maven/repository/MetadataGraph.java |   38 +-
 .../apache/maven/repository/MetadataGraphNode.java |   52 +-
 .../repository/MetadataResolutionRequest.java      |  106 +-
 .../maven/repository/MetadataResolutionResult.java |  209 +-
 .../apache/maven/repository/MirrorSelector.java    |   10 +-
 .../repository/UserLocalArtifactRepository.java    |   36 +-
 .../maven/repository/VersionNotFoundException.java |   38 +-
 .../repository/legacy/ChecksumFailedException.java |   20 +-
 .../legacy/DefaultUpdateCheckManager.java          |  393 +--
 .../repository/legacy/DefaultWagonManager.java     |  828 ++---
 .../repository/legacy/LegacyRepositorySystem.java  |  862 +++---
 .../maven/repository/legacy/MavenArtifact.java     |   49 +-
 .../repository/legacy/TransferListenerAdapter.java |  151 +-
 .../repository/legacy/UpdateCheckManager.java      |   20 +-
 .../legacy/WagonConfigurationException.java        |   29 +-
 .../maven/repository/legacy/WagonManager.java      |   65 +-
 .../repository/ArtifactRepositoryFactory.java      |   51 +-
 .../DefaultArtifactRepositoryFactory.java          |  121 +-
 .../resolver/DefaultLegacyArtifactCollector.java   |  775 +++--
 .../legacy/resolver/LegacyArtifactCollector.java   |   55 +-
 .../legacy/resolver/conflict/ConflictResolver.java |   10 +-
 .../resolver/conflict/ConflictResolverFactory.java |   11 +-
 .../ConflictResolverNotFoundException.java         |   14 +-
 .../resolver/conflict/DefaultConflictResolver.java |   12 +-
 .../conflict/DefaultConflictResolverFactory.java   |   36 +-
 .../conflict/FarthestConflictResolver.java         |   20 +-
 .../resolver/conflict/NearestConflictResolver.java |   20 +-
 .../resolver/conflict/NewestConflictResolver.java  |   29 +-
 .../resolver/conflict/OldestConflictResolver.java  |   29 +-
 .../transform/AbstractVersionTransformation.java   |   88 +-
 .../resolver/transform/ArtifactTransformation.java |   33 +-
 .../transform/ArtifactTransformationManager.java   |   29 +-
 .../DefaultArtifactTransformationManager.java      |   63 +-
 .../transform/LatestArtifactTransformation.java    |   50 +-
 .../transform/ReleaseArtifactTransformation.java   |   70 +-
 .../resolver/transform/SnapshotTransformation.java |  135 +-
 .../repository/metadata/ArtifactMetadata.java      |  265 +-
 .../repository/metadata/ClasspathContainer.java    |   89 +-
 .../metadata/ClasspathTransformation.java          |   12 +-
 .../metadata/DefaultClasspathTransformation.java   |  174 +-
 .../DefaultGraphConflictResolutionPolicy.java      |   36 +-
 .../metadata/DefaultGraphConflictResolver.java     |  197 +-
 .../metadata/GraphConflictResolutionException.java |   29 +-
 .../metadata/GraphConflictResolutionPolicy.java    |   11 +-
 .../repository/metadata/GraphConflictResolver.java |   12 +-
 .../maven/repository/metadata/MetadataGraph.java   |  436 ++-
 .../repository/metadata/MetadataGraphEdge.java     |  128 +-
 .../MetadataGraphTransformationException.java      |   29 +-
 .../repository/metadata/MetadataGraphVertex.java   |  150 +-
 .../repository/metadata/MetadataResolution.java    |   41 +-
 .../metadata/MetadataResolutionException.java      |   28 +-
 .../metadata/MetadataResolutionRequest.java        |   46 +-
 .../MetadataResolutionRequestTypeEnum.java         |   29 +-
 .../metadata/MetadataResolutionResult.java         |  141 +-
 .../metadata/MetadataRetrievalException.java       |   34 +-
 .../maven/repository/metadata/MetadataSource.java  |   17 +-
 .../repository/metadata/MetadataTreeNode.java      |   95 +-
 .../plugin/ExpressionDocumentationException.java   |   20 +-
 .../usability/plugin/ExpressionDocumenter.java     |  104 +-
 .../AbstractArtifactComponentTestCase.java         |  290 +-
 .../artifact/deployer/ArtifactDeployerTest.java    |   54 +-
 .../deployer/SimpleArtifactMetadataSource.java     |   45 +-
 .../factory/DefaultArtifactFactoryTest.java        |   58 +-
 .../artifact/installer/ArtifactInstallerTest.java  |   48 +-
 .../artifact/metadata/TestMetadataSource.java      |   82 +-
 .../repository/MavenArtifactRepositoryTest.java    |   38 +-
 .../resolver/ArtifactResolutionExceptionTest.java  |   26 +-
 .../artifact/resolver/ArtifactResolverTest.java    |  242 +-
 .../resolver/DefaultArtifactResolverTest.java      |   64 +-
 .../maven/artifact/resolver/TestFileWagon.java     |   64 +-
 .../artifact/resolver/TestTransferListener.java    |   19 +-
 .../resolver/filter/AndArtifactFilterTest.java     |   36 +-
 .../resolver/filter/FilterHashEqualsTest.java      |   29 +-
 .../resolver/filter/OrArtifactFilterTest.java      |   36 +-
 .../resolver/filter/ScopeArtifactFilterTest.java   |   91 +-
 .../maven/artifact/testutils/TestFileManager.java  |  158 +-
 .../transform/TransformationManagerTest.java       |   53 +-
 .../manager/DefaultProfileManagerTest.java         |  146 +-
 .../project/AbstractMavenProjectTestCase.java      |  155 +-
 .../maven/project/ClasspathArtifactResolver.java   |   61 +-
 .../maven/project/EmptyLifecycleExecutor.java      |   68 +-
 .../project/EmptyLifecyclePluginAnalyzer.java      |   47 +-
 .../project/LegacyLocalRepositoryManager.java      |  138 +-
 .../org/apache/maven/project/ModelUtilsTest.java   |  530 ++--
 .../apache/maven/project/ProjectClasspathTest.java |  150 +-
 .../apache/maven/project/TestArtifactResolver.java |   35 +-
 .../maven/project/TestMavenRepositorySystem.java   |   33 +-
 .../apache/maven/project/TestProjectBuilder.java   |   79 +-
 .../AbstractProjectInheritanceTestCase.java        |   30 +-
 .../inheritance/t00/ProjectInheritanceTest.java    |   29 +-
 .../inheritance/t01/ProjectInheritanceTest.java    |   33 +-
 .../inheritance/t02/ProjectInheritanceTest.java    |   92 +-
 .../inheritance/t03/ProjectInheritanceTest.java    |   24 +-
 .../inheritance/t04/ProjectInheritanceTest.java    |   48 +-
 .../inheritance/t05/ProjectInheritanceTest.java    |   42 +-
 .../inheritance/t06/ProjectInheritanceTest.java    |   43 +-
 .../inheritance/t07/ProjectInheritanceTest.java    |   41 +-
 .../inheritance/t08/ProjectInheritanceTest.java    |   45 +-
 .../inheritance/t09/ProjectInheritanceTest.java    |   61 +-
 .../inheritance/t10/ProjectInheritanceTest.java    |   47 +-
 .../inheritance/t11/ProjectInheritanceTest.java    |   29 +-
 .../inheritance/t12/ProjectInheritanceTest.java    |   30 +-
 .../inheritance/t12scm/ProjectInheritanceTest.java |  126 +-
 .../project/path/DefaultPathTranslatorTest.java    |   40 +-
 .../repository/DefaultMirrorSelectorTest.java      |   20 +-
 .../maven/repository/LegacyRepositoryLayout.java   |   58 +-
 .../repository/LegacyRepositorySystemTest.java     |  199 +-
 .../maven/repository/MirrorProcessorTest.java      |  263 +-
 .../legacy/DefaultUpdateCheckManagerTest.java      |  190 +-
 .../repository/legacy/DefaultWagonManagerTest.java |  381 +--
 .../legacy/LegacyRepositorySystemTest.java         |   82 +-
 .../maven/repository/legacy/PerLookupWagon.java    |   17 +-
 .../maven/repository/legacy/StringWagon.java       |   64 +-
 .../org/apache/maven/repository/legacy/WagonA.java |   22 +-
 .../org/apache/maven/repository/legacy/WagonB.java |   22 +-
 .../org/apache/maven/repository/legacy/WagonC.java |   22 +-
 .../apache/maven/repository/legacy/WagonMock.java  |   16 +-
 .../resolver/DefaultArtifactCollectorTest.java     | 1229 ++++----
 .../conflict/AbstractConflictResolverTest.java     |   81 +-
 .../conflict/FarthestConflictResolverTest.java     |   53 +-
 .../conflict/NearestConflictResolverTest.java      |   53 +-
 .../conflict/NewestConflictResolverTest.java       |   53 +-
 .../conflict/OldestConflictResolverTest.java       |   54 +-
 .../DefaultClasspathTransformationTest.java        |  190 +-
 .../DefaultGraphConflictResolutionPolicyTest.java  |   83 +-
 .../metadata/DefaultGraphConflictResolverTest.java |  326 +-
 .../repository/metadata/TestMetadataSource.java    |   78 +-
 maven-compat/src/test/resources/pom.xml            |   19 -
 maven-core/pom.xml                                 |    6 +-
 .../maven/AbstractMavenLifecycleParticipant.java   |   20 +-
 .../org/apache/maven/ArtifactFilterManager.java    |   16 +-
 .../maven/ArtifactFilterManagerDelegate.java       |   13 +-
 .../src/main/java/org/apache/maven/BuildAbort.java |   18 +-
 .../org/apache/maven/BuildFailureException.java    |   19 +-
 .../apache/maven/DefaultArtifactFilterManager.java |   58 +-
 .../main/java/org/apache/maven/DefaultMaven.java   |  462 ++-
 .../maven/DefaultProjectDependenciesResolver.java  |  171 +-
 .../apache/maven/DuplicateProjectException.java    |   18 +-
 .../org/apache/maven/InternalErrorException.java   |   13 +-
 .../src/main/java/org/apache/maven/Maven.java      |   14 +-
 .../org/apache/maven/MavenExecutionException.java  |   28 +-
 .../org/apache/maven/MissingModuleException.java   |   21 +-
 .../apache/maven/ProjectBuildFailureException.java |   20 +-
 .../org/apache/maven/ProjectCycleException.java    |   21 +-
 .../apache/maven/ProjectDependenciesResolver.java  |   36 +-
 .../main/java/org/apache/maven/ReactorReader.java  |  178 +-
 .../java/org/apache/maven/RepositoryUtils.java     |  391 ++-
 .../main/java/org/apache/maven/SessionScoped.java  |   14 +-
 .../DependencyResolutionRequiredException.java     |   14 +-
 .../maven/artifact/InvalidRepositoryException.java |   33 +-
 .../maven/artifact/factory/ArtifactFactory.java    |   63 +-
 .../artifact/factory/DefaultArtifactFactory.java   |  177 +-
 .../artifact/handler/DefaultArtifactHandler.java   |   67 +-
 .../handler/manager/ArtifactHandlerManager.java    |   13 +-
 .../manager/DefaultArtifactHandlerManager.java     |   44 +-
 .../metadata/AbstractArtifactMetadata.java         |   15 +-
 .../ArtifactMetadataRetrievalException.java        |   29 +-
 .../artifact/metadata/ArtifactMetadataSource.java  |   38 +-
 .../maven/artifact/metadata/ResolutionGroup.java   |   29 +-
 .../repository/DefaultRepositoryRequest.java       |   64 +-
 .../repository/LegacyLocalRepositoryManager.java   |  302 +-
 .../repository/MavenArtifactRepository.java        |  281 +-
 .../maven/artifact/repository/RepositoryCache.java |   11 +-
 .../artifact/repository/RepositoryRequest.java     |   15 +-
 .../repository/layout/DefaultRepositoryLayout.java |   77 +-
 .../metadata/AbstractRepositoryMetadata.java       |  175 +-
 .../metadata/ArtifactRepositoryMetadata.java       |   68 +-
 .../repository/metadata/RepositoryMetadata.java    |   16 +-
 .../RepositoryMetadataDeploymentException.java     |   20 +-
 .../RepositoryMetadataInstallationException.java   |   20 +-
 .../metadata/RepositoryMetadataManager.java        |   36 +-
 .../RepositoryMetadataResolutionException.java     |   20 +-
 .../metadata/io/DefaultMetadataReader.java         |   60 +-
 .../metadata/io/MetadataParseException.java        |   26 +-
 .../repository/metadata/io/MetadataReader.java     |   17 +-
 .../resolver/ArtifactResolutionRequest.java        |  152 +-
 .../resolver/ArtifactResolutionResult.java         |  215 +-
 .../resolver/DefaultResolutionErrorHandler.java    |   61 +-
 .../artifact/resolver/ResolutionErrorHandler.java  |   11 +-
 .../artifact/resolver/ResolutionListener.java      |   40 +-
 .../maven/artifact/resolver/ResolutionNode.java    |  152 +-
 .../filter/AbstractScopeArtifactFilter.java        |   58 +-
 .../resolver/filter/AndArtifactFilter.java         |   51 +-
 .../filter/CumulativeScopeArtifactFilter.java      |   61 +-
 .../resolver/filter/ExcludesArtifactFilter.java    |   20 +-
 .../resolver/filter/ExclusionArtifactFilter.java   |   42 +-
 .../resolver/filter/ExclusionSetFilter.java        |   41 +-
 .../resolver/filter/IncludesArtifactFilter.java    |   43 +-
 .../resolver/filter/ScopeArtifactFilter.java       |   34 +-
 .../apache/maven/bridge/MavenRepositorySystem.java |  822 +++--
 .../classrealm/ArtifactClassRealmConstituent.java  |   33 +-
 .../maven/classrealm/ClassRealmConstituent.java    |    7 +-
 .../apache/maven/classrealm/ClassRealmManager.java |   20 +-
 .../classrealm/ClassRealmManagerDelegate.java      |   10 +-
 .../apache/maven/classrealm/ClassRealmRequest.java |   10 +-
 .../maven/classrealm/DefaultClassRealmManager.java |  318 +-
 .../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          |  100 +-
 .../apache/maven/eventspy/AbstractEventSpy.java    |   23 +-
 .../java/org/apache/maven/eventspy/EventSpy.java   |   20 +-
 .../eventspy/internal/EventSpyDispatcher.java      |  108 +-
 .../internal/EventSpyExecutionListener.java        |  130 +-
 .../internal/EventSpyRepositoryListener.java       |  144 +-
 .../maven/exception/DefaultExceptionHandler.java   |  223 +-
 .../apache/maven/exception/ExceptionHandler.java   |   10 +-
 .../apache/maven/exception/ExceptionSummary.java   |   39 +-
 .../maven/execution/AbstractExecutionListener.java |   59 +-
 .../org/apache/maven/execution/BuildFailure.java   |   16 +-
 .../org/apache/maven/execution/BuildSuccess.java   |   13 +-
 .../org/apache/maven/execution/BuildSummary.java   |   19 +-
 .../execution/DefaultMavenExecutionRequest.java    |  729 ++---
 .../DefaultMavenExecutionRequestPopulator.java     |  241 +-
 .../execution/DefaultMavenExecutionResult.java     |   56 +-
 .../org/apache/maven/execution/ExecutionEvent.java |   10 +-
 .../apache/maven/execution/ExecutionListener.java  |   41 +-
 .../maven/execution/MavenExecutionRequest.java     |  133 +-
 .../MavenExecutionRequestPopulationException.java  |   25 +-
 .../execution/MavenExecutionRequestPopulator.java  |   22 +-
 .../maven/execution/MavenExecutionResult.java      |   23 +-
 .../org/apache/maven/execution/MavenSession.java   |  313 +-
 .../apache/maven/execution/MojoExecutionEvent.java |   31 +-
 .../maven/execution/MojoExecutionListener.java     |   14 +-
 .../maven/execution/ProjectDependencyGraph.java    |   12 +-
 .../maven/execution/ProjectExecutionEvent.java     |   40 +-
 .../maven/execution/ProjectExecutionListener.java  |   17 +-
 .../org/apache/maven/execution/ReactorManager.java |  144 +-
 .../apache/maven/execution/SettingsAdapter.java    |   50 +-
 .../maven/execution/scope/MojoExecutionScoped.java |   14 +-
 .../execution/scope/WeakMojoExecutionListener.java |   14 +-
 .../scope/internal/MojoExecutionScope.java         |  141 +-
 .../internal/MojoExecutionScopeCoreModule.java     |   21 +-
 .../scope/internal/MojoExecutionScopeModule.java   |   39 +-
 .../maven/extension/internal/CoreExports.java      |   37 +-
 .../extension/internal/CoreExportsProvider.java    |   21 +-
 .../extension/internal/CoreExtensionEntry.java     |   82 +-
 .../apache/maven/graph/DefaultGraphBuilder.java    |  396 +--
 .../maven/graph/DefaultProjectDependencyGraph.java |  124 +-
 .../graph/FilteredProjectDependencyGraph.java      |   60 +-
 .../java/org/apache/maven/graph/GraphBuilder.java  |   10 +-
 .../maven/internal/MultilineMessageHelper.java     |   73 +-
 .../DefaultRepositorySystemSessionFactory.java     |  319 +-
 .../internal/aether/LoggingRepositoryListener.java |  121 +-
 .../aether/MavenChainedWorkspaceReader.java        |   53 +-
 .../maven/internal/aether/ResolverLifecycle.java   |   21 +-
 .../maven/lifecycle/DefaultLifecycleExecutor.java  |  113 +-
 .../apache/maven/lifecycle/DefaultLifecycles.java  |   96 +-
 .../maven/lifecycle/LifeCyclePluginAnalyzer.java   |   10 +-
 .../java/org/apache/maven/lifecycle/Lifecycle.java |   36 +-
 .../lifecycle/LifecycleExecutionException.java     |   87 +-
 .../apache/maven/lifecycle/LifecycleExecutor.java  |   49 +-
 .../maven/lifecycle/LifecycleMappingDelegate.java  |   17 +-
 .../lifecycle/LifecycleNotFoundException.java      |   18 +-
 .../lifecycle/LifecyclePhaseNotFoundException.java |   18 +-
 .../apache/maven/lifecycle/MavenExecutionPlan.java |  124 +-
 .../maven/lifecycle/MissingProjectException.java   |   13 +-
 .../maven/lifecycle/MojoExecutionConfigurator.java |   10 +-
 .../maven/lifecycle/NoGoalSpecifiedException.java  |   13 +-
 .../lifecycle/internal/BuildListCalculator.java    |   56 +-
 .../lifecycle/internal/BuildThreadFactory.java     |   14 +-
 .../internal/CompoundProjectExecutionListener.java |   48 +-
 .../lifecycle/internal/DefaultExecutionEvent.java  |   26 +-
 .../internal/DefaultExecutionEventCatapult.java    |   64 +-
 .../DefaultLifecycleExecutionPlanCalculator.java   |  509 ++--
 .../internal/DefaultLifecycleMappingDelegate.java  |  105 +-
 .../internal/DefaultLifecyclePluginAnalyzer.java   |  199 +-
 .../DefaultLifecycleTaskSegmentCalculator.java     |  102 +-
 .../internal/DefaultMojoExecutionConfigurator.java |  178 +-
 .../internal/DefaultProjectArtifactFactory.java    |   23 +-
 .../lifecycle/internal/DependencyContext.java      |   60 +-
 .../lifecycle/internal/ExecutionEventCatapult.java |   11 +-
 .../lifecycle/internal/ExecutionPlanItem.java      |   44 +-
 .../apache/maven/lifecycle/internal/GoalTask.java  |   14 +-
 .../lifecycle/internal/LifecycleDebugLogger.java   |  143 +-
 .../internal/LifecycleDependencyResolver.java      |  351 +--
 .../internal/LifecycleExecutionPlanCalculator.java |   52 +-
 .../lifecycle/internal/LifecycleModuleBuilder.java |   92 +-
 .../internal/LifecyclePluginResolver.java          |   62 +-
 .../maven/lifecycle/internal/LifecycleStarter.java |   97 +-
 .../maven/lifecycle/internal/LifecycleTask.java    |   17 +-
 .../internal/LifecycleTaskSegmentCalculator.java   |   30 +-
 .../lifecycle/internal/MojoDescriptorCreator.java  |  205 +-
 .../maven/lifecycle/internal/MojoExecutor.java     |  501 ++-
 .../maven/lifecycle/internal/PhaseRecorder.java    |   42 +-
 .../lifecycle/internal/ProjectArtifactFactory.java |   14 +-
 .../maven/lifecycle/internal/ProjectBuildList.java |   91 +-
 .../maven/lifecycle/internal/ProjectIndex.java     |   37 +-
 .../maven/lifecycle/internal/ProjectSegment.java   |   36 +-
 .../lifecycle/internal/ReactorBuildStatus.java     |   48 +-
 .../maven/lifecycle/internal/ReactorContext.java   |   29 +-
 .../maven/lifecycle/internal/TaskSegment.java      |   27 +-
 .../maven/lifecycle/internal/builder/Builder.java  |   19 +-
 .../lifecycle/internal/builder/BuilderCommon.java  |  138 +-
 .../internal/builder/BuilderNotFoundException.java |   14 +-
 .../multithreaded/ConcurrencyDependencyGraph.java  |   84 +-
 .../multithreaded/MultiThreadedBuilder.java        |  197 +-
 .../builder/multithreaded/ThreadOutputMuxer.java   |  343 +--
 .../singlethreaded/SingleThreadedBuilder.java      |   41 +-
 .../lifecycle/mapping/DefaultLifecycleMapping.java |   89 +-
 .../apache/maven/lifecycle/mapping/Lifecycle.java  |   47 +-
 .../maven/lifecycle/mapping/LifecycleMapping.java  |   13 +-
 .../maven/lifecycle/mapping/LifecycleMojo.java     |   41 +-
 .../maven/lifecycle/mapping/LifecyclePhase.java    |   98 +-
 .../plugin/DefaultLifecycleBindingsInjector.java   |  130 +-
 .../maven/monitor/event/EventDispatcher.java       |   19 +-
 .../apache/maven/monitor/event/EventMonitor.java   |   17 +-
 .../apache/maven/plugin/BuildPluginManager.java    |   32 +-
 .../java/org/apache/maven/plugin/CacheUtils.java   |  110 +-
 .../plugin/CompoundMojoExecutionListener.java      |   40 +-
 .../CycleDetectedInPluginGraphException.java       |   17 +-
 .../maven/plugin/DebugConfigurationListener.java   |   60 +-
 .../maven/plugin/DefaultBuildPluginManager.java    |  210 +-
 .../maven/plugin/DefaultExtensionRealmCache.java   |  109 +-
 .../plugin/DefaultMojosExecutionStrategy.java      |   24 +-
 .../maven/plugin/DefaultPluginArtifactsCache.java  |  142 +-
 .../maven/plugin/DefaultPluginDescriptorCache.java |  140 +-
 .../maven/plugin/DefaultPluginRealmCache.java      |  154 +-
 .../apache/maven/plugin/ExtensionRealmCache.java   |   36 +-
 .../plugin/InvalidPluginDescriptorException.java   |   25 +-
 .../maven/plugin/InvalidPluginException.java       |   25 +-
 .../org/apache/maven/plugin/LegacySupport.java     |    9 +-
 .../apache/maven/plugin/MavenPluginManager.java    |   48 +-
 .../apache/maven/plugin/MavenPluginValidator.java  |   39 +-
 .../org/apache/maven/plugin/MojoExecution.java     |  111 +-
 .../apache/maven/plugin/MojoExecutionRunner.java   |    8 +-
 .../maven/plugin/MojosExecutionStrategy.java       |   12 +-
 .../apache/maven/plugin/PluginArtifactsCache.java  |   41 +-
 .../maven/plugin/PluginConfigurationException.java |   40 +-
 .../maven/plugin/PluginContainerException.java     |   45 +-
 .../apache/maven/plugin/PluginDescriptorCache.java |   17 +-
 .../plugin/PluginDescriptorParsingException.java   |   27 +-
 .../maven/plugin/PluginExecutionException.java     |   59 +-
 .../maven/plugin/PluginIncompatibleException.java  |   15 +-
 .../apache/maven/plugin/PluginLoaderException.java |   78 +-
 .../org/apache/maven/plugin/PluginManager.java     |   56 +-
 .../maven/plugin/PluginManagerException.java       |   90 +-
 .../maven/plugin/PluginNotFoundException.java      |   44 +-
 .../maven/plugin/PluginParameterException.java     |  186 +-
 .../plugin/PluginParameterExpressionEvaluator.java |  418 +--
 .../org/apache/maven/plugin/PluginRealmCache.java  |   39 +-
 .../maven/plugin/PluginResolutionException.java    |   21 +-
 .../AbstractMavenPluginParametersValidator.java    |  109 +-
 .../plugin/internal/DefaultLegacySupport.java      |   38 +-
 .../plugin/internal/DefaultMavenPluginManager.java |  890 +++---
 .../DefaultPluginDependenciesResolver.java         |  289 +-
 .../plugin/internal/DefaultPluginManager.java      |  201 +-
 .../plugin/internal/DeprecatedPluginValidator.java |   72 +-
 .../MavenPluginConfigurationValidator.java         |   15 +-
 .../internal/PluginDependenciesResolver.java       |   22 +-
 .../PluginDependencyResolutionListener.java        |  104 +-
 .../ReadOnlyPluginParametersValidator.java         |   47 +-
 .../internal/ValidatingConfigurationListener.java  |   55 +-
 .../maven/plugin/internal/WagonExcluder.java       |   65 +-
 .../plugin/prefix/DefaultPluginPrefixRequest.java  |   77 +-
 .../prefix/NoPluginFoundForPrefixException.java    |   40 +-
 .../maven/plugin/prefix/PluginPrefixRequest.java   |   18 +-
 .../maven/plugin/prefix/PluginPrefixResolver.java  |   10 +-
 .../maven/plugin/prefix/PluginPrefixResult.java    |    9 +-
 .../internal/DefaultPluginPrefixResolver.java      |  235 +-
 .../prefix/internal/DefaultPluginPrefixResult.java |   35 +-
 .../version/DefaultPluginVersionRequest.java       |   79 +-
 .../version/PluginVersionNotFoundException.java    |   21 +-
 .../maven/plugin/version/PluginVersionRequest.java |   18 +-
 .../version/PluginVersionResolutionException.java  |   58 +-
 .../plugin/version/PluginVersionResolver.java      |   10 +-
 .../maven/plugin/version/PluginVersionResult.java  |    7 +-
 .../internal/DefaultPluginVersionResolver.java     |  391 +--
 .../internal/DefaultPluginVersionResult.java       |   26 +-
 .../DefaultDependencyResolutionRequest.java        |   36 +-
 .../project/DefaultDependencyResolutionResult.java |   63 +-
 .../maven/project/DefaultMavenProjectHelper.java   |   97 +-
 .../project/DefaultModelBuildingListener.java      |   97 +-
 .../maven/project/DefaultProjectBuilder.java       | 1028 +++----
 .../project/DefaultProjectBuildingHelper.java      |  180 +-
 .../project/DefaultProjectBuildingRequest.java     |  219 +-
 .../project/DefaultProjectBuildingResult.java      |   45 +-
 .../DefaultProjectDependenciesResolver.java        |  294 +-
 .../maven/project/DefaultProjectRealmCache.java    |   88 +-
 .../project/DependencyResolutionException.java     |   16 +-
 .../maven/project/DependencyResolutionRequest.java |   13 +-
 .../maven/project/DependencyResolutionResult.java  |   10 +-
 .../DuplicateArtifactAttachmentException.java      |   23 +-
 .../maven/project/DuplicateProjectException.java   |   35 +-
 .../apache/maven/project/ExtensionDescriptor.java  |   46 +-
 .../maven/project/ExtensionDescriptorBuilder.java  |   98 +-
 .../project/InvalidProjectVersionException.java    |   38 +-
 .../org/apache/maven/project/MavenProject.java     | 1306 +++-----
 .../apache/maven/project/MavenProjectHelper.java   |   20 +-
 .../org/apache/maven/project/ProjectBuilder.java   |   29 +-
 .../maven/project/ProjectBuildingException.java    |  104 +-
 .../maven/project/ProjectBuildingHelper.java       |   24 +-
 .../maven/project/ProjectBuildingRequest.java      |   47 +-
 .../maven/project/ProjectBuildingResult.java       |    8 +-
 .../maven/project/ProjectDependenciesResolver.java |   10 +-
 .../apache/maven/project/ProjectModelResolver.java |  242 +-
 .../apache/maven/project/ProjectRealmCache.java    |   32 +-
 .../org/apache/maven/project/ProjectSorter.java    |  284 +-
 .../apache/maven/project/ReactorModelCache.java    |   56 +-
 .../org/apache/maven/project/ReactorModelPool.java |   52 +-
 .../maven/project/RepositorySessionDecorator.java  |   12 +-
 .../project/artifact/ActiveProjectArtifact.java    |  249 +-
 .../project/artifact/ArtifactWithDependencies.java |   10 +-
 .../maven/project/artifact/AttachedArtifact.java   |  153 +-
 .../artifact/DefaultMavenMetadataCache.java        |  286 +-
 .../project/artifact/DefaultMetadataSource.java    |   11 +-
 .../artifact/DefaultProjectArtifactsCache.java     |  202 +-
 .../InvalidDependencyVersionException.java         |   25 +-
 .../maven/project/artifact/MavenMetadataCache.java |   26 +-
 .../project/artifact/MavenMetadataSource.java      |  655 ++--
 .../maven/project/artifact/PluginArtifact.java     |   59 +-
 .../maven/project/artifact/ProjectArtifact.java    |   69 +-
 .../project/artifact/ProjectArtifactMetadata.java  |   78 +-
 .../project/artifact/ProjectArtifactsCache.java    |   43 +-
 .../apache/maven/project/path/PathTranslator.java  |   17 +-
 .../properties/internal/EnvironmentUtils.java      |   30 +-
 .../properties/internal/SystemProperties.java      |   25 +-
 .../repository/ArtifactDoesNotExistException.java  |   17 +-
 .../maven/repository/ArtifactTransferEvent.java    |  164 +-
 .../ArtifactTransferFailedException.java           |   18 +-
 .../maven/repository/ArtifactTransferListener.java |   19 +-
 .../maven/repository/ArtifactTransferResource.java |    7 +-
 .../DelegatingLocalArtifactRepository.java         |  118 +-
 .../maven/repository/LocalArtifactRepository.java  |    9 +-
 .../LocalRepositoryNotAccessibleException.java     |   20 +-
 .../apache/maven/repository/RepositorySystem.java  |   90 +-
 .../legacy/metadata/AbstractArtifactMetadata.java  |   34 +-
 .../ArtifactMetadataRetrievalException.java        |   35 +-
 .../legacy/metadata/ArtifactMetadataSource.java    |   34 +-
 .../metadata/DefaultMetadataResolutionRequest.java |   66 +-
 .../legacy/metadata/MetadataResolutionRequest.java |   19 +-
 .../legacy/metadata/ResolutionGroup.java           |   41 +-
 .../apache/maven/rtinfo/RuntimeInformation.java    |    9 +-
 .../rtinfo/internal/DefaultRuntimeInformation.java |   97 +-
 .../maven/session/scope/internal/SessionScope.java |  103 +-
 .../session/scope/internal/SessionScopeModule.java |   38 +-
 .../settings/DefaultMavenSettingsBuilder.java      |  107 +-
 .../maven/settings/MavenSettingsBuilder.java       |   25 +-
 .../settings/SettingsConfigurationException.java   |   37 +-
 .../org/apache/maven/settings/SettingsUtils.java   |  237 +-
 .../apache/maven/toolchain/DefaultToolchain.java   |  110 +-
 .../maven/toolchain/DefaultToolchainManager.java   |  113 +-
 .../toolchain/DefaultToolchainManagerPrivate.java  |   58 +-
 .../maven/toolchain/DefaultToolchainsBuilder.java  |   39 +-
 .../toolchain/MisconfiguredToolchainException.java |   21 +-
 .../apache/maven/toolchain/RequirementMatcher.java |   12 +-
 .../maven/toolchain/RequirementMatcherFactory.java |   80 +-
 .../java/org/apache/maven/toolchain/Toolchain.java |   12 +-
 .../apache/maven/toolchain/ToolchainFactory.java   |   13 +-
 .../apache/maven/toolchain/ToolchainManager.java   |   14 +-
 .../maven/toolchain/ToolchainManagerPrivate.java   |   16 +-
 .../apache/maven/toolchain/ToolchainPrivate.java   |   17 +-
 .../apache/maven/toolchain/ToolchainsBuilder.java  |   11 +-
 .../building/DefaultToolchainsBuilder.java         |  198 +-
 .../building/DefaultToolchainsBuildingRequest.java |   22 +-
 .../building/DefaultToolchainsBuildingResult.java  |   30 +-
 .../toolchain/building/ToolchainsBuilder.java      |   10 +-
 .../building/ToolchainsBuildingException.java      |   52 +-
 .../building/ToolchainsBuildingRequest.java        |   10 +-
 .../building/ToolchainsBuildingResult.java         |   10 +-
 .../toolchain/io/DefaultToolchainsReader.java      |   59 +-
 .../toolchain/io/DefaultToolchainsWriter.java      |   29 +-
 .../toolchain/io/ToolchainsParseException.java     |   26 +-
 .../maven/toolchain/io/ToolchainsReader.java       |   17 +-
 .../maven/toolchain/io/ToolchainsWriter.java       |   14 +-
 .../maven/toolchain/java/DefaultJavaToolChain.java |   27 +-
 .../apache/maven/toolchain/java/JavaToolchain.java |   75 +-
 .../maven/toolchain/java/JavaToolchainFactory.java |   81 +-
 .../maven/toolchain/java/JavaToolchainImpl.java    |   52 +-
 .../toolchain/merge/MavenToolchainMerger.java      |   83 +-
 .../maven/AbstractCoreMavenComponentTestCase.java  |  284 +-
 .../java/org/apache/maven/DefaultMavenTest.java    |  115 +-
 .../maven/MavenLifecycleParticipantTest.java       |  169 +-
 .../src/test/java/org/apache/maven/MavenTest.java  |   51 +-
 .../maven/ProjectDependenciesResolverTest.java     |   84 +-
 .../artifact/handler/ArtifactHandlerTest.java      |   97 +-
 .../filter/ExclusionArtifactFilterTest.java        |  158 +-
 .../configuration/DefaultBeanConfiguratorTest.java |   95 +-
 .../exception/DefaultExceptionHandlerTest.java     |   56 +-
 .../DefaultMavenExecutionRequestPopulatorTest.java |   53 +-
 .../maven/execution/DefaultMavenExecutionTest.java |   29 +-
 .../scope/internal/MojoExecutionScopeTest.java     |  129 +-
 .../graph/DefaultProjectDependencyGraphTest.java   |  184 +-
 .../maven/internal/MultilineMessageHelperTest.java |   72 +-
 .../maven/lifecycle/DefaultLifecyclesTest.java     |   63 +-
 .../lifecycle/DelegatingMojoExecutionListener.java |   48 +-
 .../DelegatingProjectExecutionListener.java        |   56 +-
 .../lifecycle/EmptyLifecyclePluginAnalyzer.java    |   47 +-
 .../lifecycle/LifecycleExecutorSubModulesTest.java |   80 +-
 .../maven/lifecycle/LifecycleExecutorTest.java     |  748 +++--
 .../maven/lifecycle/MavenExecutionPlanTest.java    |   69 +-
 .../lifecycle/MojoExecutionXPathContainer.java     |   48 +-
 .../internal/BuildListCalculatorTest.java          |   63 +-
 .../lifecycle/internal/BuilderCommonTest.java      |   77 +-
 .../internal/ConcurrencyDependencyGraphTest.java   |   99 +-
 .../internal/LifecycleDependencyResolverTest.java  |   65 +-
 .../LifecycleExecutionPlanCalculatorTest.java      |   92 +-
 .../internal/LifecycleModuleBuilderTest.java       |  110 +-
 .../LifecycleTaskSegmentCalculatorImplTest.java    |   37 +-
 .../lifecycle/internal/PhaseRecorderTest.java      |   52 +-
 .../lifecycle/internal/ProjectBuildListTest.java   |   50 +-
 .../ConcurrencyDependencyGraphTest.java            |   86 +-
 .../multithreaded/ThreadOutputMuxerTest.java       |  165 +-
 .../internal/stub/BuildPluginManagerStub.java      |   50 +-
 .../internal/stub/CompletionServiceStub.java       |   72 +-
 .../internal/stub/DefaultLifecyclesStub.java       |   73 +-
 .../internal/stub/ExecutionEventCatapultStub.java  |   18 +-
 .../internal/stub/LifeCyclePluginAnalyzerStub.java |   75 +-
 .../stub/LifecycleExecutionPlanCalculatorStub.java |  255 +-
 .../stub/LifecycleTaskSegmentCalculatorStub.java   |   79 +-
 .../maven/lifecycle/internal/stub/LoggerStub.java  |   98 +-
 .../lifecycle/internal/stub/MojoExecutorStub.java  |   65 +-
 .../internal/stub/PluginPrefixResolverStub.java    |   46 +-
 .../internal/stub/PluginVersionResolverStub.java   |   43 +-
 .../stub/ProjectDependenciesResolverStub.java      |  102 +-
 .../internal/stub/ProjectDependencyGraphStub.java  |  198 +-
 .../stub/ProjectDependencyGraphStubTest.java       |   70 +-
 .../lifecycle/mapping/LifecyclePhaseTest.java      |   91 +-
 .../org/apache/maven/plugin/PluginManagerTest.java |  224 +-
 .../maven/plugin/PluginParameterExceptionTest.java |  189 +-
 .../PluginParameterExpressionEvaluatorTest.java    |  364 +--
 .../plugin/internal/DefaultLegacySupportTest.java  |   18 +-
 .../project/AbstractMavenProjectTestCase.java      |  161 +-
 .../project/DefaultMavenProjectBuilderTest.java    |  522 ++--
 .../maven/project/EmptyLifecycleExecutor.java      |   68 +-
 .../maven/project/EmptyProjectBuildingHelper.java  |   35 +-
 .../project/ExtensionDescriptorBuilderTest.java    |   53 +-
 .../project/LegacyLocalRepositoryManager.java      |  138 +-
 .../org/apache/maven/project/MavenProjectTest.java |  200 +-
 .../apache/maven/project/PomConstructionTest.java  | 2618 ++++++++--------
 .../apache/maven/project/ProjectBuilderTest.java   |  364 +--
 .../maven/project/ProjectModelResolverTest.java    |  259 +-
 .../apache/maven/project/ProjectSorterTest.java    |  350 +--
 .../apache/maven/project/TestMetadataSource.java   |   28 +-
 .../artifact/DefaultMavenMetadataCacheTest.java    |   49 +-
 .../artifact/DefaultProjectArtifactsCacheTest.java |   74 +-
 .../project/artifact/MavenMetadataSourceTest.java  |   25 +-
 .../canonical/CanonicalProjectBuilderTest.java     |   51 +-
 .../maven/project/harness/PomTestWrapper.java      |   90 +-
 .../project/harness/Xpp3DomAttributeIterator.java  |   44 +-
 .../project/harness/Xpp3DomAttributePointer.java   |   48 +-
 .../maven/project/harness/Xpp3DomNodeIterator.java |   83 +-
 .../maven/project/harness/Xpp3DomNodePointer.java  |   91 +-
 .../project/harness/Xpp3DomPointerFactory.java     |   30 +-
 .../maven/repository/LegacyRepositoryLayout.java   |   58 +-
 .../maven/repository/TestArtifactHandler.java      |   37 +-
 .../maven/repository/TestRepositoryConnector.java  |  128 +-
 .../repository/TestRepositoryConnectorFactory.java |   20 +-
 .../maven/repository/TestRepositorySystem.java     |  300 +-
 .../internal/DefaultRuntimeInformationTest.java    |   71 +-
 .../settings/PomConstructionWithSettingsTest.java  |  113 +-
 .../apache/maven/settings/SettingsUtilsTest.java   |  153 +-
 .../DefaultToolchainManagerPrivateTest.java        |  106 +-
 .../toolchain/DefaultToolchainManagerTest.java     |  109 +-
 .../maven/toolchain/DefaultToolchainTest.java      |  116 +-
 .../toolchain/RequirementMatcherFactoryTest.java   |   52 +-
 .../building/DefaultToolchainsBuilderTest.java     |  340 ++-
 .../building/ToolchainsBuildingExceptionTest.java  |   63 +-
 .../toolchain/merge/MavenToolchainMergerTest.java  |  150 +-
 maven-embedder/pom.xml                             |    2 -
 .../main/java/org/apache/maven/embedder/App.java   |   14 -
 .../java/org/apache/maven/embedder/AppTest.java    |   14 -
 .../main/java/org/apache/maven/cli/CLIManager.java |  256 +-
 .../org/apache/maven/cli/CLIReportingUtils.java    |  167 +-
 .../java/org/apache/maven/cli/CleanArgument.java   |   80 +-
 .../main/java/org/apache/maven/cli/CliRequest.java |   50 +-
 .../main/java/org/apache/maven/cli/MavenCli.java   | 1574 ++++------
 .../java/org/apache/maven/cli/ResolveFile.java     |   28 +-
 .../cli/configuration/ConfigurationProcessor.java  |    9 +-
 .../SettingsXmlConfigurationProcessor.java         |  192 +-
 .../maven/cli/event/DefaultEventSpyContext.java    |   12 +-
 .../maven/cli/event/ExecutionEventLogger.java      |  432 ++-
 .../internal/BootstrapCoreExtensionManager.java    |  173 +-
 .../cli/internal/ExtensionResolutionException.java |   22 +-
 .../maven/cli/logging/BaseSlf4jConfiguration.java  |   19 +-
 .../maven/cli/logging/Slf4jConfiguration.java      |   15 +-
 .../cli/logging/Slf4jConfigurationFactory.java     |   36 +-
 .../org/apache/maven/cli/logging/Slf4jLogger.java  |   89 +-
 .../maven/cli/logging/Slf4jLoggerManager.java      |   47 +-
 .../maven/cli/logging/Slf4jStdoutLogger.java       |  253 +-
 .../cli/logging/impl/Log4j2Configuration.java      |   18 +-
 .../cli/logging/impl/LogbackConfiguration.java     |   18 +-
 .../cli/logging/impl/Slf4jSimpleConfiguration.java |   18 +-
 .../impl/UnsupportedSlf4jBindingConfiguration.java |   32 +-
 .../transfer/AbstractMavenTransferListener.java    |  200 +-
 .../transfer/BatchModeMavenTransferListener.java   |   15 +-
 .../cli/transfer/ConsoleMavenTransferListener.java |  128 +-
 .../cli/transfer/QuietMavenTransferListener.java   |   11 +-
 .../cli/transfer/Slf4jMavenTransferListener.java   |   68 +-
 .../src/main/java/org/slf4j/MavenSlf4jFriend.java  |    9 +-
 .../org/slf4j/impl/MavenSlf4jSimpleFriend.java     |   14 +-
 .../maven/cli/CLIManagerDocumentationTest.java     |   97 +-
 .../java/org/apache/maven/cli/CLIManagerTest.java  |   24 +-
 .../apache/maven/cli/CLIReportingUtilsTest.java    |   28 +-
 .../org/apache/maven/cli/CleanArgumentTest.java    |   44 +-
 .../java/org/apache/maven/cli/MavenCliTest.java    |  344 +--
 .../maven/cli/event/ExecutionEventLoggerTest.java  |  179 +-
 .../maven/cli/transfer/FileSizeFormatTest.java     |  346 +--
 maven-model-builder/pom.xml                        |    2 -
 .../building/AbstractModelBuildingListener.java    |   11 +-
 .../maven/model/building/DefaultModelBuilder.java  | 1330 ++++----
 .../model/building/DefaultModelBuilderFactory.java |  163 +-
 .../model/building/DefaultModelBuildingEvent.java  |   20 +-
 .../building/DefaultModelBuildingRequest.java      |  224 +-
 .../model/building/DefaultModelBuildingResult.java |   96 +-
 .../maven/model/building/DefaultModelProblem.java  |  101 +-
 .../building/DefaultModelProblemCollector.java     |  131 +-
 .../model/building/DefaultModelProcessor.java      |   43 +-
 .../maven/model/building/FileModelSource.java      |   64 +-
 .../model/building/FilterModelBuildingRequest.java |  150 +-
 .../apache/maven/model/building/ModelBuilder.java  |   16 +-
 .../maven/model/building/ModelBuildingEvent.java   |    7 +-
 .../model/building/ModelBuildingEventCatapult.java |   17 +-
 .../model/building/ModelBuildingException.java     |  106 +-
 .../model/building/ModelBuildingListener.java      |    9 +-
 .../maven/model/building/ModelBuildingRequest.java |   42 +-
 .../maven/model/building/ModelBuildingResult.java  |   12 +-
 .../apache/maven/model/building/ModelCache.java    |   11 +-
 .../apache/maven/model/building/ModelCacheTag.java |   53 +-
 .../org/apache/maven/model/building/ModelData.java |   81 +-
 .../apache/maven/model/building/ModelProblem.java  |   17 +-
 .../model/building/ModelProblemCollector.java      |    9 +-
 .../model/building/ModelProblemCollectorExt.java   |    7 +-
 .../building/ModelProblemCollectorRequest.java     |   38 +-
 .../maven/model/building/ModelProblemUtils.java    |  108 +-
 .../maven/model/building/ModelProcessor.java       |   10 +-
 .../apache/maven/model/building/ModelSource.java   |    8 +-
 .../apache/maven/model/building/ModelSource2.java  |    9 +-
 .../org/apache/maven/model/building/Result.java    |  146 +-
 .../maven/model/building/StringModelSource.java    |   19 +-
 .../maven/model/building/UrlModelSource.java       |   15 +-
 .../DefaultDependencyManagementImporter.java       |   48 +-
 .../composition/DependencyManagementImporter.java  |   15 +-
 .../inheritance/DefaultInheritanceAssembler.java   |  306 +-
 .../model/inheritance/InheritanceAssembler.java    |   11 +-
 .../AbstractStringBasedModelInterpolator.java      |  175 +-
 .../interpolation/BuildTimestampValueSource.java   |   23 +-
 .../DefaultModelVersionProcessor.java              |   39 +-
 .../model/interpolation/MavenBuildTimestamp.java   |   45 +-
 .../model/interpolation/ModelInterpolator.java     |   15 +-
 .../model/interpolation/ModelVersionProcessor.java |   16 +-
 .../PathTranslatingPostProcessor.java              |   38 +-
 .../interpolation/ProblemDetectingValueSource.java |   37 +-
 .../StringSearchModelInterpolator.java             |  499 ++-
 .../StringVisitorModelInterpolator.java            | 1350 ++++-----
 .../interpolation/UrlNormalizingPostProcessor.java |   35 +-
 .../apache/maven/model/io/DefaultModelReader.java  |   78 +-
 .../apache/maven/model/io/DefaultModelWriter.java  |   49 +-
 .../apache/maven/model/io/ModelParseException.java |   26 +-
 .../org/apache/maven/model/io/ModelReader.java     |   17 +-
 .../org/apache/maven/model/io/ModelWriter.java     |   17 +-
 .../maven/model/locator/DefaultModelLocator.java   |   14 +-
 .../apache/maven/model/locator/ModelLocator.java   |    9 +-
 .../DefaultDependencyManagementInjector.java       |   65 +-
 .../DefaultPluginManagementInjector.java           |   93 +-
 .../management/DependencyManagementInjector.java   |    9 +-
 .../model/management/PluginManagementInjector.java |    9 +-
 .../apache/maven/model/merge/MavenModelMerger.java |  620 ++--
 .../normalization/DefaultModelNormalizer.java      |   81 +-
 .../maven/model/normalization/ModelNormalizer.java |   11 +-
 .../model/path/DefaultModelPathTranslator.java     |   68 +-
 .../model/path/DefaultModelUrlNormalizer.java      |   44 +-
 .../maven/model/path/DefaultPathTranslator.java    |   34 +-
 .../maven/model/path/DefaultUrlNormalizer.java     |   46 +-
 .../maven/model/path/ModelPathTranslator.java      |   12 +-
 .../maven/model/path/ModelUrlNormalizer.java       |   11 +-
 .../apache/maven/model/path/PathTranslator.java    |   11 +-
 .../ProfileActivationFilePathInterpolator.java     |   54 +-
 .../org/apache/maven/model/path/UrlNormalizer.java |   11 +-
 .../plugin/DefaultPluginConfigurationExpander.java |   39 +-
 .../plugin/DefaultReportConfigurationExpander.java |   28 +-
 .../model/plugin/DefaultReportingConverter.java    |  218 +-
 .../model/plugin/LifecycleBindingsInjector.java    |    9 +-
 .../model/plugin/PluginConfigurationExpander.java  |    9 +-
 .../model/plugin/ReportConfigurationExpander.java  |    9 +-
 .../maven/model/plugin/ReportingConverter.java     |    9 +-
 .../profile/DefaultProfileActivationContext.java   |  128 +-
 .../model/profile/DefaultProfileInjector.java      |  222 +-
 .../model/profile/DefaultProfileSelector.java      |  101 +-
 .../model/profile/ProfileActivationContext.java    |    7 +-
 .../maven/model/profile/ProfileInjector.java       |    9 +-
 .../maven/model/profile/ProfileSelector.java       |   12 +-
 .../profile/activation/FileProfileActivator.java   |   71 +-
 .../activation/JdkVersionProfileActivator.java     |  168 +-
 .../OperatingSystemProfileActivator.java           |   94 +-
 .../model/profile/activation/ProfileActivator.java |   11 +-
 .../activation/PropertyProfileActivator.java       |   68 +-
 .../resolution/InvalidRepositoryException.java     |   21 +-
 .../maven/model/resolution/ModelResolver.java      |   22 +-
 .../resolution/UnresolvableModelException.java     |   46 +-
 .../model/resolution/WorkspaceModelResolver.java   |   19 +-
 .../model/superpom/DefaultSuperPomProvider.java    |   55 +-
 .../maven/model/superpom/SuperPomProvider.java     |    9 +-
 .../model/validation/DefaultModelValidator.java    | 1879 +++++++-----
 .../maven/model/validation/ModelValidator.java     |   13 +-
 .../model/building/ComplexActivationTest.java      |   44 +-
 .../building/DefaultModelBuilderFactoryTest.java   |   88 +-
 .../model/building/DefaultModelBuilderTest.java    |  148 +-
 .../maven/model/building/FileModelSourceTest.java  |   54 +-
 .../model/building/SimpleProblemCollector.java     |   43 +-
 .../DefaultInheritanceAssemblerTest.java           |  183 +-
 .../AbstractModelInterpolatorTest.java             |  430 ++-
 .../interpolation/MavenBuildTimestampTest.java     |   19 +-
 .../StringSearchModelInterpolatorTest.java         |  520 ++--
 .../maven/model/merge/MavenModelMergerTest.java    |   80 +-
 .../maven/model/path/DefaultUrlNormalizerTest.java |   65 +-
 .../activation/AbstractProfileActivatorTest.java   |   44 +-
 .../activation/FileProfileActivatorTest.java       |  103 +-
 .../activation/JdkVersionProfileActivatorTest.java |  208 +-
 .../activation/PropertyProfileActivatorTest.java   |  150 +-
 .../validation/DefaultModelValidatorTest.java      |  922 +++---
 maven-model/pom.xml                                |    2 -
 .../apache/maven/model/io/xpp3/package-info.java   |   19 -
 .../org/apache/maven/model/merge/ModelMerger.java  | 3175 ++++++++------------
 .../org/apache/maven/model/merge/package-info.java |   19 -
 .../java/org/apache/maven/model/package-info.java  |   19 -
 .../org/apache/maven/model/ActivationFileTest.java |   28 +-
 .../org/apache/maven/model/ActivationOSTest.java   |   28 +-
 .../apache/maven/model/ActivationPropertyTest.java |   28 +-
 .../org/apache/maven/model/ActivationTest.java     |   28 +-
 .../java/org/apache/maven/model/BuildTest.java     |   28 +-
 .../org/apache/maven/model/CiManagementTest.java   |   28 +-
 .../org/apache/maven/model/ContributorTest.java    |   28 +-
 .../maven/model/DependencyManagementTest.java      |   28 +-
 .../org/apache/maven/model/DependencyTest.java     |   28 +-
 .../maven/model/DeploymentRepositoryTest.java      |   28 +-
 .../java/org/apache/maven/model/DeveloperTest.java |   28 +-
 .../maven/model/DistributionManagementTest.java    |   28 +-
 .../java/org/apache/maven/model/ExclusionTest.java |   28 +-
 .../java/org/apache/maven/model/ExtensionTest.java |   28 +-
 .../apache/maven/model/IssueManagementTest.java    |   28 +-
 .../java/org/apache/maven/model/LicenseTest.java   |   28 +-
 .../org/apache/maven/model/MailingListTest.java    |   28 +-
 .../java/org/apache/maven/model/ModelTest.java     |   28 +-
 .../java/org/apache/maven/model/NotifierTest.java  |   28 +-
 .../org/apache/maven/model/OrganizationTest.java   |   28 +-
 .../java/org/apache/maven/model/ParentTest.java    |   28 +-
 .../maven/model/PluginConfigurationTest.java       |   28 +-
 .../apache/maven/model/PluginContainerTest.java    |   28 +-
 .../apache/maven/model/PluginExecutionTest.java    |   28 +-
 .../apache/maven/model/PluginManagementTest.java   |   28 +-
 .../java/org/apache/maven/model/PluginTest.java    |   28 +-
 .../org/apache/maven/model/PrerequisitesTest.java  |   28 +-
 .../java/org/apache/maven/model/ProfileTest.java   |   28 +-
 .../org/apache/maven/model/RelocationTest.java     |   28 +-
 .../org/apache/maven/model/ReportPluginTest.java   |   28 +-
 .../java/org/apache/maven/model/ReportSetTest.java |   28 +-
 .../java/org/apache/maven/model/ReportingTest.java |   28 +-
 .../apache/maven/model/RepositoryPolicyTest.java   |   28 +-
 .../org/apache/maven/model/RepositoryTest.java     |   28 +-
 .../java/org/apache/maven/model/ResourceTest.java  |   28 +-
 .../test/java/org/apache/maven/model/ScmTest.java  |   28 +-
 .../test/java/org/apache/maven/model/SiteTest.java |   28 +-
 .../apache/maven/model/merge/ModelMergerTest.java  |    6 +-
 maven-plugin-api/pom.xml                           |    6 +-
 .../apache/maven/monitor/logging/DefaultLog.java   |   97 +-
 .../java/org/apache/maven/plugin/AbstractMojo.java |   29 +-
 .../plugin/AbstractMojoExecutionException.java     |   30 +-
 .../org/apache/maven/plugin/ContextEnabled.java    |   10 +-
 .../main/java/org/apache/maven/plugin/Mojo.java    |   13 +-
 .../maven/plugin/MojoExecutionException.java       |   35 +-
 .../apache/maven/plugin/MojoFailureException.java  |   30 +-
 .../apache/maven/plugin/MojoNotFoundException.java |   50 +-
 .../DuplicateMojoDescriptorException.java          |   21 +-
 .../descriptor/DuplicateParameterException.java    |   15 +-
 .../descriptor/InvalidParameterException.java      |   21 +-
 .../InvalidPluginDescriptorException.java          |   20 +-
 .../maven/plugin/descriptor/MojoDescriptor.java    |  271 +-
 .../apache/maven/plugin/descriptor/Parameter.java  |  105 +-
 .../maven/plugin/descriptor/PluginDescriptor.java  |  277 +-
 .../plugin/descriptor/PluginDescriptorBuilder.java |  296 +-
 .../maven/plugin/descriptor/Requirement.java       |   34 +-
 .../java/org/apache/maven/plugin/logging/Log.java  |   34 +-
 .../maven/plugin/logging/SystemStreamLog.java      |  114 +-
 .../descriptor/PluginDescriptorBuilderTest.java    |  184 +-
 .../plugin/lifecycle/LifecycleXpp3ReaderTest.java  |   16 +-
 maven-repository-metadata/pom.xml                  |    2 -
 .../artifact/repository/metadata/MetadataTest.java |  300 +-
 maven-resolver-provider/pom.xml                    |    3 -
 .../internal/ArtifactDescriptorReaderDelegate.java |  122 +-
 .../internal/ArtifactDescriptorUtils.java          |   38 +-
 .../internal/DefaultArtifactDescriptorReader.java  |  351 +--
 .../repository/internal/DefaultModelCache.java     |   57 +-
 .../internal/DefaultModelCacheFactory.java         |   13 +-
 .../repository/internal/DefaultModelResolver.java  |  214 +-
 .../internal/DefaultVersionRangeResolver.java      |  285 +-
 .../internal/DefaultVersionResolver.java           |  541 ++--
 .../repository/internal/LocalSnapshotMetadata.java |  108 +-
 .../internal/LocalSnapshotMetadataGenerator.java   |   44 +-
 .../maven/repository/internal/MavenMetadata.java   |   93 +-
 .../internal/MavenRepositorySystemUtils.java       |   79 +-
 .../repository/internal/MavenResolverModule.java   |   56 +-
 .../repository/internal/MavenSnapshotMetadata.java |   53 +-
 .../repository/internal/MavenWorkspaceReader.java  |   12 +-
 .../repository/internal/ModelCacheFactory.java     |    9 +-
 .../maven/repository/internal/PluginsMetadata.java |   64 +-
 .../internal/PluginsMetadataGenerator.java         |  108 +-
 .../internal/PluginsMetadataGeneratorFactory.java  |   25 +-
 .../repository/internal/RelocatedArtifact.java     |  105 +-
 .../internal/RemoteSnapshotMetadata.java           |  104 +-
 .../internal/RemoteSnapshotMetadataGenerator.java  |   64 +-
 .../internal/SnapshotMetadataGeneratorFactory.java |   25 +-
 .../repository/internal/VersionsMetadata.java      |   88 +-
 .../internal/VersionsMetadataGenerator.java        |   58 +-
 .../internal/VersionsMetadataGeneratorFactory.java |   25 +-
 .../maven/repository/internal/package-info.java    |   19 -
 .../internal/AbstractRepositoryTestCase.java       |   51 +-
 .../DefaultArtifactDescriptorReaderTest.java       |   45 +-
 .../internal/DefaultModelResolverTest.java         |  237 +-
 .../internal/DefaultVersionResolverTest.java       |   69 +-
 .../internal/MavenRepositorySystemUtilsTest.java   |   23 +-
 .../internal/RemoteSnapshotMetadataTest.java       |   44 +-
 .../repository/internal/RepositorySystemTest.java  |  227 +-
 .../internal/util/ConsoleRepositoryListener.java   |  110 +-
 .../internal/util/ConsoleTransferListener.java     |  154 +-
 maven-settings-builder/pom.xml                     |    2 -
 .../settings/building/DefaultSettingsBuilder.java  |  228 +-
 .../building/DefaultSettingsBuilderFactory.java    |   23 +-
 .../building/DefaultSettingsBuildingRequest.java   |   73 +-
 .../building/DefaultSettingsBuildingResult.java    |   20 +-
 .../settings/building/DefaultSettingsProblem.java  |   93 +-
 .../building/DefaultSettingsProblemCollector.java  |   30 +-
 .../settings/building/FileSettingsSource.java      |   18 +-
 .../maven/settings/building/SettingsBuilder.java   |   10 +-
 .../building/SettingsBuildingException.java        |   49 +-
 .../settings/building/SettingsBuildingRequest.java |   19 +-
 .../settings/building/SettingsBuildingResult.java  |    8 +-
 .../maven/settings/building/SettingsProblem.java   |   12 +-
 .../building/SettingsProblemCollector.java         |    9 +-
 .../maven/settings/building/SettingsSource.java    |   10 +-
 .../settings/building/StringSettingsSource.java    |   23 +-
 .../maven/settings/building/UrlSettingsSource.java |   19 +-
 .../settings/crypto/DefaultSettingsDecrypter.java  |   92 +-
 .../crypto/DefaultSettingsDecryptionRequest.java   |   47 +-
 .../crypto/DefaultSettingsDecryptionResult.java    |   37 +-
 .../maven/settings/crypto/SettingsDecrypter.java   |    9 +-
 .../settings/crypto/SettingsDecryptionRequest.java |   12 +-
 .../settings/crypto/SettingsDecryptionResult.java  |    8 +-
 .../maven/settings/io/DefaultSettingsReader.java   |   59 +-
 .../maven/settings/io/DefaultSettingsWriter.java   |   49 +-
 .../maven/settings/io/SettingsParseException.java  |   26 +-
 .../apache/maven/settings/io/SettingsReader.java   |   17 +-
 .../apache/maven/settings/io/SettingsWriter.java   |   17 +-
 .../maven/settings/merge/MavenSettingsMerger.java  |   93 +-
 .../validation/DefaultSettingsValidator.java       |  274 +-
 .../settings/validation/SettingsValidator.java     |   11 +-
 .../DefaultSettingsBuilderFactoryTest.java         |   30 +-
 .../validation/DefaultSettingsValidatorTest.java   |  231 +-
 maven-settings/pom.xml                             |    2 -
 .../org/apache/maven/settings/RuntimeInfo.java     |   27 +-
 maven-slf4j-provider/pom.xml                       |   10 +-
 .../java/org/slf4j/impl/MavenSimpleLogger.java     |   91 +-
 .../org/slf4j/impl/MavenSimpleLoggerFactory.java   |   23 +-
 .../java/org/slf4j/impl/StaticLoggerBinder.java    |   21 +-
 pom.xml                                            |  182 +-
 987 files changed, 41880 insertions(+), 58310 deletions(-)
 copy maven-core/src/test/resources/projects/build.properties => .git-blame-ignore-revs (91%)