This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/validate-ids-across-settings-and-model
in repository https://gitbox.apache.org/repos/asf/maven.git
discard 885cee2970 only emit warnings when urls differ
discard bee5ef434b improve message, validate pluginRepositories as well
discard 4f3fe699f1 [MNG-8050] emit warn in case of repo id clashes between
settings and POM
add 84e2d8ad3f [MNG-8084] Include repository metadata in the API (#1465)
add 9be08ccef8 [MNG-8084] Include lifecycle in the API
add d075fe7e85 [MNG-8084] New model builder and resolver provider
add fba2542aa2 [MNG-4840] fix requiredMavenVersion description #1445
add ce87334f68 Fix split package in org.apache.maven.api.di
add 860310b692 [MNG-8043] document new default types, replacing artifact
handlers
add aae74dfbee [MNG-8082] Exceptions of proxied SessionScoped components
are not working correctly (#1449)
add 52c5659b25 Fix nasty concurrency issue in AbstractSession (#1479)
add 3bad5068a2 [MNG-8025] Restore compatibility (#1467)
add 5d15093532 [MNG-8105] Upgrade JLine to 3.26.0 (#1478)
add 529d80a169 [MNG-8102] Upgrade Parent to 42 (#1476)
add d0f05ffccf [MNG-8103] Upgrade default plugin bindings (#1475)
add 41d1950a6d [MNG-8084] add di & api-impl
add 5d1cfd47f3 Cleanup dependencies
add 728473c54f Deprecate test classes in maven-compat which cause lots of
warnings
add 9fc4f49917 Add missing dep
add 81e2b3c1ee Make Maven 4.0.0 be beta-1 (#1484)
add 31d2dc1815 [MNG-8105] Upgrade JLine to 3.26.1 (#1485)
add 854589b131 [MNG-8106] Fix metadata merge (#1481)
add 8d6bf5f033 Fix terminal usage in mvnd (#1486)
add 6fddd97513 Use the new resolver provider (#1483)
add 8fbbbc978c [MNG-8107] Update Resolver 2.0.0-alpha-11 (#1488)
add 9ee77a8cb2 [MNG-8084] add API metadata group
add b35aa27b80 Maven Resolver 2.0.0-alpha-11 is released
add 6814ba386d Simplified redundant judgment (#1489)
add 399f8b4ffc [MNG-8081] interpolate available properties during default
profile selection (Maven 4.x) (#1446)
add 64e9447926 Fix consumer pom builder (#1491)
add febfd2b5c9 Resolver updates (#1495)
add 7451585a19 Fix reactor loading problems (#1497)
add d19f28e793 Upgrade plexus-interactivity-api to 1.3 (#1498)
add 3d3137920a [MNG-8073] Adding ASL2 header to XSD files (#1499)
add d8199bf3b9 [MNG-8084] add system properties to test (#1500)
add ba52bfe600 [MNG-8117] Maven PluginVersionResolver improvement (#1502)
add 0564480440 [MNG-8118] Merge BOM exclusions instead of overwriting
(#1504)
add c363e272ea Bump org.xmlunit:xmlunit-core from 2.9.1 to 2.10.0 (#1494)
add 583667a869 [MNG-8015] Adjustments in new API related to PathType
(#1501)
add 9442164ab2 [MNG-8108] Fix problem when building the consumer pom
(#1506)
add d296927de2 [MNG-8119] Remove build section from profiles in the
consumer pom (#1503)
add bde81a4d85 [MNG-8108] Fix problem when building the consumer pom
add 828faba819 [maven-release-plugin] prepare release maven-4.0.0-beta-2
add 9acbed7d4f [maven-release-plugin] prepare for next development
iteration
add 71bb3bdf95 [MNG-8121] Fix NPE in metadata merge (#1509)
add accbbcf5a0 Fix packaging not found (#1507)
add fe5de5ad2b Enable dependabot (#1513)
add de4e335216 Remove dependabot limit / schedule
add ac4debe8f5 Fix distribution licenses (#1525)
add 1d0ca63fbd [MNG-8050] emit warn in case of repo id clashes between
settings and POM
add f32e0cbc9c improve message, validate pluginRepositories as well
add 312983bc2d only emit warnings when urls differ
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 (885cee2970)
\
N -- N -- N
refs/heads/feature/validate-ids-across-settings-and-model (312983bc2d)
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:
.github/dependabot.yml | 28 +
apache-maven/pom.xml | 7 +-
.../main/appended-resources/META-INF/LICENSE.vm | 17 +-
.../appended-resources/licenses/BSD-2-Clause.txt | 24 +
.../appended-resources/licenses/BSD-3-Clause.txt | 28 +
...txt => CDDL+GPLv2-with-classpath-exception.txt} | 0
.../licenses/{MIT-slf4j-api-2.0.11.txt => MIT.txt} | 3 +-
...nized-aopalliance-1.0.txt => Public-Domain.txt} | 0
.../licenses/unrecognized-asm-9.6.txt | 27 -
.../licenses/unrecognized-jline-3.25.1.txt | 35 -
.../licenses/unrecognized-stax2-api-4.2.1.txt | 3 -
api/maven-api-core/pom.xml | 6 +-
.../java/org/apache/maven/api/JavaPathType.java | 129 +-
.../maven/api/{Packaging.java => Lifecycle.java} | 52 +-
.../main/java/org/apache/maven/api/Packaging.java | 8 +-
.../main/java/org/apache/maven/api/PathScope.java | 1 +
.../main/java/org/apache/maven/api/PathType.java | 23 +-
.../main/java/org/apache/maven/api/Session.java | 4 +
.../main/java/org/apache/maven/api/Toolchain.java | 5 +-
.../src/main/java/org/apache/maven/api/Type.java | 18 +
.../main/java/org/apache/maven/api/plugin/Log.java | 68 +-
.../java/org/apache/maven/api/plugin/Mojo.java | 13 +-
.../org/apache/maven/api/plugin/MojoException.java | 12 +-
.../maven/api/plugin/annotations/Execute.java | 13 +-
.../api/plugin/annotations/LifecyclePhase.java | 74 -
.../apache/maven/api/plugin/annotations/Mojo.java | 2 +-
.../api/services/DependencyResolverResult.java | 30 +-
.../maven/api/services/LifecycleRegistry.java | 22 +-
.../apache/maven/api/services/LookupException.java | 5 +
.../apache/maven/api/services/ModelBuilder.java | 24 +-
.../maven/api/services/ModelBuilderException.java | 80 ++
.../maven/api/services/ModelBuilderRequest.java | 494 +++++++
.../maven/api/services/ModelBuilderResult.java | 125 ++
.../{RepositoryFactory.java => ModelCache.java} | 28 +-
.../apache/maven/api/services/ModelProblem.java | 57 +
.../maven/api/services/ModelProblemCollector.java | 67 +
.../ModelRepositoryHolder.java} | 24 +-
.../apache/maven/api/services/ModelResolver.java | 85 ++
.../maven/api/services/ModelResolverException.java | 114 ++
.../{RepositoryFactory.java => ModelSource.java} | 37 +-
...epositoryFactory.java => ModelTransformer.java} | 30 +-
.../api/services/ModelTransformerContext.java | 66 +
...on.java => ModelTransformerContextBuilder.java} | 27 +-
.../ModelTransformerException.java} | 19 +-
.../org/apache/maven/api/services/PathSource.java | 38 +-
.../maven/api/services/RepositoryFactory.java | 9 +
.../java/org/apache/maven/api/services/Source.java | 3 +-
.../apache/maven/api/services/TypeRegistry.java | 5 +-
api/maven-api-di/pom.xml | 9 +-
.../apache/maven/api/di/MojoExecutionScoped.java | 0
.../org/apache/maven/api/di/SessionScoped.java | 0
api/maven-api-meta/pom.xml | 2 +-
.../pom.xml | 39 +-
.../apache/maven/api/metadata/package-info.java | 5 +
.../maven-api-metadata}/src/main/mdo/metadata.mdo | 2 +-
.../maven-api-metadata}/src/site/apt/index.apt | 16 +-
.../src/site/site.xml | 0
api/maven-api-model/pom.xml | 6 +-
api/maven-api-model/src/main/mdo/maven.mdo | 79 +-
api/maven-api-plugin/pom.xml | 6 +-
api/maven-api-plugin/src/main/mdo/plugin.mdo | 4 +-
api/maven-api-settings/pom.xml | 12 +-
api/maven-api-spi/pom.xml | 2 +-
.../apache/maven/api/spi/LifecycleProvider.java} | 16 +-
.../java/org/apache/maven/api/spi/ModelParser.java | 5 +
api/maven-api-toolchain/pom.xml | 6 +-
api/maven-api-xml/pom.xml | 2 +-
api/pom.xml | 3 +-
maven-api-impl/pom.xml | 147 +-
.../model/DependencyManagementImporter.java | 47 +
.../model/DependencyManagementInjector.java | 40 +
.../api/services/model/InheritanceAssembler.java | 44 +
.../services/model/LifecycleBindingsInjector.java | 42 +
.../api/services/model/ModelBuildingEvent.java | 55 +
.../api/services/model/ModelBuildingListener.java | 27 +-
.../api/services/model/ModelInterpolator.java | 48 +
.../maven/api/services/model/ModelNormalizer.java | 50 +
.../api/services/model/ModelPathTranslator.java | 34 +-
.../maven/api/services/model/ModelProcessor.java | 52 +
.../api/services/model/ModelUrlNormalizer.java | 25 +-
.../maven/api/services/model/ModelValidator.java | 61 +
.../api/services/model/ModelVersionParser.java | 70 +
.../api/services/model/ModelVersionProcessor.java | 32 +-
.../maven/api/services/model/PathTranslator.java | 34 +-
.../model/PluginConfigurationExpander.java | 39 +
.../services/model/PluginManagementInjector.java | 40 +
.../services/model/ProfileActivationContext.java | 81 ++
.../maven/api/services/model/ProfileActivator.java | 54 +
.../maven/api/services/model/ProfileInjector.java | 59 +
.../maven/api/services/model/ProfileSelector.java | 45 +
.../maven/api/services/model/RootLocator.java | 67 +
.../maven/api/services/model/UrlNormalizer.java | 21 +-
.../api/services/model/WorkspaceModelResolver.java | 18 +-
.../maven/internal/impl/AbstractSession.java | 17 +-
.../maven/internal/impl/DefaultArtifact.java | 1 -
.../internal/impl/DefaultArtifactResolver.java | 4 +-
.../maven/internal/impl/DefaultBuilderProblem.java | 2 +-
.../maven/internal/impl/DefaultDependency.java | 1 -
.../impl/DefaultDependencyResolverResult.java | 38 +-
.../internal/impl/DefaultLocalRepository.java | 2 +-
.../impl/DefaultLocalRepositoryManager.java | 2 +-
.../internal/impl/DefaultModelUrlNormalizer.java | 80 ++
.../internal/impl/DefaultModelVersionParser.java | 288 ++++
.../internal/impl/DefaultModelXmlFactory.java | 3 +-
.../impl/DefaultPluginConfigurationExpander.java | 107 ++
.../internal/impl/DefaultRemoteRepository.java | 5 +
.../internal/impl/DefaultRepositoryFactory.java | 32 +-
.../internal/impl/DefaultSettingsBuilder.java | 40 +-
.../internal/impl/DefaultSuperPomProvider.java | 80 ++
.../maven/internal/impl/DefaultTransport.java | 4 +-
.../maven/internal/impl/DefaultUrlNormalizer.java | 61 +
.../maven/internal/impl/DefaultVersionParser.java | 2 +-
.../internal/impl/DefaultVersionRangeResolver.java | 5 +-
.../internal/impl/ExtensibleEnumRegistries.java | 36 +-
.../maven/internal/impl/InternalSession.java | 10 +
.../maven/internal/impl/PathModularization.java | 41 +-
.../internal/impl/PathModularizationCache.java | 56 +-
.../java/org/apache/maven/internal/impl/Utils.java | 3 +
.../internal/impl/model/BuildModelTransformer.java | 199 +++
.../model/DefaultDependencyManagementImporter.java | 147 ++
.../model/DefaultDependencyManagementInjector.java | 119 ++
.../impl/model/DefaultInheritanceAssembler.java | 330 +++++
.../model}/DefaultLifecycleBindingsInjector.java | 110 +-
.../internal/impl/model/DefaultModelBuilder.java | 1464 ++++++++++++++++++++
.../impl/model/DefaultModelBuilderResult.java | 222 +++
.../impl/model/DefaultModelBuildingEvent.java | 22 +-
.../impl/model/DefaultModelInterpolator.java | 485 +++++++
.../impl/model/DefaultModelNormalizer.java | 147 ++
.../impl/model/DefaultModelPathTranslator.java | 121 ++
.../internal/impl/model/DefaultModelProblem.java | 182 +++
.../impl/model/DefaultModelProblemCollector.java | 198 +++
.../internal/impl/model/DefaultModelProcessor.java | 142 ++
.../impl/model/DefaultModelTransformerContext.java | 141 ++
.../DefaultModelTransformerContextBuilder.java | 231 +++
.../impl/model}/DefaultModelValidator.java | 421 ++++--
.../impl/model/DefaultModelVersionProcessor.java | 63 +
.../internal/impl/model/DefaultPathTranslator.java | 58 +
.../model/DefaultPluginManagementInjector.java | 128 ++
.../model/DefaultProfileActivationContext.java | 190 +++
.../impl/model/DefaultProfileInjector.java | 242 ++++
.../impl/model/DefaultProfileSelector.java | 123 ++
.../internal/impl/model/DefaultRootLocator.java | 61 +
.../internal/impl/model/FileToRawModelMerger.java | 216 +++
.../apache/maven/internal/impl/model/Graph.java | 96 ++
.../internal/impl/model/MavenBuildTimestamp.java | 80 ++
.../internal/impl/model}/MavenModelMerger.java | 27 +-
.../maven/internal/impl/model/ModelData.java | 38 +-
.../internal/impl/model/ModelProblemUtils.java | 133 ++
.../ProfileActivationFilePathInterpolator.java | 100 ++
.../apache/maven/internal/impl/model/Result.java | 230 +++
.../impl/model/profile/FileProfileActivator.java | 123 ++
.../model/profile/JdkVersionProfileActivator.java | 188 +++
.../profile/OperatingSystemProfileActivator.java | 154 ++
.../maven/internal/impl/model/profile}/Os.java | 2 +-
.../model/profile/PackagingProfileActivator.java | 57 +
.../model/profile/PropertyProfileActivator.java | 104 ++
.../resolver/ArtifactDescriptorReaderDelegate.java | 149 ++
.../impl/resolver/ArtifactDescriptorUtils.java | 94 ++
.../resolver/DefaultArtifactDescriptorReader.java | 308 ++++
.../internal/impl/resolver/DefaultModelCache.java | 220 +++
.../resolver/DefaultModelRepositoryHolder.java | 112 ++
.../impl/resolver/DefaultModelResolver.java | 91 ++
.../resolver}/DefaultVersionRangeResolver.java | 37 +-
.../impl/resolver}/DefaultVersionResolver.java | 34 +-
.../impl/resolver}/LocalSnapshotMetadata.java | 50 +-
.../resolver/LocalSnapshotMetadataGenerator.java | 77 +
.../resolver/MavenArtifactRelocationSource.java | 45 +
.../internal/impl/resolver}/MavenMetadata.java | 26 +-
.../impl/resolver/MavenSessionBuilderSupplier.java | 152 ++
.../impl/resolver/MavenSnapshotMetadata.java | 84 ++
.../internal/impl/resolver/MavenVersionScheme.java | 53 +
.../impl/resolver/MavenWorkspaceReader.java | 18 +-
.../internal/impl/resolver}/PluginsMetadata.java | 29 +-
.../impl/resolver/PluginsMetadataGenerator.java | 145 ++
.../resolver/PluginsMetadataGeneratorFactory.java | 52 +
.../internal/impl/resolver/RelocatedArtifact.java | 174 +++
.../impl/resolver}/RemoteSnapshotMetadata.java | 46 +-
.../resolver/RemoteSnapshotMetadataGenerator.java | 108 ++
.../resolver/SnapshotMetadataGeneratorFactory.java | 52 +
.../internal/impl/resolver}/VersionsMetadata.java | 51 +-
.../impl/resolver/VersionsMetadataGenerator.java | 103 ++
.../resolver/VersionsMetadataGeneratorFactory.java | 52 +
.../resolver/artifact/FatArtifactTraverser.java | 67 +
.../resolver/artifact/MavenArtifactProperties.java | 56 +
.../maven/internal/impl/resolver/package-info.java | 6 +
...ributionManagementArtifactRelocationSource.java | 76 +
.../UserPropertiesArtifactRelocationSource.java | 215 +++
.../scopes/Maven3ScopeManagerConfiguration.java | 169 +++
.../scopes/Maven4ScopeManagerConfiguration.java | 197 +++
.../internal/impl/resolver/type/DefaultType.java | 114 ++
.../impl/resolver}/type/DefaultTypeProvider.java | 6 +-
.../resources/org/apache/maven/model/pom-4.0.0.xml | 0
.../resources/org/apache/maven/model/pom-4.1.0.xml | 0
.../src/site/site.xml | 0
.../internal/impl/model}/MavenModelMergerTest.java | 2 +-
.../impl/resolver/DefaultModelResolverTest.java | 207 +++
.../maven/internal/impl/standalone/ApiRunner.java | 196 ++-
.../maven/internal/impl/standalone/DiTest.java | 22 +-
.../impl/standalone/RepositorySystemSupplier.java | 147 +-
.../impl/standalone/TestApiStandalone.java | 13 +
.../remote-repo/org/apache/apache/1/apache-1.pom | 0
.../org/apache/apache/maven-metadata.xml | 0
.../org/apache/maven/its/a/0.1/a-0.1.jar | Bin
.../org/apache/maven/its/a/0.1/a-0.1.pom | 0
.../org/apache/maven/its/a/maven-metadata.xml | 0
.../org/apache/maven/its/b/0.1/b-0.1.jar | Bin
.../org/apache/maven/its/b/0.1/b-0.1.pom | 0
.../org/apache/maven/its/b/maven-metadata.xml | 0
.../org/apache/maven/its/bom/0.1/bom-0.1.pom | 0
.../org/apache/maven/its/bom/maven-metadata.xml | 0
.../org/apache/maven/its/parent/0.1/parent-0.1.pom | 0
.../org/apache/maven/its/parent/maven-metadata.xml | 0
.../maven-it-plugin/0.1/maven-it-plugin-0.1.jar | Bin
.../maven-it-plugin/0.1/maven-it-plugin-0.1.pom | 70 +
.../maven/its/plugins/maven-it-plugin/0.1/pom.xml | 70 +
.../its/plugins/maven-it-plugin/maven-metadata.xml | 0
.../apache/maven/its/plugins/maven-metadata.xml | 0
.../maven-plugin-api/2.0/maven-plugin-api-2.0.jar | Bin
.../maven-plugin-api/2.0/maven-plugin-api-2.0.pom | 0
.../org/apache/maven/maven/2.0/maven-2.0.pom | 0
.../0.1/maven-clean-plugin-0.1.jar | Bin
.../0.1/maven-clean-plugin-0.1.pom | 70 +
.../plugins/maven-clean-plugin/maven-metadata.xml | 0
.../0.1/maven-compiler-plugin-0.1.jar | Bin
.../0.1/maven-compiler-plugin-0.1.pom | 70 +
.../maven-compiler-plugin/maven-metadata.xml | 0
.../0.1/maven-deploy-plugin-0.1.jar | Bin
.../0.1/maven-deploy-plugin-0.1.pom | 70 +
.../plugins/maven-deploy-plugin/maven-metadata.xml | 0
.../0.1/maven-install-plugin-0.1.jar | Bin
.../0.1/maven-install-plugin-0.1.pom | 70 +
.../maven-install-plugin/maven-metadata.xml | 0
.../maven-jar-plugin/0.1/maven-jar-plugin-0.1.jar | Bin
.../maven-jar-plugin/0.1/maven-jar-plugin-0.1.pom | 70 +
.../plugins/maven-jar-plugin/maven-metadata.xml | 0
.../org/apache/maven/plugins/maven-metadata.xml | 0
.../0.1/maven-plugin-plugin-0.1.jar | Bin
.../0.1/maven-plugin-plugin-0.1.pom | 70 +
.../plugins/maven-plugin-plugin/maven-metadata.xml | 0
.../0.1/maven-resources-plugin-0.1.jar | Bin
.../0.1/maven-resources-plugin-0.1.pom | 70 +
.../maven-resources-plugin/maven-metadata.xml | 0
.../0.1/maven-surefire-plugin-0.1.jar | Bin
.../0.1/maven-surefire-plugin-0.1.pom | 70 +
.../maven-surefire-plugin/maven-metadata.xml | 0
.../plexus/plexus-utils/1.1/plexus-utils-1.1.jar | Bin
.../plexus/plexus-utils/1.1/plexus-utils-1.1.pom | 0
maven-artifact/pom.xml | 10 +-
maven-bom/pom.xml | 4 +-
maven-builder-support/pom.xml | 9 +-
maven-compat/pom.xml | 8 +-
.../metadata/AbstractRepositoryMetadata.java | 4 +-
.../metadata/DefaultRepositoryMetadataManager.java | 4 +-
.../artifact/resolver/DefaultArtifactResolver.java | 1 +
.../maven/AbstractCoreMavenComponentTestCase.java | 27 +-
.../maven/ProjectDependenciesResolverTest.java | 1 +
.../test/java/org/apache/maven/SimpleLookup.java | 68 +
.../AbstractArtifactComponentTestCase.java | 5 +-
.../artifact/deployer/ArtifactDeployerTest.java | 1 +
.../deployer/SimpleArtifactMetadataSource.java | 1 +
.../factory/DefaultArtifactFactoryTest.java | 1 +
.../artifact/installer/ArtifactInstallerTest.java | 1 +
.../metadata/SwitchableMetadataSource.java | 1 +
.../artifact/metadata/TestMetadataSource.java | 1 +
.../repository/MavenArtifactRepositoryTest.java | 1 +
.../artifact/resolver/ArtifactResolverTest.java | 1 +
.../resolver/DefaultArtifactResolverTest.java | 6 +-
.../maven/artifact/resolver/TestFileWagon.java | 1 +
.../resolver/filter/OrArtifactFilterTest.java | 1 +
.../maven/artifact/testutils/TestFileManager.java | 1 +
.../transform/TransformationManagerTest.java | 1 +
.../manager/DefaultProfileManagerTest.java | 1 +
.../project/AbstractMavenProjectTestCase.java | 20 +
.../maven/project/ClasspathArtifactResolver.java | 1 +
.../project/EmptyLifecycleBindingsInjector.java | 164 +++
.../maven/project/EmptyLifecycleExecutor.java | 1 +
.../project/EmptyLifecyclePluginAnalyzer.java | 67 -
.../project/LegacyLocalRepositoryManager.java | 1 +
.../maven/project/ProjectClasspathTestType.java | 3 +-
.../apache/maven/project/TestArtifactResolver.java | 1 +
.../maven/project/TestMavenRepositorySystem.java | 1 +
.../apache/maven/project/TestModelResolver.java | 22 +-
.../apache/maven/project/TestProjectBuilder.java | 8 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 8 +-
.../project/artifact/MavenMetadataSourceTest.java | 1 +
.../AbstractProjectInheritanceTestCase.java | 10 +
.../inheritance/t00/ProjectInheritanceTest.java | 1 +
.../inheritance/t01/ProjectInheritanceTest.java | 1 +
.../inheritance/t02/ProjectInheritanceTest.java | 4 +
.../inheritance/t03/ProjectInheritanceTest.java | 1 +
.../inheritance/t04/ProjectInheritanceTest.java | 1 +
.../inheritance/t05/ProjectInheritanceTest.java | 1 +
.../inheritance/t06/ProjectInheritanceTest.java | 1 +
.../inheritance/t07/ProjectInheritanceTest.java | 1 +
.../inheritance/t08/ProjectInheritanceTest.java | 1 +
.../inheritance/t09/ProjectInheritanceTest.java | 1 +
.../inheritance/t10/ProjectInheritanceTest.java | 1 +
.../inheritance/t11/ProjectInheritanceTest.java | 1 +
.../inheritance/t12/ProjectInheritanceTest.java | 1 +
.../inheritance/t12scm/ProjectInheritanceTest.java | 1 +
.../project/path/DefaultPathTranslatorTest.java | 2 +-
.../repository/DefaultMirrorSelectorTest.java | 1 +
.../repository/LegacyRepositorySystemTest.java | 23 +-
.../maven/repository/MirrorProcessorTest.java | 1 +
.../maven/repository/TestArtifactHandler.java | 1 +
.../maven/repository/TestRepositorySystem.java | 1 +
.../legacy/DefaultUpdateCheckManagerTest.java | 1 +
.../repository/legacy/DefaultWagonManagerTest.java | 1 +
.../legacy/LegacyRepositorySystemTest.java | 1 +
.../resolver/DefaultArtifactCollectorTest.java | 1 +
.../conflict/AbstractConflictResolverTest.java | 1 +
.../conflict/FarthestConflictResolverTest.java | 1 +
.../conflict/NearestConflictResolverTest.java | 1 +
.../conflict/NewestConflictResolverTest.java | 1 +
.../conflict/OldestConflictResolverTest.java | 1 +
.../DefaultClasspathTransformationTestType.java | 1 +
.../DefaultGraphConflictResolutionPolicyTest.java | 1 +
.../metadata/DefaultGraphConflictResolverTest.java | 1 +
.../repository/metadata/TestMetadataSource.java | 1 +
.../META-INF/maven/org.apache.maven.api.di.Inject | 1 +
.../maven/project/AbstractMavenProjectTestCase.xml | 9 -
maven-core/pom.xml | 23 +-
.../main/java/org/apache/maven/DefaultMaven.java | 2 +-
.../main/java/org/apache/maven/ReactorReader.java | 8 +-
.../metadata/io/DefaultMetadataReader.java | 1 +
.../execution/DefaultMavenExecutionRequest.java | 3 +-
.../DefaultRepositorySystemSessionFactory.java | 11 +-
.../LegacyRepositorySystemSessionExtender.java | 7 +-
.../internal/impl/DefaultArtifactManager.java | 6 +-
.../internal/impl/DefaultDependencyResolver.java | 4 +-
.../internal/impl/DefaultLifecycleRegistry.java | 235 ++++
.../internal/impl/DefaultPackagingRegistry.java | 38 +-
.../apache/maven/internal/impl/DefaultProject.java | 8 +-
.../apache/maven/internal/impl/DefaultSession.java | 55 +-
.../maven/internal/impl/DefaultSessionFactory.java | 13 +-
.../maven/internal/impl/DefaultTypeRegistry.java | 2 +-
.../apache/maven/internal/impl/EventSpyImpl.java | 3 +-
.../java/org/apache/maven/internal/impl/Graph.java | 145 ++
.../org/apache/maven/internal/impl/Lifecycles.java | 73 +
.../maven/internal/impl/SisuDiBridgeModule.java | 155 ++-
.../impl/DefaultConsumerPomBuilder.java | 222 +--
.../apache/maven/lifecycle/DefaultLifecycles.java | 16 +-
.../java/org/apache/maven/lifecycle/Lifecycle.java | 29 +-
.../providers/CleanLifecycleProvider.java | 47 -
.../providers/DefaultLifecycleProvider.java | 70 -
.../lifecycle/providers/SiteLifecycleProvider.java | 48 -
.../providers/WrapperLifecycleProvider.java | 47 -
.../AbstractLifecycleMappingProvider.java | 8 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 6 +-
.../plugin/internal/DefaultMavenPluginManager.java | 4 +-
.../DefaultPluginDependenciesResolver.java | 7 +-
.../internal/PluginDependenciesResolver.java | 9 +
.../internal/DefaultPluginVersionResolver.java | 54 +-
.../project/DefaultModelBuildingListener.java | 49 +-
.../maven/project/DefaultProjectBuilder.java | 597 +++++---
.../DefaultProjectDependenciesResolver.java | 11 +-
.../org/apache/maven/project/ProjectBuilder.java | 13 +
.../apache/maven/project/ProjectModelResolver.java | 63 +-
.../org/apache/maven/project/ReactorModelPool.java | 2 +-
.../resolver/MavenChainedWorkspaceReader.java | 4 +-
.../maven/session/scope/internal/SessionScope.java | 6 +-
.../META-INF/maven/org.apache.maven.api.di.Inject | 70 +
maven-core/src/site/apt/artifact-handlers.apt | 12 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 16 +-
.../java/org/apache/maven/DefaultMavenTest.java | 6 +-
.../java/org/apache/maven/MavenTestHelper.java | 51 +
.../test/java/org/apache/maven/SimpleLookup.java | 68 +
.../org/apache/maven/internal/impl/TestApi.java | 12 +-
.../transformation/AbstractRepositoryTestCase.java | 33 +-
.../impl/ConsumerPomArtifactTransformerTest.java | 28 +
.../impl/ConsumerPomBuilderTest.java | 34 +
.../maven/lifecycle/DefaultLifecyclesTest.java | 5 +-
.../internal/stub/DefaultLifecyclesStub.java | 4 +-
.../org/apache/maven/model/ModelBuilderTest.java | 34 +-
.../project/AbstractMavenProjectTestCase.java | 19 +
.../project/EmptyLifecycleBindingsInjector.java | 163 +++
.../apache/maven/project/PomConstructionTest.java | 4 +-
.../maven/repository/TestRepositoryConnector.java | 4 +-
.../maven/session/scope/SessionScopeProxyTest.java | 9 +
.../settings/PomConstructionWithSettingsTest.java | 3 +-
.../META-INF/maven/org.apache.maven.api.di.Inject | 1 +
.../resources/projects/transform/jar/after.pom | 35 +
.../resources/projects/transform/jar/before.pom | 74 +
maven-di/pom.xml | 12 +-
.../org/apache/maven/di/impl/InjectorImpl.java | 56 +-
.../main/java/org/apache/maven/di/impl/Types.java | 20 +-
maven-embedder/pom.xml | 12 +-
.../java/org/apache/maven/cli/CleanArgument.java | 19 +-
.../internal/BootstrapCoreExtensionManager.java | 71 +-
.../src/main/java/org/fusesource/jansi/Ansi.java | 6 +-
maven-jline/pom.xml | 6 +-
.../java/org/apache/maven/jline/MessageUtils.java | 20 +-
maven-model-builder/pom.xml | 38 +-
.../maven/model/building/DefaultModelBuilder.java | 121 +-
.../model/building/DefaultModelProcessor.java | 3 +-
.../apache/maven/model/locator/ModelLocator.java | 5 +-
.../apache/maven/model/merge/MavenModelMerger.java | 594 +-------
.../model/validation/DefaultModelValidator.java | 281 +++-
.../src/main/java/org/apache/maven/utils/Os.java | 10 +-
.../validation/DefaultModelValidatorTest.java | 56 +-
...le-activation-file-with-allowed-expressions.xml | 18 +
...tivation-property-with-project-expressions.xml} | 33 +-
maven-model/pom.xml | 44 +-
maven-plugin-api/pom.xml | 32 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 9 +-
.../plugin/descriptor/PluginDescriptorBuilder.java | 3 +
maven-plugin-api/src/site/apt/index.apt | 4 +-
maven-repository-metadata/pom.xml | 47 +-
.../metadata/io/xpp3/MetadataXpp3Reader.java | 2 +-
.../metadata/io/xpp3/MetadataXpp3Writer.java | 2 +-
.../artifact/repository/metadata/MetadataTest.java | 6 +-
maven-resolver-provider/pom.xml | 39 +-
.../internal/DefaultVersionRangeResolver.java | 2 +-
.../internal/DefaultVersionResolver.java | 2 +-
.../repository/internal/LocalSnapshotMetadata.java | 5 +
.../maven/repository/internal/MavenMetadata.java | 4 +-
.../internal/MavenRepositorySystemSupplier.java | 111 +-
.../maven/repository/internal/PluginsMetadata.java | 7 +-
.../internal/RemoteSnapshotMetadata.java | 5 +
.../repository/internal/VersionsMetadata.java | 5 +
.../internal/type/DefaultTypeProvider.java | 22 +
.../src/site/apt/dependency-types.apt | 74 +
maven-resolver-provider/src/site/apt/index.apt | 2 +
.../resources/META-INF/sisu/javax.inject.Named | 12 +
maven-settings-builder/pom.xml | 20 +-
maven-settings/pom.xml | 18 +-
maven-slf4j-provider/pom.xml | 13 +-
maven-slf4j-wrapper/pom.xml | 13 +-
maven-toolchain-builder/pom.xml | 21 +-
maven-toolchain-model/pom.xml | 8 +-
maven-xml-impl/pom.xml | 12 +-
.../maven/internal/xml/XmlNodeStaxBuilder.java | 7 +
pom.xml | 105 +-
src/site/resources/images/maven-deps.svg | 886 ++++++------
src/site/xdoc/index.xml | 2 +-
src/site/xdoc/maven-deps.odg | Bin 35992 -> 37932 bytes
436 files changed, 18920 insertions(+), 3335 deletions(-)
create mode 100644 .github/dependabot.yml
create mode 100644
apache-maven/src/main/appended-resources/licenses/BSD-2-Clause.txt
create mode 100644
apache-maven/src/main/appended-resources/licenses/BSD-3-Clause.txt
rename
apache-maven/src/main/appended-resources/licenses/{unrecognized-javax.annotation-api-1.3.2.txt
=> CDDL+GPLv2-with-classpath-exception.txt} (100%)
rename
apache-maven/src/main/appended-resources/licenses/{MIT-slf4j-api-2.0.11.txt =>
MIT.txt} (95%)
rename
apache-maven/src/main/appended-resources/licenses/{unrecognized-aopalliance-1.0.txt
=> Public-Domain.txt} (100%)
delete mode 100644
apache-maven/src/main/appended-resources/licenses/unrecognized-asm-9.6.txt
delete mode 100644
apache-maven/src/main/appended-resources/licenses/unrecognized-jline-3.25.1.txt
delete mode 100644
apache-maven/src/main/appended-resources/licenses/unrecognized-stax2-api-4.2.1.txt
copy api/maven-api-core/src/main/java/org/apache/maven/api/{Packaging.java =>
Lifecycle.java} (57%)
delete mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/LifecyclePhase.java
copy
maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
=>
api/maven-api-core/src/main/java/org/apache/maven/api/services/LifecycleRegistry.java
(65%)
copy
maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
=>
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelBuilder.java
(63%)
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelBuilderException.java
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelBuilderRequest.java
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelBuilderResult.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/services/{RepositoryFactory.java
=> ModelCache.java} (53%)
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelProblem.java
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelProblemCollector.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/{MetadataStorage.java =>
services/ModelRepositoryHolder.java} (70%)
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelResolver.java
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelResolverException.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/services/{RepositoryFactory.java
=> ModelSource.java} (50%)
copy
api/maven-api-core/src/main/java/org/apache/maven/api/services/{RepositoryFactory.java
=> ModelTransformer.java} (58%)
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelTransformerContext.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/services/{LookupException.java
=> ModelTransformerContextBuilder.java} (56%)
copy
api/maven-api-core/src/main/java/org/apache/maven/api/{MetadataStorage.java =>
services/ModelTransformerException.java} (73%)
rename api/{maven-api-core =>
maven-api-di}/src/main/java/org/apache/maven/api/di/MojoExecutionScoped.java
(100%)
rename api/{maven-api-core =>
maven-api-di}/src/main/java/org/apache/maven/api/di/SessionScoped.java (100%)
copy api/{maven-api-settings => maven-api-metadata}/pom.xml (68%)
create mode 100644
api/maven-api-metadata/src/main/java/org/apache/maven/api/metadata/package-info.java
rename {maven-repository-metadata =>
api/maven-api-metadata}/src/main/mdo/metadata.mdo (99%)
copy {maven-resolver-provider =>
api/maven-api-metadata}/src/site/apt/index.apt (65%)
copy api/{maven-api-core => maven-api-metadata}/src/site/site.xml (100%)
copy
api/{maven-api-core/src/main/java/org/apache/maven/api/MetadataStorage.java =>
maven-api-spi/src/main/java/org/apache/maven/api/spi/LifecycleProvider.java}
(80%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/DependencyManagementImporter.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/DependencyManagementInjector.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/InheritanceAssembler.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/LifecycleBindingsInjector.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelBuildingEvent.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/services/LookupException.java
=>
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelBuildingListener.java
(59%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelInterpolator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelNormalizer.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/services/RepositoryFactory.java
=>
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelPathTranslator.java
(50%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelProcessor.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/services/TypeRegistry.java
=>
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelUrlNormalizer.java
(57%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelValidator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelVersionParser.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/services/LookupException.java
=>
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelVersionProcessor.java
(53%)
copy
api/maven-api-core/src/main/java/org/apache/maven/api/services/RepositoryFactory.java
=>
maven-api-impl/src/main/java/org/apache/maven/api/services/model/PathTranslator.java
(53%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/PluginConfigurationExpander.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/PluginManagementInjector.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ProfileActivationContext.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ProfileActivator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ProfileInjector.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ProfileSelector.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/RootLocator.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/MetadataStorage.java =>
maven-api-impl/src/main/java/org/apache/maven/api/services/model/UrlNormalizer.java
(72%)
copy
api/maven-api-core/src/main/java/org/apache/maven/api/MetadataStorage.java =>
maven-api-impl/src/main/java/org/apache/maven/api/services/model/WorkspaceModelResolver.java
(70%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelUrlNormalizer.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultPluginConfigurationExpander.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultSuperPomProvider.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultUrlNormalizer.java
rename {maven-core =>
maven-api-impl}/src/main/java/org/apache/maven/internal/impl/ExtensibleEnumRegistries.java
(68%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/BuildModelTransformer.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporter.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementInjector.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInheritanceAssembler.java
copy {maven-core/src/main/java/org/apache/maven/model/plugin =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model}/DefaultLifecycleBindingsInjector.java
(57%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilderResult.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/MetadataStorage.java =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuildingEvent.java
(60%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelInterpolator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelNormalizer.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelPathTranslator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProblem.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProblemCollector.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProcessor.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelTransformerContext.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelTransformerContextBuilder.java
copy {maven-model-builder/src/main/java/org/apache/maven/model/validation =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model}/DefaultModelValidator.java
(83%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelVersionProcessor.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPathTranslator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPluginManagementInjector.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileActivationContext.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileInjector.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileSelector.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultRootLocator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/FileToRawModelMerger.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/Graph.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/MavenBuildTimestamp.java
copy {maven-model-builder/src/main/java/org/apache/maven/model/merge =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model}/MavenModelMerger.java
(95%)
rename
maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSuperPomProvider.java
=>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/ModelData.java
(51%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/ModelProblemUtils.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/ProfileActivationFilePathInterpolator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/Result.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/FileProfileActivator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/JdkVersionProfileActivator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/OperatingSystemProfileActivator.java
copy {maven-model-builder/src/main/java/org/apache/maven/utils =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile}/Os.java
(99%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PackagingProfileActivator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PropertyProfileActivator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorReaderDelegate.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorUtils.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelCache.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelRepositoryHolder.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java
copy
{maven-resolver-provider/src/main/java/org/apache/maven/repository/internal =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver}/DefaultVersionRangeResolver.java
(92%)
copy
{maven-resolver-provider/src/main/java/org/apache/maven/repository/internal =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver}/DefaultVersionResolver.java
(95%)
copy
{maven-resolver-provider/src/main/java/org/apache/maven/repository/internal =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver}/LocalSnapshotMetadata.java
(70%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadataGenerator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenArtifactRelocationSource.java
copy
{maven-resolver-provider/src/main/java/org/apache/maven/repository/internal =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver}/MavenMetadata.java
(84%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSnapshotMetadata.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenVersionScheme.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/MetadataStorage.java =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenWorkspaceReader.java
(72%)
copy
{maven-resolver-provider/src/main/java/org/apache/maven/repository/internal =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver}/PluginsMetadata.java
(80%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGenerator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGeneratorFactory.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java
copy
{maven-resolver-provider/src/main/java/org/apache/maven/repository/internal =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver}/RemoteSnapshotMetadata.java
(75%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadataGenerator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/SnapshotMetadataGeneratorFactory.java
copy
{maven-resolver-provider/src/main/java/org/apache/maven/repository/internal =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver}/VersionsMetadata.java
(66%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGenerator.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGeneratorFactory.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/FatArtifactTraverser.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/MavenArtifactProperties.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/package-info.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultType.java
copy
{maven-resolver-provider/src/main/java/org/apache/maven/repository/internal =>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver}/type/DefaultTypeProvider.java
(94%)
copy {maven-model-builder =>
maven-api-impl}/src/main/resources/org/apache/maven/model/pom-4.0.0.xml (100%)
copy {maven-model-builder =>
maven-api-impl}/src/main/resources/org/apache/maven/model/pom-4.1.0.xml (100%)
copy {maven-artifact => maven-api-impl}/src/site/site.xml (100%)
rename {maven-model-builder/src/test/java/org/apache/maven/model/merge =>
maven-api-impl/src/test/java/org/apache/maven/internal/impl/model}/MavenModelMergerTest.java
(98%)
create mode 100644
maven-api-impl/src/test/java/org/apache/maven/internal/impl/resolver/DefaultModelResolverTest.java
copy
maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
=>
maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/DiTest.java
(59%)
copy
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSupplier.java
=>
maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/RepositorySystemSupplier.java
(88%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/apache/1/apache-1.pom (100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/apache/maven-metadata.xml (100%)
copy {maven-compat =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar (100%)
copy {maven-compat =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom (100%)
copy {maven-compat =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml
(100%)
copy {maven-compat =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar (100%)
copy {maven-compat =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom (100%)
copy {maven-compat =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/its/bom/0.1/bom-0.1.pom
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/its/bom/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/its/parent/0.1/parent-0.1.pom
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/its/parent/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.jar
(100%)
create mode 100644
maven-api-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.pom
create mode 100644
maven-api-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/pom.xml
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/its/plugins/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/maven/2.0/maven-2.0.pom
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.jar
(100%)
create mode 100644
maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.pom
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.jar
(100%)
create mode 100644
maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.pom
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.jar
(100%)
create mode 100644
maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.pom
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.jar
(100%)
create mode 100644
maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.pom
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.jar
(100%)
create mode 100644
maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.pom
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.jar
(100%)
create mode 100644
maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.pom
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.jar
(100%)
create mode 100644
maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.pom
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.jar
(100%)
create mode 100644
maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.pom
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar
(100%)
copy {maven-core =>
maven-api-impl}/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom
(100%)
create mode 100644
maven-compat/src/test/java/org/apache/maven/SimpleLookup.java
create mode 100644
maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java
delete mode 100644
maven-compat/src/test/java/org/apache/maven/project/EmptyLifecyclePluginAnalyzer.java
rename
api/maven-api-core/src/main/java/org/apache/maven/api/MetadataStorage.java =>
maven-compat/src/test/java/org/apache/maven/project/TestModelResolver.java (76%)
create mode 100644
maven-compat/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject
delete mode 100644
maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml
create mode 100644
maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java
create mode 100644
maven-core/src/main/java/org/apache/maven/internal/impl/Graph.java
create mode 100644
maven-core/src/main/java/org/apache/maven/internal/impl/Lifecycles.java
delete mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/CleanLifecycleProvider.java
delete mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/DefaultLifecycleProvider.java
delete mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/SiteLifecycleProvider.java
delete mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/WrapperLifecycleProvider.java
create mode 100644
maven-core/src/main/resources/META-INF/maven/org.apache.maven.api.di.Inject
create mode 100644
maven-core/src/test/java/org/apache/maven/MavenTestHelper.java
create mode 100644 maven-core/src/test/java/org/apache/maven/SimpleLookup.java
create mode 100644
maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java
create mode 100644
maven-core/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject
create mode 100644
maven-core/src/test/resources/projects/transform/jar/after.pom
create mode 100644
maven-core/src/test/resources/projects/transform/jar/before.pom
copy
maven-model-builder/src/test/resources/poms/validation/raw-model/{profile-activation-file-with-allowed-expressions.xml
=> profile-activation-property-with-project-expressions.xml} (68%)
create mode 100644 maven-resolver-provider/src/site/apt/dependency-types.apt
create mode 100644
maven-resolver-provider/src/test/resources/META-INF/sisu/javax.inject.Named
