This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
from 84e2d8ad3f [MNG-8084] Include repository metadata in the API (#1465)
new 9be08ccef8 [MNG-8084] Include lifecycle in the API
new d075fe7e85 [MNG-8084] New model builder and resolver provider
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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 +
.../maven/api/plugin/annotations/Execute.java | 13 +-
.../api/plugin/annotations/LifecyclePhase.java | 74 -
.../apache/maven/api/plugin/annotations/Mojo.java | 2 +-
.../LifecycleRegistry.java} | 24 +-
.../ModelBuilder.java} | 26 +-
.../maven/api/services/ModelBuilderException.java | 80 +
.../maven/api/services/ModelBuilderRequest.java | 454 +++++
.../maven/api/services/ModelBuilderResult.java | 125 ++
.../apache/maven/api/services/ModelProblem.java | 57 +
.../maven/api/services/ModelProblemCollector.java | 67 +
.../apache/maven/api/services/ModelResolver.java | 125 ++
.../maven/api/services/ModelResolverException.java | 114 ++
.../org/apache/maven/api/services/ModelSource.java | 59 +
.../{TypeRegistry.java => ModelTransformer.java} | 27 +-
.../api/services/ModelTransformerContext.java | 66 +
...ry.java => ModelTransformerContextBuilder.java} | 28 +-
.../ModelTransformerException.java} | 19 +-
.../org/apache/maven/api/services/PathSource.java | 33 +-
.../java/org/apache/maven/api/services/Source.java | 3 +-
.../apache/maven/api/services/TypeRegistry.java | 5 +-
api/maven-api-metadata/pom.xml | 2 +-
.../apache/maven/api/spi/LifecycleProvider.java} | 16 +-
.../java/org/apache/maven/api/spi/ModelParser.java | 5 +
maven-api-impl/pom.xml | 86 +-
.../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 | 22 +-
.../maven/api/services/model/ModelCache.java | 38 +
.../api/services/model/ModelInterpolator.java | 48 +
.../maven/api/services/model/ModelNormalizer.java | 50 +
.../api/services/model/ModelPathTranslator.java | 29 +-
.../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 | 33 +-
.../maven/api/services/model/PathTranslator.java | 27 +-
.../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 | 3 +-
.../maven/internal/impl/DefaultArtifact.java | 1 -
.../maven/internal/impl/DefaultDependency.java | 1 -
.../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/DefaultSettingsBuilder.java | 40 +-
.../internal/impl/DefaultSuperPomProvider.java | 80 +
.../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 | 4 +
.../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 | 1410 ++++++++++++++++
.../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 +++
.../internal/impl/model/DefaultModelValidator.java | 1742 ++++++++++++++++++++
.../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 | 233 +++
.../model/profile/PackagingProfileActivator.java | 57 +
.../model/profile/PropertyProfileActivator.java | 104 ++
.../resolver/ArtifactDescriptorReaderDelegate.java | 149 ++
.../impl/resolver/ArtifactDescriptorUtils.java | 94 ++
.../resolver/DefaultArtifactDescriptorReader.java | 299 ++++
.../internal/impl/resolver/DefaultModelCache.java | 210 +++
.../impl/resolver/DefaultModelResolver.java | 251 +++
.../resolver}/DefaultVersionRangeResolver.java | 37 +-
.../impl/resolver}/DefaultVersionResolver.java | 34 +-
.../resolver/DefaultVersionSchemeProvider.java | 33 +-
.../impl/resolver/LocalSnapshotMetadata.java | 142 ++
.../resolver/LocalSnapshotMetadataGenerator.java | 77 +
.../resolver/MavenArtifactRelocationSource.java | 45 +
.../internal/impl/resolver}/MavenMetadata.java | 25 +-
.../impl/resolver/MavenSessionBuilderSupplier.java | 152 ++
.../impl/resolver/MavenSnapshotMetadata.java | 84 +
.../impl/resolver/MavenWorkspaceReader.java | 18 +-
.../internal/impl/resolver/PluginsMetadata.java | 115 ++
.../impl/resolver/PluginsMetadataGenerator.java | 145 ++
.../resolver/PluginsMetadataGeneratorFactory.java | 52 +
.../internal/impl/resolver/RelocatedArtifact.java | 174 ++
.../impl/resolver/RemoteSnapshotMetadata.java | 148 ++
.../resolver/RemoteSnapshotMetadataGenerator.java | 108 ++
.../resolver/SnapshotMetadataGeneratorFactory.java | 52 +
.../internal/impl/resolver/VersionsMetadata.java | 133 ++
.../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 | 67 +
.../resources/org/apache/maven/model/pom-4.0.0.xml | 0
.../resources/org/apache/maven/model/pom-4.1.0.xml | 0
.../internal/impl/model}/MavenModelMergerTest.java | 2 +-
.../maven/internal/impl/standalone/ApiRunner.java | 194 ++-
.../maven/internal/impl/standalone/DiTest.java | 29 +-
.../impl/standalone/RepositorySystemSupplier.java | 113 +-
.../impl/standalone/TestApiStandalone.java | 9 +
.../metadata/AbstractRepositoryMetadata.java | 4 +-
.../metadata/DefaultRepositoryMetadataManager.java | 4 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 14 +-
.../AbstractArtifactComponentTestCase.java | 4 +-
.../project/AbstractMavenProjectTestCase.java | 17 +
.../project/EmptyLifecycleBindingsInjector.java | 163 ++
.../project/EmptyLifecyclePluginAnalyzer.java | 67 -
.../maven/project/ProjectClasspathTestType.java | 2 +-
.../apache/maven/project/TestProjectBuilder.java | 4 +-
.../AbstractProjectInheritanceTestCase.java | 9 +
.../inheritance/t02/ProjectInheritanceTest.java | 3 +
.../repository/LegacyRepositorySystemTest.java | 9 +-
.../META-INF/maven/org.apache.maven.api.di.Inject | 1 +
.../maven/project/AbstractMavenProjectTestCase.xml | 9 -
maven-core/pom.xml | 1 +
.../main/java/org/apache/maven/DefaultMaven.java | 2 +-
.../main/java/org/apache/maven/ReactorReader.java | 6 +-
.../metadata/io/DefaultMetadataReader.java | 1 +
.../execution/DefaultMavenExecutionRequest.java | 3 +-
.../DefaultRepositorySystemSessionFactory.java | 9 +-
.../LegacyRepositorySystemSessionExtender.java | 7 +-
.../internal/impl/DefaultLifecycleRegistry.java | 235 +++
.../internal/impl/DefaultPackagingRegistry.java | 38 +-
.../apache/maven/internal/impl/DefaultSession.java | 33 +-
.../maven/internal/impl/DefaultSessionFactory.java | 9 +-
.../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 | 194 ++-
.../impl/DefaultConsumerPomBuilder.java | 167 +-
.../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 -
.../plugin/DefaultLifecycleBindingsInjector.java | 6 +-
.../DefaultPluginDependenciesResolver.java | 7 +-
.../project/DefaultModelBuildingListener.java | 49 +-
.../maven/project/DefaultProjectBuilder.java | 551 +++++--
.../DefaultProjectDependenciesResolver.java | 11 +-
.../org/apache/maven/project/ProjectBuilder.java | 13 +
.../apache/maven/project/ProjectModelResolver.java | 13 +-
.../org/apache/maven/project/ReactorModelPool.java | 2 +-
.../resolver/MavenChainedWorkspaceReader.java | 4 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 16 +-
.../java/org/apache/maven/DefaultMavenTest.java | 6 +-
.../java/org/apache/maven/MavenTestHelper.java | 36 +
.../org/apache/maven/internal/impl/TestApi.java | 1 -
.../transformation/AbstractRepositoryTestCase.java | 18 +-
.../impl/ConsumerPomBuilderTest.java | 6 +
.../maven/lifecycle/DefaultLifecyclesTest.java | 5 +-
.../internal/stub/DefaultLifecyclesStub.java | 4 +-
.../org/apache/maven/model/ModelBuilderTest.java | 22 +-
.../project/AbstractMavenProjectTestCase.java | 19 +
.../project/EmptyLifecycleBindingsInjector.java | 163 ++
.../apache/maven/project/PomConstructionTest.java | 4 +-
.../settings/PomConstructionWithSettingsTest.java | 3 +-
.../META-INF/maven/org.apache.maven.api.di.Inject | 1 +
.../org/apache/maven/di/impl/InjectorImpl.java | 52 +-
.../main/java/org/apache/maven/di/impl/Types.java | 20 +-
.../internal/BootstrapCoreExtensionManager.java | 65 +-
maven-model-builder/pom.xml | 4 +
.../model/building/DefaultModelProcessor.java | 3 +-
.../apache/maven/model/locator/ModelLocator.java | 5 +-
.../apache/maven/model/merge/MavenModelMerger.java | 594 +------
maven-model/pom.xml | 21 +-
maven-repository-metadata/pom.xml | 20 +-
.../metadata/io/xpp3/MetadataXpp3Reader.java | 2 +-
.../metadata/io/xpp3/MetadataXpp3Writer.java | 2 +-
.../artifact/repository/metadata/MetadataTest.java | 4 +-
.../internal/DefaultVersionRangeResolver.java | 2 +-
.../internal/DefaultVersionResolver.java | 2 +-
.../maven/repository/internal/MavenMetadata.java | 4 +-
.../maven/internal/xml/XmlNodeStaxBuilder.java | 7 +
221 files changed, 17346 insertions(+), 1902 deletions(-)
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
api/maven-api-core/src/main/java/org/apache/maven/api/{MetadataStorage.java =>
services/LifecycleRegistry.java} (65%)
copy
api/maven-api-core/src/main/java/org/apache/maven/api/{MetadataStorage.java =>
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
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
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
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/ModelSource.java
copy
api/maven-api-core/src/main/java/org/apache/maven/api/services/{TypeRegistry.java
=> ModelTransformer.java} (57%)
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/{TypeRegistry.java
=> ModelTransformerContextBuilder.java} (55%)
copy
api/maven-api-core/src/main/java/org/apache/maven/api/{MetadataStorage.java =>
services/ModelTransformerException.java} (73%)
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/MetadataStorage.java =>
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelBuildingListener.java
(58%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelCache.java
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/TypeRegistry.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/TypeRegistry.java
=>
maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelVersionProcessor.java
(52%)
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/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
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java
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
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/Os.java
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/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%)
rename
maven-core/src/main/java/org/apache/maven/lifecycle/providers/WrapperLifecycleProvider.java
=>
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionSchemeProvider.java
(51%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadata.java
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
(85%)
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
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%)
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadata.java
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
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadata.java
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
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadata.java
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
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultTypeProvider.java
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%)
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%)
rename
api/maven-api-core/src/main/java/org/apache/maven/api/MetadataStorage.java =>
maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/DiTest.java
(58%)
rename
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
(90%)
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
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
create mode 100644
maven-core/src/test/java/org/apache/maven/MavenTestHelper.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
