From 13ad6376e00aa5eb28f41a84e0dd06bb1f045c2e Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Fri, 25 Oct 2024 14:31:46 +0200 Subject: [PATCH] [MNG-8346] Reorganize subprojects (#1837) Reorganize Maven modules into impl and compat directories --- .../maven-artifact}/pom.xml | 2 + .../org/apache/maven/artifact/Artifact.java | 0 .../apache/maven/artifact/ArtifactUtils.java | 0 .../maven/artifact/DefaultArtifact.java | 0 .../artifact/InvalidArtifactRTException.java | 0 .../artifact/handler/ArtifactHandler.java | 0 .../artifact/metadata/ArtifactMetadata.java | 0 .../repository/ArtifactRepository.java | 0 .../repository/ArtifactRepositoryPolicy.java | 0 .../artifact/repository/Authentication.java | 0 .../layout/ArtifactRepositoryLayout.java | 0 .../layout/ArtifactRepositoryLayout2.java | 0 .../RepositoryMetadataStoreException.java | 0 .../AbstractArtifactResolutionException.java | 0 .../resolver/ArtifactNotFoundException.java | 0 .../resolver/ArtifactResolutionException.java | 0 .../resolver/CyclicDependencyException.java | 0 .../MultipleArtifactsNotFoundException.java | 0 .../resolver/filter/ArtifactFilter.java | 0 .../artifact/versioning/ArtifactVersion.java | 0 .../versioning/ComparableVersion.java | 0 .../versioning/DefaultArtifactVersion.java | 0 .../InvalidVersionSpecificationException.java | 0 .../OverConstrainedVersionException.java | 0 .../artifact/versioning/Restriction.java | 0 .../artifact/versioning/VersionRange.java | 0 .../org/apache/maven/repository/Proxy.java | 0 .../legacy/metadata/ArtifactMetadata.java | 0 .../maven-artifact}/src/site/apt/index.apt | 0 .../maven-artifact}/src/site/site.xml | 0 .../maven/artifact/ArtifactUtilsTest.java | 0 .../maven/artifact/DefaultArtifactTest.java | 0 .../artifact/handler/ArtifactHandlerMock.java | 0 .../versioning/ComparableVersionIT.java | 0 .../versioning/ComparableVersionTest.java | 0 .../DefaultArtifactVersionTest.java | 0 .../artifact/versioning/VersionRangeTest.java | 0 .../maven-builder-support}/pom.xml | 2 + .../apache/maven/building/DefaultProblem.java | 0 .../building/DefaultProblemCollector.java | 0 .../org/apache/maven/building/FileSource.java | 0 .../org/apache/maven/building/Problem.java | 0 .../maven/building/ProblemCollector.java | 0 .../building/ProblemCollectorFactory.java | 0 .../org/apache/maven/building/Source.java | 0 .../apache/maven/building/StringSource.java | 0 .../org/apache/maven/building/UrlSource.java | 0 .../maven-builder-support}/src/site/site.xml | 0 .../building/DefaultProblemCollectorTest.java | 0 .../maven/building/DefaultProblemTest.java | 0 .../apache/maven/building/FileSourceTest.java | 0 .../building/ProblemCollectorFactoryTest.java | 0 .../maven/building/StringSourceTest.java | 0 .../apache/maven/building/UrlSourceTest.java | 0 .../src/test/resources/source.txt | 0 {maven-compat => compat/maven-compat}/pom.xml | 2 + .../apache/maven/ArtifactFilterManager.java | 0 .../maven/ArtifactFilterManagerDelegate.java | 0 .../maven/DefaultArtifactFilterManager.java | 0 .../DefaultProjectDependenciesResolver.java | 0 .../maven/ProjectDependenciesResolver.java | 0 .../maven/artifact/ArtifactScopeEnum.java | 0 .../apache/maven/artifact/ArtifactStatus.java | 0 .../UnknownRepositoryLayoutException.java | 0 .../artifact/deployer/ArtifactDeployer.java | 0 .../deployer/ArtifactDeploymentException.java | 0 .../deployer/DefaultArtifactDeployer.java | 0 .../ArtifactInstallationException.java | 0 .../artifact/installer/ArtifactInstaller.java | 0 .../installer/DefaultArtifactInstaller.java | 0 .../artifact/manager/DefaultWagonManager.java | 0 .../manager/WagonConfigurationException.java | 0 .../maven/artifact/manager/WagonManager.java | 0 .../metadata/AbstractArtifactMetadata.java | 0 .../ArtifactMetadataRetrievalException.java | 0 .../metadata/ArtifactMetadataSource.java | 0 .../artifact/metadata/ResolutionGroup.java | 0 .../repository/ArtifactRepositoryFactory.java | 0 .../repository/DefaultArtifactRepository.java | 0 .../DefaultArtifactRepositoryFactory.java | 0 .../LegacyLocalRepositoryManager.java | 0 .../layout/FlatRepositoryLayout.java | 0 .../metadata/AbstractRepositoryMetadata.java | 0 .../metadata/ArtifactRepositoryMetadata.java | 0 .../DefaultRepositoryMetadataManager.java | 0 .../metadata/GroupRepositoryMetadata.java | 0 .../repository/metadata/MetadataBridge.java | 0 .../repository/metadata/MetadataUtils.java | 0 .../metadata/RepositoryMetadata.java | 0 ...RepositoryMetadataDeploymentException.java | 0 ...positoryMetadataInstallationException.java | 0 .../metadata/RepositoryMetadataManager.java | 0 .../RepositoryMetadataReadException.java | 0 ...RepositoryMetadataResolutionException.java | 0 .../SnapshotArtifactRepositoryMetadata.java | 0 .../artifact/resolver/ArtifactCollector.java | 0 .../resolver/ArtifactResolutionRequest.java | 0 .../resolver/ArtifactResolutionResult.java | 0 .../artifact/resolver/ArtifactResolver.java | 0 .../resolver/DebugResolutionListener.java | 0 .../resolver/DefaultArtifactCollector.java | 0 .../resolver/DefaultArtifactResolver.java | 0 .../DefaultResolutionErrorHandler.java | 0 .../resolver/ResolutionErrorHandler.java | 0 .../artifact/resolver/ResolutionListener.java | 0 .../ResolutionListenerForDepMgmt.java | 0 .../artifact/resolver/ResolutionNode.java | 0 .../resolver/UnresolvedArtifacts.java | 0 .../resolver/WarningResolutionListener.java | 0 .../filter/InversionArtifactFilter.java | 0 .../resolver/filter/OrArtifactFilter.java | 0 .../resolver/filter/TypeArtifactFilter.java | 0 .../versioning/ManagedVersionMap.java | 0 .../execution/DefaultRuntimeInformation.java | 0 .../maven/execution/RuntimeInformation.java | 0 .../apache/maven/plugin/PluginManager.java | 0 .../plugin/internal/DefaultPluginManager.java | 0 .../maven/profiles/DefaultProfileManager.java | 0 .../apache/maven/profiles/ProfileManager.java | 0 .../profiles/ProfilesConversionUtils.java | 0 .../activation/DetectedProfileActivator.java | 0 .../activation/FileProfileActivator.java | 0 .../activation/JdkPrefixProfileActivator.java | 0 .../OperatingSystemProfileActivator.java | 0 .../ProfileActivationException.java | 0 .../profiles/activation/ProfileActivator.java | 0 .../SystemPropertyProfileActivator.java | 0 .../project/DefaultMavenProjectBuilder.java | 0 .../DefaultProjectBuilderConfiguration.java | 0 .../project/InvalidProjectModelException.java | 0 .../maven/project/MavenProjectBuilder.java | 0 .../MissingRepositoryElementException.java | 0 .../org/apache/maven/project/ModelUtils.java | 0 .../project/ProjectBuilderConfiguration.java | 0 .../apache/maven/project/ProjectUtils.java | 0 .../artifact/ActiveProjectArtifact.java | 0 .../artifact/DefaultMavenMetadataCache.java | 0 .../artifact/DefaultMetadataSource.java | 0 .../project/artifact/MavenMetadataCache.java | 0 .../project/artifact/MavenMetadataSource.java | 0 .../artifact/ProjectArtifactMetadata.java | 0 .../DefaultModelInheritanceAssembler.java | 0 .../ModelInheritanceAssembler.java | 0 .../AbstractStringBasedModelInterpolator.java | 0 .../BuildTimestampValueSource.java | 0 .../ModelInterpolationException.java | 0 .../interpolation/ModelInterpolator.java | 0 .../PathTranslatingPostProcessor.java | 0 .../RegexBasedModelInterpolator.java | 0 .../StringSearchModelInterpolator.java | 0 .../project/path/DefaultPathTranslator.java | 0 .../maven/project/path/PathTranslator.java | 0 .../validation/DefaultModelValidator.java | 0 .../validation/ModelValidationResult.java | 0 .../project/validation/ModelValidator.java | 0 .../maven/reporting/MavenReportException.java | 0 .../ArtifactDoesNotExistException.java | 0 .../repository/ArtifactTransferEvent.java | 0 .../ArtifactTransferFailedException.java | 0 .../repository/ArtifactTransferListener.java | 0 .../repository/ArtifactTransferResource.java | 0 .../repository/DefaultMirrorSelector.java | 0 .../DelegatingLocalArtifactRepository.java | 0 .../repository/LocalArtifactRepository.java | 0 ...LocalRepositoryNotAccessibleException.java | 0 .../repository/MavenArtifactMetadata.java | 0 .../maven/repository/MetadataGraph.java | 0 .../maven/repository/MetadataGraphNode.java | 0 .../repository/MetadataResolutionRequest.java | 0 .../repository/MetadataResolutionResult.java | 0 .../maven/repository/MirrorSelector.java | 0 .../maven/repository/RepositorySystem.java | 0 .../UserLocalArtifactRepository.java | 0 .../repository/VersionNotFoundException.java | 0 .../legacy/ChecksumFailedException.java | 0 .../legacy/DefaultUpdateCheckManager.java | 0 .../legacy/DefaultWagonManager.java | 0 .../legacy/LegacyRepositorySystem.java | 0 .../repository/legacy/MavenArtifact.java | 0 .../legacy/TransferListenerAdapter.java | 0 .../repository/legacy/UpdateCheckManager.java | 0 .../legacy/WagonConfigurationException.java | 0 .../maven/repository/legacy/WagonManager.java | 0 .../metadata/AbstractArtifactMetadata.java | 0 .../ArtifactMetadataRetrievalException.java | 0 .../metadata/ArtifactMetadataSource.java | 0 .../DefaultMetadataResolutionRequest.java | 0 .../metadata/MetadataResolutionRequest.java | 0 .../legacy/metadata/ResolutionGroup.java | 0 .../repository/ArtifactRepositoryFactory.java | 0 .../DefaultArtifactRepositoryFactory.java | 0 .../DefaultLegacyArtifactCollector.java | 0 .../resolver/LegacyArtifactCollector.java | 0 .../resolver/conflict/ConflictResolver.java | 0 .../conflict/ConflictResolverFactory.java | 0 .../ConflictResolverNotFoundException.java | 0 .../conflict/DefaultConflictResolver.java | 0 .../DefaultConflictResolverFactory.java | 0 .../conflict/FarthestConflictResolver.java | 0 .../conflict/NearestConflictResolver.java | 0 .../conflict/NewestConflictResolver.java | 0 .../conflict/OldestConflictResolver.java | 0 .../AbstractVersionTransformation.java | 0 .../transform/ArtifactTransformation.java | 0 .../ArtifactTransformationManager.java | 0 .../DefaultArtifactTransformationManager.java | 0 .../LatestArtifactTransformation.java | 0 .../ReleaseArtifactTransformation.java | 0 .../transform/SnapshotTransformation.java | 0 .../repository/metadata/ArtifactMetadata.java | 0 .../metadata/ClasspathContainer.java | 0 .../metadata/ClasspathTransformation.java | 0 .../DefaultClasspathTransformation.java | 0 .../DefaultGraphConflictResolutionPolicy.java | 0 .../DefaultGraphConflictResolver.java | 0 .../GraphConflictResolutionException.java | 0 .../GraphConflictResolutionPolicy.java | 0 .../metadata/GraphConflictResolver.java | 0 .../repository/metadata/MetadataGraph.java | 0 .../metadata/MetadataGraphEdge.java | 0 .../MetadataGraphTransformationException.java | 0 .../metadata/MetadataGraphVertex.java | 0 .../metadata/MetadataResolution.java | 0 .../metadata/MetadataResolutionException.java | 0 .../metadata/MetadataResolutionRequest.java | 0 .../MetadataResolutionRequestTypeEnum.java | 0 .../metadata/MetadataResolutionResult.java | 0 .../metadata/MetadataRetrievalException.java | 0 .../repository/metadata/MetadataSource.java | 0 .../repository/metadata/MetadataTreeNode.java | 0 .../settings/DefaultMavenSettingsBuilder.java | 0 .../maven/settings/MavenSettingsBuilder.java | 0 .../toolchain/DefaultToolchainsBuilder.java | 0 .../maven/toolchain/ToolchainsBuilder.java | 0 .../ExpressionDocumentationException.java | 0 .../plugin/ExpressionDocumenter.java | 0 .../maven-compat}/src/main/mdo/paramdoc.mdo | 0 .../maven-compat}/src/main/mdo/profiles.mdo | 0 .../plugin-expressions/project.paramdoc.xml | 0 .../plugin-expressions/rootless.paramdoc.xml | 0 .../plugin-expressions/settings.paramdoc.xml | 0 .../maven-compat}/src/site/apt/index.apt | 0 .../maven-compat}/src/site/site.xml | 0 .../AbstractCoreMavenComponentTestCase.java | 0 .../ProjectDependenciesResolverTest.java | 0 .../java/org/apache/maven/SimpleLookup.java | 0 .../AbstractArtifactComponentTestCase.java | 0 .../deployer/ArtifactDeployerTest.java | 0 .../SimpleArtifactMetadataSource.java | 0 .../factory/DefaultArtifactFactoryTest.java | 0 .../installer/ArtifactInstallerTest.java | 0 .../metadata/SwitchableMetadataSource.java | 0 .../artifact/metadata/TestMetadataSource.java | 0 .../MavenArtifactRepositoryTest.java | 0 .../ArtifactResolutionExceptionTest.java | 0 .../resolver/ArtifactResolverTest.java | 0 .../resolver/DefaultArtifactResolverTest.java | 0 .../artifact/resolver/TestFileWagon.java | 0 .../resolver/TestMavenWorkspaceReader.java | 0 .../resolver/TestTransferListener.java | 0 .../filter/AndArtifactFilterTest.java | 0 .../resolver/filter/FilterHashEqualsTest.java | 0 .../resolver/filter/OrArtifactFilterTest.java | 0 .../filter/ScopeArtifactFilterTest.java | 0 .../artifact/testutils/TestFileManager.java | 0 .../transform/TransformationManagerTest.java | 0 .../manager/DefaultProfileManagerTest.java | 0 .../project/AbstractMavenProjectTestCase.java | 0 .../project/ClasspathArtifactResolver.java | 0 .../EmptyLifecycleBindingsInjector.java | 0 .../maven/project/EmptyLifecycleExecutor.java | 0 .../project/LegacyLocalRepositoryManager.java | 0 .../project/ProjectClasspathTestType.java | 0 .../maven/project/TestArtifactResolver.java | 0 .../project/TestMavenRepositorySystem.java | 0 .../maven/project/TestModelResolver.java | 0 .../maven/project/TestProjectBuilder.java | 0 .../DefaultMavenMetadataCacheTest.java | 0 .../artifact/MavenMetadataSourceTest.java | 0 .../AbstractProjectInheritanceTestCase.java | 0 .../t00/ProjectInheritanceTest.java | 0 .../t01/ProjectInheritanceTest.java | 0 .../t02/ProjectInheritanceTest.java | 0 .../t03/ProjectInheritanceTest.java | 0 .../t04/ProjectInheritanceTest.java | 0 .../t05/ProjectInheritanceTest.java | 0 .../t06/ProjectInheritanceTest.java | 0 .../t07/ProjectInheritanceTest.java | 0 .../t08/ProjectInheritanceTest.java | 0 .../t09/ProjectInheritanceTest.java | 0 .../t10/ProjectInheritanceTest.java | 0 .../t11/ProjectInheritanceTest.java | 0 .../t12/ProjectInheritanceTest.java | 0 .../t12scm/ProjectInheritanceTest.java | 0 .../path/DefaultPathTranslatorTest.java | 0 .../repository/DefaultMirrorSelectorTest.java | 0 .../LegacyRepositorySystemTest.java | 0 .../maven/repository/MirrorProcessorTest.java | 0 .../maven/repository/TestArtifactHandler.java | 0 .../repository/TestRepositorySystem.java | 0 .../legacy/DefaultUpdateCheckManagerTest.java | 0 .../legacy/DefaultWagonManagerTest.java | 0 .../legacy/LegacyRepositorySystemTest.java | 0 .../repository/legacy/PerLookupWagon.java | 0 .../maven/repository/legacy/StringWagon.java | 0 .../maven/repository/legacy/WagonA.java | 0 .../maven/repository/legacy/WagonB.java | 0 .../maven/repository/legacy/WagonC.java | 0 .../maven/repository/legacy/WagonMock.java | 0 .../DefaultArtifactCollectorTest.java | 0 .../AbstractConflictResolverTest.java | 0 .../FarthestConflictResolverTest.java | 0 .../conflict/NearestConflictResolverTest.java | 0 .../conflict/NewestConflictResolverTest.java | 0 .../conflict/OldestConflictResolverTest.java | 0 ...efaultClasspathTransformationTestType.java | 0 ...aultGraphConflictResolutionPolicyTest.java | 0 .../DefaultGraphConflictResolverTest.java | 0 .../metadata/TestMetadataSource.java | 0 .../it0063/jdk/jre/placeholder.txt | 0 .../it0063/jdk/lib/tools.jar | Bin .../it0063/pom.xml | 0 .../project-with-exclusions/pom.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 .../repository-system/maven-core-2.1.0.jar | 0 .../maven/org.apache.maven.api.di.Inject | 0 .../artifact-install/artifact-1.0.jar | 0 .../t00/maven/poms/p0-1.0.pom | 0 .../t00/maven/poms/p1-1.0.pom | 0 .../t00/maven/poms/p2-1.0.pom | 0 .../t00/maven/poms/p3-1.0.pom | 0 .../t00/maven/poms/p4-1.0.pom | 0 .../t01/maven.t01/poms/p0-1.0.pom | 0 .../t01/maven.t01/poms/p1-1.0.pom | 0 .../t01/maven.t01/poms/p2-1.0.pom | 0 .../t01/maven.t01/poms/p3-1.0.pom | 0 .../t01/maven.t01/poms/p4-1.0.pom | 0 .../t02/p0/p1/p2/p3/p4/p5/pom.xml | 0 .../t02/p0/p1/p2/p3/p4/pom.xml | 0 .../inheritance-repo/t02/p0/p1/p2/p3/pom.xml | 0 .../inheritance-repo/t02/p0/p1/p2/pom.xml | 0 .../inheritance-repo/t02/p0/p1/pom.xml | 0 .../resources/inheritance-repo/t02/p0/pom.xml | 0 .../inheritance-repo/t03/p0/p1/pom.xml | 0 .../resources/inheritance-repo/t03/p0/pom.xml | 0 .../t04/maven-test/jars/t04-a-1.0.jar | 0 .../t04/maven-test/jars/t04-b-1.0.jar | 0 .../t04/maven-test/jars/t04-b-2.0.jar | 0 .../t04/maven-test/jars/t04-c-1.0.jar | 0 .../t04/maven-test/jars/t04-c-2.0.jar | 0 .../t04/maven-test/poms/t04-a-1.0.pom | 0 .../t04/maven-test/poms/t04-b-1.0.pom | 0 .../t04/maven-test/poms/t04-b-2.0.pom | 0 .../t04/maven-test/poms/t04-c-1.0.pom | 0 .../t04/maven-test/poms/t04-c-2.0.pom | 0 .../inheritance-repo/t04/p0/p1/pom.xml | 0 .../resources/inheritance-repo/t04/p0/pom.xml | 0 .../t05/maven-test/jars/t05-a-1.0.jar | 0 .../t05/maven-test/jars/t05-a-2.0.jar | 0 .../t05/maven-test/jars/t05-b-1.0.jar | 0 .../t05/maven-test/jars/t05-b-1.1.jar | 0 .../t05/maven-test/jars/t05-b-2.0.jar | 0 .../t05/maven-test/jars/t05-c-1.0.jar | 0 .../t05/maven-test/jars/t05-d-1.0.jar | 0 .../t05/maven-test/jars/t05-d-1.1.jar | 0 .../t05/maven-test/jars/t05-d-1.2.jar | 0 .../t05/maven-test/poms/t05-a-1.0.pom | 0 .../t05/maven-test/poms/t05-a-2.0.pom | 0 .../t05/maven-test/poms/t05-b-1.0.pom | 0 .../t05/maven-test/poms/t05-b-1.1.pom | 0 .../t05/maven-test/poms/t05-b-2.0.pom | 0 .../t05/maven-test/poms/t05-c-1.0.pom | 0 .../t05/maven-test/poms/t05-d-1.0.pom | 0 .../t05/maven-test/poms/t05-d-1.1.pom | 0 .../t05/maven-test/poms/t05-d-1.2.pom | 0 .../inheritance-repo/t05/p0/p1/pom.xml | 0 .../resources/inheritance-repo/t05/p0/pom.xml | 0 .../t06/maven-test/jars/t06-a-1.0.jar | 0 .../t06/maven-test/jars/t06-b-1.0.jar | 0 .../t06/maven-test/jars/t06-b-1.1.jar | 0 .../t06/maven-test/jars/t06-c-1.0.jar | 0 .../t06/maven-test/jars/t06-d-1.0.jar | 0 .../t06/maven-test/jars/t06-d-1.1.jar | 0 .../t06/maven-test/jars/t06-d-1.2.jar | 0 .../t06/maven-test/poms/t06-a-1.0.pom | 0 .../t06/maven-test/poms/t06-b-1.0.pom | 0 .../t06/maven-test/poms/t06-b-1.1.pom | 0 .../t06/maven-test/poms/t06-c-1.0.pom | 0 .../t06/maven-test/poms/t06-d-1.0.pom | 0 .../t06/maven-test/poms/t06-d-1.1.pom | 0 .../t06/maven-test/poms/t06-d-1.2.pom | 0 .../inheritance-repo/t06/p0/p1/pom.xml | 0 .../resources/inheritance-repo/t06/p0/pom.xml | 0 .../t07/maven-test/jars/t07-a-1.0.jar | 0 .../t07/maven-test/jars/t07-b-1.0.jar | 0 .../t07/maven-test/jars/t07-b-1.1.jar | 0 .../t07/maven-test/jars/t07-c-1.0.jar | 0 .../t07/maven-test/jars/t07-d-1.0.jar | 0 .../t07/maven-test/jars/t07-d-1.1.jar | 0 .../t07/maven-test/jars/t07-d-1.2.jar | 0 .../t07/maven-test/poms/t07-a-1.0.pom | 0 .../t07/maven-test/poms/t07-b-1.0.pom | 0 .../t07/maven-test/poms/t07-b-1.1.pom | 0 .../t07/maven-test/poms/t07-c-1.0.pom | 0 .../t07/maven-test/poms/t07-d-1.0.pom | 0 .../t07/maven-test/poms/t07-d-1.1.pom | 0 .../t07/maven-test/poms/t07-d-1.2.pom | 0 .../inheritance-repo/t07/p0/p1/pom.xml | 0 .../resources/inheritance-repo/t07/p0/pom.xml | 0 .../t08/maven-test/jars/t08-a-1.0.jar | 0 .../t08/maven-test/jars/t08-b-1.0.jar | 0 .../t08/maven-test/jars/t08-b-1.1.jar | 0 .../t08/maven-test/jars/t08-c-1.0.jar | 0 .../t08/maven-test/jars/t08-d-1.0.jar | 0 .../t08/maven-test/jars/t08-d-1.1.jar | 0 .../t08/maven-test/jars/t08-d-1.2.jar | 0 .../t08/maven-test/poms/t08-a-1.0.pom | 0 .../t08/maven-test/poms/t08-b-1.0.pom | 0 .../t08/maven-test/poms/t08-b-1.1.pom | 0 .../t08/maven-test/poms/t08-c-1.0.pom | 0 .../t08/maven-test/poms/t08-d-1.0.pom | 0 .../t08/maven-test/poms/t08-d-1.1.pom | 0 .../t08/maven-test/poms/t08-d-1.2.pom | 0 .../inheritance-repo/t08/p0/p1/pom.xml | 0 .../resources/inheritance-repo/t08/p0/pom.xml | 0 .../t09/maven-test/jars/t09-a-1.0.jar | 0 .../t09/maven-test/jars/t09-b-1.0.jar | 0 .../t09/maven-test/jars/t09-c-1.0.jar | 0 .../t09/maven-test/jars/t09-d-1.0.jar | 0 .../t09/maven-test/poms/t09-a-1.0.pom | 0 .../t09/maven-test/poms/t09-b-1.0.pom | 0 .../t09/maven-test/poms/t09-c-1.0.pom | 0 .../t09/maven-test/poms/t09-d-1.0.pom | 0 .../inheritance-repo/t09/p0/p1/pom.xml | 0 .../inheritance-repo/t09/p0/p2/pom.xml | 0 .../resources/inheritance-repo/t09/p0/pom.xml | 0 .../t10/maven-test/jars/t10-a-1.0.jar | 0 .../t10/maven-test/jars/t10-b-1.0.jar | 0 .../t10/maven-test/jars/t10-c-1.0.jar | 0 .../t10/maven-test/poms/t10-a-1.0.pom | 0 .../t10/maven-test/poms/t10-b-1.0.pom | 0 .../t10/maven-test/poms/t10-c-1.0.pom | 0 .../inheritance-repo/t10/p0/p1/pom.xml | 0 .../resources/inheritance-repo/t10/p0/pom.xml | 0 .../inheritance-repo/t11/p0/p1/pom.xml | 0 .../resources/inheritance-repo/t11/p0/pom.xml | 0 .../inheritance-repo/t12/p0/p1/pom.xml | 0 .../resources/inheritance-repo/t12/p0/pom.xml | 0 .../t12scm/maven/p0/1.0/p0-1.0.pom | 0 .../t12scm/maven/p1/1.0/p1-1.0.pom | 0 .../t12scm/p0/modules/p1/pom.xml | 0 .../inheritance-repo/t12scm/p0/pom.xml | 0 .../src/test/resources/local-repo/marker.txt | 0 .../maven-test/jars/maven-test-a-1.0.jar | 0 .../maven-test/jars/maven-test-b-1.0.jar | 0 .../maven-test/jars/maven-test-c-1.0.jar | 0 .../maven-test/jars/maven-test-d-1.0.jar | 0 .../maven-test/poms/maven-test-a-1.0.pom | 0 .../maven-test/poms/maven-test-b-1.0.pom | 0 .../maven-test/poms/maven-test-c-1.0.pom | 0 .../maven-test/poms/maven-test-d-1.1.pom | 0 .../maven-test/poms/maven-test-d-1.2.pom | 0 .../jars/maven-snapshot-a-1.0-SNAPSHOT.jar | 0 ...apshot-a-1.0-SNAPSHOT.jar.snapshot-version | 0 .../jars/maven-snapshot-b-1.0-SNAPSHOT.jar | 0 ...apshot-b-1.0-SNAPSHOT.jar.snapshot-version | 0 .../jars/maven-snapshot-e-1.0-SNAPSHOT.jar | 0 ...apshot-e-1.0-SNAPSHOT.jar.snapshot-version | 0 .../maven-test-snapshot-resolving-1.0.pom | 0 .../deployer/ArtifactDeployerTest.xml | 0 .../installer/ArtifactInstallerTest.xml | 0 .../manager/DefaultWagonManagerTest.xml | 0 .../resolver/ArtifactResolverTest.xml | 0 .../resolver/ArtifactUpdatePolicyTest.xml | 0 .../maven-compat}/src/test/resources/pom.xml | 0 .../project-with-scoped-dependencies.xml | 0 .../projects/scope/transitive-compile-dep.xml | 0 .../projects/scope/transitive-default-dep.xml | 0 .../scope/transitive-provided-dep.xml | 0 .../projects/scope/transitive-runtime-dep.xml | 0 .../projects/scope/transitive-test-dep.xml | 0 .../maven-embedder}/pom.xml | 6 ++- .../src/examples/simple-project/pom.xml | 0 .../src/examples/simple-project/settings.xml | 0 .../java/org/apache/maven/embedder/App.java | 0 .../org/apache/maven/embedder/AppTest.java | 0 .../java/org/apache/maven/cli/CLIManager.java | 0 .../apache/maven/cli/CLIReportingUtils.java | 0 .../org/apache/maven/cli/CleanArgument.java | 0 .../java/org/apache/maven/cli/CliRequest.java | 0 .../cli/ExtensionConfigurationModule.java | 0 .../java/org/apache/maven/cli/MavenCli.java | 0 .../org/apache/maven/cli/ResolveFile.java | 0 .../configuration/ConfigurationProcessor.java | 0 .../SettingsXmlConfigurationProcessor.java | 0 .../cli/event/DefaultEventSpyContext.java | 0 .../maven/cli/event/ExecutionEventLogger.java | 0 .../BootstrapCoreExtensionManager.java | 0 .../ExtensionResolutionException.java | 0 .../cli/logging/BaseSlf4jConfiguration.java | 0 .../maven/cli/logging/Slf4jConfiguration.java | 0 .../logging/Slf4jConfigurationFactory.java | 0 .../apache/maven/cli/logging/Slf4jLogger.java | 0 .../maven/cli/logging/Slf4jLoggerManager.java | 0 .../maven/cli/logging/Slf4jStdoutLogger.java | 0 .../cli/logging/impl/Log4j2Configuration.java | 0 .../logging/impl/LogbackConfiguration.java | 0 .../impl/MavenSimpleConfiguration.java | 0 .../UnsupportedSlf4jBindingConfiguration.java | 0 .../maven/cli/props/MavenProperties.java | 0 .../cli/props/MavenPropertiesLoader.java | 0 .../AbstractMavenTransferListener.java | 0 .../ConsoleMavenTransferListener.java | 0 .../maven/cli/transfer/FileSizeFormat.java | 0 .../transfer/QuietMavenTransferListener.java | 0 .../cli/transfer/SimplexTransferListener.java | 0 .../transfer/Slf4jMavenTransferListener.java | 0 .../transfer/TransferResourceIdentifier.java | 0 .../sisu/plexus/PlexusXmlBeanConverter.java | 0 .../main/java/org/fusesource/jansi/Ansi.java | 0 .../maven/slf4j-configuration.properties | 0 .../maven-embedder}/src/site/apt/cli.apt.vm | 0 .../maven-embedder}/src/site/apt/index.apt.vm | 0 .../maven-embedder}/src/site/apt/logging.apt | 0 .../maven-embedder}/src/site/site.xml | 0 .../cli/CLIManagerDocumentationTest.java | 0 .../maven/cli/CLIReportingUtilsTest.java | 0 .../apache/maven/cli/CleanArgumentTest.java | 0 .../org/apache/maven/cli/MavenCliTest.java | 0 .../cli/event/ExecutionEventLoggerTest.java | 0 .../cli/props/MavenPropertiesLoaderTest.java | 0 .../maven/cli/props/MavenPropertiesTest.java | 0 .../ConsoleMavenTransferListenerTest.java | 0 .../cli/transfer/FileSizeFormatTest.java | 0 .../transfer/SimplexTransferListenerTest.java | 0 .../projects/config-illegal/.mvn/maven.config | 0 .../test/projects/config/.mvn/maven.config | 0 .../mavenConfigProperties/.mvn/maven.config | 0 .../projects/root-attribute/child/pom.xml | 0 .../src/test/projects/root-attribute/pom.xml | 0 .../maven-model-builder}/pom.xml | 4 +- .../AbstractModelBuildingListener.java | 0 .../model/building/ArtifactModelSource.java | 0 .../building/BuildModelSourceTransformer.java | 0 .../model/building/DefaultModelBuilder.java | 0 .../building/DefaultModelBuilderFactory.java | 0 .../building/DefaultModelBuildingEvent.java | 0 .../building/DefaultModelBuildingRequest.java | 0 .../building/DefaultModelBuildingResult.java | 0 .../model/building/DefaultModelProblem.java | 0 .../DefaultModelProblemCollector.java | 0 .../model/building/DefaultModelProcessor.java | 0 .../building/DefaultTransformerContext.java | 0 .../DefaultTransformerContextBuilder.java | 0 .../maven/model/building/FileModelSource.java | 0 .../model/building/FileToRawModelMerger.java | 0 .../building/FilterModelBuildingRequest.java | 0 .../apache/maven/model/building/Graph.java | 0 .../maven/model/building/ModelBuilder.java | 0 .../model/building/ModelBuildingEvent.java | 0 .../building/ModelBuildingEventCatapult.java | 0 .../building/ModelBuildingException.java | 0 .../model/building/ModelBuildingListener.java | 0 .../model/building/ModelBuildingRequest.java | 0 .../model/building/ModelBuildingResult.java | 0 .../maven/model/building/ModelCache.java | 0 .../maven/model/building/ModelCacheTag.java | 0 .../maven/model/building/ModelData.java | 0 .../maven/model/building/ModelProblem.java | 0 .../model/building/ModelProblemCollector.java | 0 .../building/ModelProblemCollectorExt.java | 0 .../ModelProblemCollectorRequest.java | 0 .../model/building/ModelProblemUtils.java | 0 .../maven/model/building/ModelProcessor.java | 0 .../maven/model/building/ModelSource.java | 0 .../maven/model/building/ModelSource2.java | 0 .../maven/model/building/ModelSource3.java | 0 .../building/ModelSourceTransformer.java | 0 .../apache/maven/model/building/Result.java | 0 .../model/building/StringModelSource.java | 0 .../model/building/TransformerContext.java | 0 .../building/TransformerContextBuilder.java | 0 .../model/building/TransformerException.java | 0 .../maven/model/building/UrlModelSource.java | 0 .../DefaultDependencyManagementImporter.java | 0 .../DependencyManagementImporter.java | 0 .../DefaultInheritanceAssembler.java | 0 .../inheritance/InheritanceAssembler.java | 0 .../AbstractStringBasedModelInterpolator.java | 0 .../BuildTimestampValueSource.java | 0 .../DefaultModelVersionProcessor.java | 0 .../interpolation/MavenBuildTimestamp.java | 0 .../interpolation/ModelInterpolator.java | 0 .../interpolation/ModelVersionProcessor.java | 0 .../interpolation/ObjectBasedValueSource.java | 0 .../PathTranslatingPostProcessor.java | 0 .../PrefixedObjectValueSource.java | 0 .../ProblemDetectingValueSource.java | 0 .../StringVisitorModelInterpolator.java | 0 .../UrlNormalizingPostProcessor.java | 0 .../interpolation/reflection/ClassMap.java | 0 .../reflection/IntrospectionException.java | 0 .../interpolation/reflection/MethodMap.java | 0 .../reflection/ReflectionValueExtractor.java | 0 .../maven/model/io/DefaultModelReader.java | 0 .../maven/model/io/DefaultModelWriter.java | 0 .../maven/model/io/ModelParseException.java | 0 .../apache/maven/model/io/ModelReader.java | 0 .../apache/maven/model/io/ModelWriter.java | 0 .../model/locator/DefaultModelLocator.java | 0 .../maven/model/locator/ModelLocator.java | 0 .../DefaultDependencyManagementInjector.java | 0 .../DefaultPluginManagementInjector.java | 0 .../DependencyManagementInjector.java | 0 .../management/PluginManagementInjector.java | 0 .../maven/model/merge/MavenModelMerger.java | 0 .../normalization/DefaultModelNormalizer.java | 0 .../model/normalization/ModelNormalizer.java | 0 .../path/DefaultModelPathTranslator.java | 0 .../model/path/DefaultModelUrlNormalizer.java | 0 .../model/path/DefaultPathTranslator.java | 0 .../model/path/DefaultUrlNormalizer.java | 0 .../maven/model/path/ModelPathTranslator.java | 0 .../maven/model/path/ModelUrlNormalizer.java | 0 .../maven/model/path/PathTranslator.java | 0 ...ProfileActivationFilePathInterpolator.java | 0 .../maven/model/path/UrlNormalizer.java | 0 .../DefaultPluginConfigurationExpander.java | 0 .../DefaultReportConfigurationExpander.java | 0 .../plugin/DefaultReportingConverter.java | 0 .../plugin/LifecycleBindingsInjector.java | 0 .../plugin/PluginConfigurationExpander.java | 0 .../plugin/ReportConfigurationExpander.java | 0 .../model/plugin/ReportingConverter.java | 0 .../DefaultProfileActivationContext.java | 0 .../model/profile/DefaultProfileInjector.java | 0 .../model/profile/DefaultProfileSelector.java | 0 .../profile/ProfileActivationContext.java | 0 .../maven/model/profile/ProfileInjector.java | 0 .../maven/model/profile/ProfileSelector.java | 0 .../activation/FileProfileActivator.java | 0 .../JdkVersionProfileActivator.java | 0 .../OperatingSystemProfileActivator.java | 0 .../activation/PackagingProfileActivator.java | 0 .../profile/activation/ProfileActivator.java | 0 .../activation/PropertyProfileActivator.java | 0 .../InvalidRepositoryException.java | 0 .../maven/model/resolution/ModelResolver.java | 0 .../UnresolvableModelException.java | 0 .../resolution/WorkspaceModelResolver.java | 0 .../maven/model/root/DefaultRootLocator.java | 0 .../apache/maven/model/root/RootLocator.java | 0 .../superpom/DefaultSuperPomProvider.java | 0 .../model/superpom/SuperPomProvider.java | 0 .../validation/DefaultModelValidator.java | 0 .../model/validation/ModelValidator.java | 0 .../main/java/org/apache/maven/utils/Os.java | 0 .../org.apache.maven.model.root.RootLocator | 0 .../org/apache/maven/model/pom-4.0.0.xml | 0 .../org/apache/maven/model/pom-4.1.0.xml | 0 .../src/site/apt/index.apt | 0 .../src/site/apt/super-pom.apt.vm | 0 .../maven-model-builder}/src/site/site.xml | 0 .../BuildModelSourceTransformerTest.java | 0 .../model/building/ComplexActivationTest.java | 0 .../DefaultModelBuilderFactoryTest.java | 0 .../building/DefaultModelBuilderTest.java | 0 .../model/building/FileModelSourceTest.java | 0 .../building/FileToRawModelMergerTest.java | 0 .../maven/model/building/GraphTest.java | 0 .../building/ModelBuildingExceptionTest.java | 0 .../building/SimpleProblemCollector.java | 0 .../DefaultInheritanceAssemblerTest.java | 0 .../maven/model/inheritance/MergerTest.java | 0 .../AbstractModelInterpolatorTest.java | 0 .../MavenBuildTimestampTest.java | 0 .../StringVisitorModelInterpolatorTest.java | 0 .../ReflectionValueExtractorTest.java | 0 .../model/path/DefaultUrlNormalizerTest.java | 0 .../profile/DefaultProfileSelectorTest.java | 0 .../AbstractProfileActivatorTest.java | 0 .../activation/FileProfileActivatorTest.java | 0 .../JdkVersionProfileActivatorTest.java | 0 .../OperatingSystemProfileActivatorTest.java | 0 .../PropertyProfileActivatorTest.java | 0 .../validation/DefaultModelValidatorTest.java | 0 .../src/test/resources/dag.txt | 0 .../resources/poms/depmgmt/distant-import.xml | 0 .../test/resources/poms/depmgmt/import.xml | 0 .../test/resources/poms/depmgmt/junit-0.1.xml | 0 .../test/resources/poms/depmgmt/junit-0.2.xml | 0 .../resources/poms/depmgmt/other-import.xml | 0 .../resources/poms/depmgmt/root-dep-first.xml | 0 .../resources/poms/depmgmt/root-dep-last.xml | 0 .../poms/depmgmt/root-distance-explicit.xml | 0 .../resources/poms/depmgmt/root-distance.xml | 0 .../poms/depmgmt/root-two-imports.xml | 0 .../test/resources/poms/factory/complex.xml | 0 .../test/resources/poms/factory/simple.xml | 0 .../poms/inheritance/empty-urls-child.xml | 0 .../poms/inheritance/empty-urls-expected.xml | 0 .../poms/inheritance/empty-urls-parent.xml | 0 .../poms/inheritance/flat-urls-child.xml | 0 .../poms/inheritance/flat-urls-expected.xml | 0 .../poms/inheritance/flat-urls-parent.xml | 0 .../module-path-not-artifactId-child.xml | 0 .../module-path-not-artifactId-expected.xml | 0 .../module-path-not-artifactId-parent.xml | 0 .../poms/inheritance/no-append-urls-child.xml | 0 .../inheritance/no-append-urls-expected.xml | 0 .../inheritance/no-append-urls-parent.xml | 0 .../inheritance/no-append-urls2-child.xml | 0 .../inheritance/no-append-urls2-expected.xml | 0 .../inheritance/no-append-urls2-parent.xml | 0 .../inheritance/no-append-urls3-child.xml | 0 .../inheritance/no-append-urls3-expected.xml | 0 .../inheritance/no-append-urls3-parent.xml | 0 .../plugin-configuration-child.xml | 0 .../plugin-configuration-expected.xml | 0 .../plugin-configuration-parent.xml | 0 .../tricky-flat-artifactId-urls-child.xml | 0 .../tricky-flat-artifactId-urls-expected.xml | 0 .../tricky-flat-artifactId-urls-parent.xml | 0 .../tricky-flat-directory-urls-child.xml | 0 .../tricky-flat-directory-urls-expected.xml | 0 .../tricky-flat-directory-urls-parent.xml | 0 .../resources/poms/inheritance/urls-child.xml | 0 .../poms/inheritance/urls-expected.xml | 0 .../poms/inheritance/urls-parent.xml | 0 .../bad-dependency-exclusion-id.xml | 0 .../bad-dependency-management-scope.xml | 0 .../poms/validation/bad-dependency-scope.xml | 0 .../validation/bad-dependency-version.xml | 0 .../bad-import-scope-classifier.xml | 0 .../poms/validation/bad-import-scope-type.xml | 0 .../poms/validation/bad-modelVersion.xml | 0 .../bad-plugin-dependency-scope.xml | 0 .../bad-plugin-dependency-version.xml | 0 .../poms/validation/bad-plugin-version.xml | 0 .../poms/validation/bad-repository-id.xml | 0 .../poms/validation/bad-snapshot-version.xml | 0 .../resources/poms/validation/bad-version.xml | 0 .../poms/validation/basedir-system-path.xml | 0 ...ndency-metaversions-latest-and-release.xml | 0 .../distribution-management-status.xml | 0 .../poms/validation/duplicate-module.xml | 0 .../validation/duplicate-plugin-execution.xml | 0 .../poms/validation/duplicate-plugin.xml | 0 .../poms/validation/duplicate-profile-id.xml | 0 .../poms/validation/empty-module.xml | 0 .../poms/validation/empty-plugin-version.xml | 0 .../validation/hard-coded-system-path.xml | 0 .../poms/validation/incomplete-parent.xml | 0 .../invalid-aggregator-packaging-pom.xml | 0 .../validation/invalid-coordinate-ids-pom.xml | 0 .../poms/validation/invalid-profile-ids.xml | 0 .../poms/validation/missing-1-pom.xml | 0 .../validation/missing-artifactId-pom.xml | 0 .../missing-dependency-artifactId-pom.xml | 0 .../missing-dependency-exclusion-id.xml | 0 .../missing-dependency-groupId-pom.xml | 0 ...missing-dependency-mgmt-artifactId-pom.xml | 0 .../missing-dependency-mgmt-groupId-pom.xml | 0 .../missing-dependency-mgmt-version-pom.xml | 0 .../missing-dependency-version-pom.xml | 0 .../poms/validation/missing-groupId-pom.xml | 0 .../validation/missing-modelVersion-pom.xml | 0 .../missing-plugin-artifactId-pom.xml | 0 .../missing-plugin-dependency-artifactId.xml | 0 .../missing-plugin-dependency-groupId.xml | 0 .../missing-plugin-dependency-version.xml | 0 .../validation/missing-plugin-version-pom.xml | 0 .../missing-report-artifactId-pom.xml | 0 .../validation/missing-report-version-pom.xml | 0 .../validation/missing-repository-id-pom.xml | 0 .../missing-resource-directory-pom.xml | 0 .../poms/validation/missing-type-pom.xml | 0 .../poms/validation/missing-version-pom.xml | 0 .../poms/validation/modelVersion-4_0.xml | 0 .../raw-model/bad-ci-friendly-sha1plus.xml | 0 .../raw-model/bad-ci-friendly-sha1plus2.xml | 0 .../validation/raw-model/bad-ci-friendly.xml | 0 .../raw-model/bad-parent-version-latest.xml | 0 .../raw-model/bad-parent-version-release.xml | 0 .../missing-artifactId-pluginManagement.xml | 0 .../raw-model/missing-ga-pluginManagement.xml | 0 .../missing-groupId-pluginManagement.xml | 0 ...issing-plugin-version-pluginManagement.xml | 0 .../ok-ci-friendly-all-expressions.xml | 0 .../raw-model/ok-ci-friendly-changelist.xml | 0 .../raw-model/ok-ci-friendly-revision.xml | 0 .../raw-model/ok-ci-friendly-sha1.xml | 0 ...tivation-file-with-allowed-expressions.xml | 0 ...tivation-file-with-project-expressions.xml | 0 ...tion-property-with-project-expressions.xml | 0 .../repository-with-basedir-expression.xml | 0 .../raw-model/repository-with-expression.xml | 0 .../raw-model/self-referencing-classifier.xml | 0 .../validation/raw-model/self-referencing.xml | 0 .../validation/reserved-repository-id.xml | 0 {maven-model => compat/maven-model}/pom.xml | 8 +-- .../org/apache/maven/model/BaseObject.java | 0 .../org/apache/maven/model/InputLocation.java | 0 .../maven/model/InputLocationTracker.java | 0 .../org/apache/maven/model/InputSource.java | 0 .../maven/model/io/xpp3/MavenXpp3Reader.java | 0 .../model/io/xpp3/MavenXpp3ReaderEx.java | 0 .../maven/model/io/xpp3/MavenXpp3Writer.java | 0 .../model/io/xpp3/MavenXpp3WriterEx.java | 0 .../maven/model/io/xpp3/package-info.java | 0 .../maven/model/merge/package-info.java | 0 .../maven-model}/src/site/apt/index.apt | 0 .../maven-model}/src/site/site.xml | 0 .../maven/model/ActivationFileTest.java | 0 .../apache/maven/model/ActivationOSTest.java | 0 .../maven/model/ActivationPropertyTest.java | 0 .../apache/maven/model/ActivationTest.java | 0 .../org/apache/maven/model/BuildTest.java | 0 .../apache/maven/model/CiManagementTest.java | 0 .../apache/maven/model/ContributorTest.java | 0 .../maven/model/DependencyManagementTest.java | 0 .../apache/maven/model/DependencyTest.java | 0 .../maven/model/DeploymentRepositoryTest.java | 0 .../org/apache/maven/model/DeveloperTest.java | 0 .../model/DistributionManagementTest.java | 0 .../org/apache/maven/model/ExclusionTest.java | 0 .../org/apache/maven/model/ExtensionTest.java | 0 .../maven/model/IssueManagementTest.java | 0 .../org/apache/maven/model/LicenseTest.java | 0 .../apache/maven/model/MailingListTest.java | 0 .../org/apache/maven/model/ModelTest.java | 0 .../org/apache/maven/model/NotifierTest.java | 0 .../apache/maven/model/OrganizationTest.java | 0 .../org/apache/maven/model/ParentTest.java | 0 .../maven/model/PluginConfigurationTest.java | 0 .../maven/model/PluginContainerTest.java | 0 .../maven/model/PluginExecutionTest.java | 0 .../maven/model/PluginManagementTest.java | 0 .../org/apache/maven/model/PluginTest.java | 0 .../apache/maven/model/PrerequisitesTest.java | 0 .../org/apache/maven/model/ProfileTest.java | 0 .../apache/maven/model/RelocationTest.java | 0 .../apache/maven/model/ReportPluginTest.java | 0 .../org/apache/maven/model/ReportSetTest.java | 0 .../org/apache/maven/model/ReportingTest.java | 0 .../maven/model/RepositoryPolicyTest.java | 0 .../apache/maven/model/RepositoryTest.java | 0 .../org/apache/maven/model/ResourceTest.java | 0 .../java/org/apache/maven/model/ScmTest.java | 0 .../apache/maven/model/SerializationTest.java | 0 .../java/org/apache/maven/model/SiteTest.java | 0 .../maven/model/merge/MavenMergerTest.java | 0 .../maven/model/v4/MavenModelVersionTest.java | 0 .../apache/maven/model/v4/ModelXmlTest.java | 0 .../maven/model/v4/Xpp3DomPerfTest.java | 0 .../src/test/resources/xml/pom.xml | 2 +- .../maven-plugin-api}/pom.xml | 10 ++-- .../org/apache/maven/plugin/AbstractMojo.java | 0 .../AbstractMojoExecutionException.java | 0 .../apache/maven/plugin/ContextEnabled.java | 0 .../java/org/apache/maven/plugin/Mojo.java | 0 .../maven/plugin/MojoExecutionException.java | 0 .../maven/plugin/MojoFailureException.java | 0 .../maven/plugin/MojoNotFoundException.java | 0 .../DuplicateMojoDescriptorException.java | 0 .../DuplicateParameterException.java | 0 .../descriptor/InvalidParameterException.java | 0 .../InvalidPluginDescriptorException.java | 0 .../plugin/descriptor/MojoDescriptor.java | 0 .../maven/plugin/descriptor/Parameter.java | 0 .../plugin/descriptor/PluginDescriptor.java | 0 .../descriptor/PluginDescriptorBuilder.java | 0 .../maven/plugin/descriptor/Requirement.java | 0 .../maven/plugin/lifecycle/Execution.java | 0 .../maven/plugin/lifecycle/Lifecycle.java | 0 .../lifecycle/LifecycleConfiguration.java | 0 .../apache/maven/plugin/lifecycle/Phase.java | 0 .../org/apache/maven/plugin/logging/Log.java | 0 .../maven/plugin/logging/SystemStreamLog.java | 0 .../maven-plugin-api}/src/site/apt/index.apt | 0 .../maven-plugin-api}/src/site/site.xml | 0 .../plugin/descriptor/MojoDescriptorTest.java | 0 .../PluginDescriptorBuilderTest.java | 0 .../src/test/resources/plugin.xml | 0 .../maven-repository-metadata}/pom.xml | 12 +++-- .../repository/metadata/BaseObject.java | 0 .../metadata/io/xpp3/MetadataXpp3Reader.java | 0 .../metadata/io/xpp3/MetadataXpp3Writer.java | 0 .../src/site/apt/index.apt | 0 .../src/site/site.xml | 0 .../repository/metadata/MetadataTest.java | 0 .../maven-resolver-provider}/pom.xml | 6 ++- .../ArtifactDescriptorReaderDelegate.java | 0 .../internal/ArtifactDescriptorUtils.java | 0 .../DefaultArtifactDescriptorReader.java | 0 .../internal/DefaultModelCache.java | 0 .../internal/DefaultModelCacheFactory.java | 0 .../internal/DefaultModelResolver.java | 0 .../internal/DefaultModelVersionParser.java | 0 .../internal/DefaultVersionRangeResolver.java | 0 .../internal/DefaultVersionResolver.java | 0 .../DefaultVersionSchemeProvider.java | 0 .../internal/LocalSnapshotMetadata.java | 0 .../LocalSnapshotMetadataGenerator.java | 0 .../MavenArtifactRelocationSource.java | 0 .../repository/internal/MavenMetadata.java | 0 .../MavenRepositorySystemSupplier.java | 0 .../internal/MavenRepositorySystemUtils.java | 0 .../internal/MavenSessionBuilderSupplier.java | 0 .../internal/MavenSnapshotMetadata.java | 0 .../internal/MavenWorkspaceReader.java | 0 .../internal/ModelCacheFactory.java | 0 .../repository/internal/PluginsMetadata.java | 0 .../internal/PluginsMetadataGenerator.java | 0 .../PluginsMetadataGeneratorFactory.java | 0 .../internal/RelocatedArtifact.java | 0 .../internal/RemoteSnapshotMetadata.java | 0 .../RemoteSnapshotMetadataGenerator.java | 0 .../internal/RequestTraceHelper.java | 0 .../SnapshotMetadataGeneratorFactory.java | 0 .../repository/internal/VersionsMetadata.java | 0 .../internal/VersionsMetadataGenerator.java | 0 .../VersionsMetadataGeneratorFactory.java | 0 .../artifact/FatArtifactTraverser.java | 0 .../artifact/MavenArtifactProperties.java | 0 .../repository/internal/package-info.java | 0 ...ionManagementArtifactRelocationSource.java | 0 ...serPropertiesArtifactRelocationSource.java | 0 .../Maven3ScopeManagerConfiguration.java | 0 .../Maven4ScopeManagerConfiguration.java | 0 .../repository/internal/type/DefaultType.java | 0 .../internal/type/DefaultTypeProvider.java | 0 .../src/site/apt/dependency-types.apt | 0 .../src/site/apt/index.apt | 0 .../src/site/site.xml | 0 .../internal/AbstractRepositoryTestCase.java | 0 .../internal/AbstractVersionTest.java | 0 .../DefaultArtifactDescriptorReaderTest.java | 0 .../internal/DefaultModelResolverTest.java | 0 .../internal/DefaultVersionResolverTest.java | 0 .../internal/ModelVersionParserTest.java | 0 .../internal/RemoteSnapshotMetadataTest.java | 0 .../internal/RepositorySystemTest.java | 0 .../repository/internal/VersionRangeTest.java | 0 .../repository/internal/VersionTest.java | 0 .../util/ConsoleRepositoryListener.java | 0 .../util/ConsoleTransferListener.java | 0 .../META-INF/sisu/javax.inject.Named | 0 .../07.20.3-SNAPSHOT/maven-metadata.xml | 0 .../0.4.0-SNAPSHOT/maven-metadata.xml | 0 .../artifact/1.0/artifact-1.0-classifier.zip | 0 .../ut/simple/artifact/1.0/artifact-1.0.jar | 0 .../ut/simple/artifact/1.0/artifact-1.0.pom | 0 .../ut/simple/artifact/1.0/artifact-1.0.zip | 0 .../ut/simple/artifact/maven-metadata.xml | 0 .../dependency/1.0/dependency-1.0-sources.jar | 0 .../simple/dependency/1.0/dependency-1.0.jar | 0 .../simple/dependency/1.0/dependency-1.0.pom | 0 .../ut/simple/dependency/maven-metadata.xml | 0 .../repo/ut/simple/parent/1.0/parent-1.0.pom | 0 .../repo/ut/simple/parent/maven-metadata.xml | 0 .../maven-settings-builder}/pom.xml | 4 +- .../building/DefaultSettingsBuilder.java | 0 .../DefaultSettingsBuilderFactory.java | 0 .../DefaultSettingsBuildingRequest.java | 0 .../DefaultSettingsBuildingResult.java | 0 .../building/DefaultSettingsProblem.java | 0 .../DefaultSettingsProblemCollector.java | 0 .../settings/building/FileSettingsSource.java | 0 .../settings/building/SettingsBuilder.java | 0 .../building/SettingsBuildingException.java | 0 .../building/SettingsBuildingRequest.java | 0 .../building/SettingsBuildingResult.java | 0 .../settings/building/SettingsProblem.java | 0 .../building/SettingsProblemCollector.java | 0 .../settings/building/SettingsSource.java | 0 .../building/StringSettingsSource.java | 0 .../settings/building/UrlSettingsSource.java | 0 .../crypto/DefaultSettingsDecrypter.java | 0 .../DefaultSettingsDecryptionRequest.java | 0 .../DefaultSettingsDecryptionResult.java | 0 .../settings/crypto/MavenSecDispatcher.java | 0 .../settings/crypto/SettingsDecrypter.java | 0 .../crypto/SettingsDecryptionRequest.java | 0 .../crypto/SettingsDecryptionResult.java | 0 .../settings/io/DefaultSettingsReader.java | 0 .../settings/io/DefaultSettingsWriter.java | 0 .../settings/io/SettingsParseException.java | 0 .../maven/settings/io/SettingsReader.java | 0 .../maven/settings/io/SettingsWriter.java | 0 .../settings/merge/MavenSettingsMerger.java | 0 .../validation/DefaultSettingsValidator.java | 0 .../validation/SettingsValidator.java | 0 .../maven-settings-builder}/src/site/site.xml | 0 .../DefaultSettingsBuilderFactoryTest.java | 0 .../DefaultSettingsValidatorTest.java | 0 .../resources/settings/factory/simple.xml | 0 .../maven-settings}/pom.xml | 8 +-- .../org/apache/maven/settings/BaseObject.java | 0 .../settings/io/xpp3/SettingsXpp3Reader.java | 0 .../settings/io/xpp3/SettingsXpp3Writer.java | 0 .../maven-settings}/src/site/apt/index.apt | 0 .../maven-settings}/src/site/site.xml | 0 .../maven-toolchain-builder}/pom.xml | 4 +- .../building/DefaultToolchainsBuilder.java | 0 .../DefaultToolchainsBuildingRequest.java | 0 .../DefaultToolchainsBuildingResult.java | 0 .../toolchain/building/ToolchainsBuilder.java | 0 .../building/ToolchainsBuildingException.java | 0 .../building/ToolchainsBuildingRequest.java | 0 .../building/ToolchainsBuildingResult.java | 0 .../toolchain/io/DefaultToolchainsReader.java | 0 .../toolchain/io/DefaultToolchainsWriter.java | 0 .../io/ToolchainsParseException.java | 0 .../maven/toolchain/io/ToolchainsReader.java | 0 .../maven/toolchain/io/ToolchainsWriter.java | 0 .../toolchain/merge/MavenToolchainMerger.java | 0 .../src/site/site.xml | 0 .../DefaultToolchainsBuilderTest.java | 0 .../ToolchainsBuildingExceptionTest.java | 0 .../merge/MavenToolchainMergerTest.java | 0 .../org/apache/maven/toolchain/global.xml | 0 .../merge/toolchains-jdks-extend.xml | 0 .../toolchain/merge/toolchains-jdks-extra.xml | 0 .../maven/toolchain/merge/toolchains-jdks.xml | 0 .../org/apache/maven/toolchain/user.xml | 0 .../maven-toolchain-model}/pom.xml | 6 ++- .../maven/toolchain/model/BaseObject.java | 0 .../src/site/apt/index.apt | 0 .../maven-toolchain-model}/src/site/site.xml | 0 compat/pom.xml | 48 ++++++++++++++++++ {maven-cli => impl/maven-cli}/pom.xml | 2 + .../org/apache/maven/cling/ClingSupport.java | 0 .../org/apache/maven/cling/MavenCling.java | 0 .../org/apache/maven/cling/MavenEncCling.java | 0 .../cling/invoker/BaseInvokerRequest.java | 0 .../maven/cling/invoker/BaseParser.java | 0 .../cling/invoker/CommonsCliOptions.java | 0 .../maven/cling/invoker/ContainerCapsule.java | 0 .../invoker/ContainerCapsuleFactory.java | 0 .../maven/cling/invoker/LayeredOptions.java | 0 .../maven/cling/invoker/LookupInvoker.java | 0 .../cling/invoker/PlexusContainerCapsule.java | 0 .../PlexusContainerCapsuleFactory.java | 0 .../maven/cling/invoker/ProtoLogger.java | 0 .../maven/cling/invoker/ProtoLookup.java | 0 .../org/apache/maven/cling/invoker/Utils.java | 0 .../cling/invoker/mvn/BaseMavenParser.java | 0 .../invoker/mvn/CommonsCliMavenOptions.java | 0 .../invoker/mvn/DefaultMavenInvoker.java | 0 .../mvn/DefaultMavenInvokerRequest.java | 0 .../cling/invoker/mvn/DefaultMavenParser.java | 0 .../invoker/mvn/LayeredMavenOptions.java | 0 .../maven/cling/invoker/mvn/ProtoSession.java | 0 .../invoker/mvn/RepositorySystemSupplier.java | 0 .../mvn/forked/DefaultForkedMavenInvoker.java | 0 .../DefaultForkedMavenInvokerRequest.java | 0 .../mvn/forked/DefaultForkedMavenParser.java | 0 .../mvn/local/DefaultLocalMavenInvoker.java | 0 .../resident/DefaultResidentMavenInvoker.java | 0 .../mvnenc/CommonsCliEncryptOptions.java | 0 .../invoker/mvnenc/ConsolePasswordPrompt.java | 0 .../invoker/mvnenc/DefaultEncryptInvoker.java | 0 .../mvnenc/DefaultEncryptInvokerRequest.java | 0 .../invoker/mvnenc/DefaultEncryptParser.java | 0 .../maven/cling/invoker/mvnenc/Goal.java | 0 .../mvnenc/goals/ConfiguredGoalSupport.java | 0 .../cling/invoker/mvnenc/goals/Decrypt.java | 0 .../cling/invoker/mvnenc/goals/Diag.java | 0 .../cling/invoker/mvnenc/goals/Encrypt.java | 0 .../invoker/mvnenc/goals/GoalSupport.java | 0 .../cling/invoker/mvnenc/goals/Init.java | 0 .../maven-cli}/src/site/site.xml | 0 .../invoker/mvn/MavenInvokerTestSupport.java | 0 .../forked/DefaultForkedMavenInvokerTest.java | 0 .../local/DefaultLocalMavenInvokerTest.java | 0 .../DefaultResidentMavenInvokerTest.java | 0 .../maven-core}/lifecycle-executor.txt | 0 .../maven-core}/plugin-manager.txt | 0 {maven-core => impl/maven-core}/pom.xml | 4 +- .../AbstractMavenLifecycleParticipant.java | 0 .../java/org/apache/maven/BuildAbort.java | 0 .../apache/maven/BuildFailureException.java | 0 .../java/org/apache/maven/DefaultMaven.java | 0 .../maven/DuplicateProjectException.java | 0 .../apache/maven/InternalErrorException.java | 0 .../src/main/java/org/apache/maven/Maven.java | 0 .../apache/maven/MavenExecutionException.java | 0 .../maven/MissingProfilesException.java | 0 .../maven/ProjectBuildFailureException.java | 0 .../apache/maven/ProjectCycleException.java | 0 .../java/org/apache/maven/ReactorReader.java | 0 .../org/apache/maven/RepositoryUtils.java | 0 .../java/org/apache/maven/SessionScoped.java | 0 ...DependencyResolutionRequiredException.java | 0 .../artifact/InvalidRepositoryException.java | 0 .../artifact/factory/ArtifactFactory.java | 0 .../factory/DefaultArtifactFactory.java | 0 .../handler/DefaultArtifactHandler.java | 0 .../manager/ArtifactHandlerManager.java | 0 .../DefaultArtifactHandlerManager.java | 0 .../manager/LegacyArtifactHandlerManager.java | 0 .../repository/DefaultRepositoryRequest.java | 0 .../repository/MavenArtifactRepository.java | 0 .../artifact/repository/RepositoryCache.java | 0 .../repository/RepositoryRequest.java | 0 .../layout/DefaultRepositoryLayout.java | 0 .../metadata/io/DefaultMetadataReader.java | 0 .../metadata/io/MetadataParseException.java | 0 .../metadata/io/MetadataReader.java | 0 .../filter/AbstractScopeArtifactFilter.java | 0 .../resolver/filter/AndArtifactFilter.java | 0 .../filter/CumulativeScopeArtifactFilter.java | 0 .../filter/ExcludesArtifactFilter.java | 0 .../filter/ExclusionArtifactFilter.java | 0 .../resolver/filter/ExclusionSetFilter.java | 0 .../filter/IncludesArtifactFilter.java | 0 .../resolver/filter/ScopeArtifactFilter.java | 0 .../maven/bridge/MavenRepositorySystem.java | 0 .../ArtifactClassRealmConstituent.java | 0 .../classrealm/ClassRealmConstituent.java | 0 .../maven/classrealm/ClassRealmManager.java | 0 .../classrealm/ClassRealmManagerDelegate.java | 0 .../maven/classrealm/ClassRealmRequest.java | 0 .../classrealm/DefaultClassRealmManager.java | 0 .../classrealm/DefaultClassRealmRequest.java | 0 ...asedirBeanConfigurationPathTranslator.java | 0 .../BeanConfigurationException.java | 0 .../BeanConfigurationPathTranslator.java | 0 .../BeanConfigurationRequest.java | 0 .../BeanConfigurationValuePreprocessor.java | 0 .../maven/configuration/BeanConfigurator.java | 0 .../DefaultBeanConfigurationRequest.java | 0 .../internal/DefaultBeanConfigurator.java | 0 .../EnhancedComponentConfigurator.java | 0 .../EnhancedConfigurationConverter.java | 0 .../internal/EnhancedConverterLookup.java | 0 .../maven/eventspy/AbstractEventSpy.java | 0 .../org/apache/maven/eventspy/EventSpy.java | 0 .../eventspy/internal/EventSpyDispatcher.java | 0 .../internal/EventSpyExecutionListener.java | 0 .../internal/EventSpyRepositoryListener.java | 0 .../exception/DefaultExceptionHandler.java | 0 .../maven/exception/ExceptionHandler.java | 0 .../maven/exception/ExceptionSummary.java | 0 .../execution/AbstractExecutionListener.java | 0 .../maven/execution/ActivationSettings.java | 0 .../apache/maven/execution/BuildFailure.java | 0 .../execution/BuildResumptionAnalyzer.java | 0 .../maven/execution/BuildResumptionData.java | 0 .../BuildResumptionDataRepository.java | 0 .../BuildResumptionPersistenceException.java | 0 .../apache/maven/execution/BuildSuccess.java | 0 .../apache/maven/execution/BuildSummary.java | 0 .../DefaultBuildResumptionAnalyzer.java | 0 .../DefaultBuildResumptionDataRepository.java | 0 .../DefaultMavenExecutionRequest.java | 0 ...DefaultMavenExecutionRequestPopulator.java | 0 .../DefaultMavenExecutionResult.java | 0 .../maven/execution/ExecutionEvent.java | 0 .../maven/execution/ExecutionListener.java | 0 .../execution/MavenExecutionRequest.java | 0 ...enExecutionRequestPopulationException.java | 0 .../MavenExecutionRequestPopulator.java | 0 .../maven/execution/MavenExecutionResult.java | 0 .../apache/maven/execution/MavenSession.java | 0 .../maven/execution/MojoExecutionEvent.java | 0 .../execution/MojoExecutionListener.java | 0 .../maven/execution/ProfileActivation.java | 0 .../maven/execution/ProjectActivation.java | 0 .../execution/ProjectDependencyGraph.java | 0 .../execution/ProjectExecutionEvent.java | 0 .../execution/ProjectExecutionListener.java | 0 .../maven/execution/ReactorManager.java | 0 .../execution/scope/MojoExecutionScoped.java | 0 .../scope/WeakMojoExecutionListener.java | 0 .../scope/internal/MojoExecutionScope.java | 0 .../MojoExecutionScopeCoreModule.java | 0 .../internal/MojoExecutionScopeModule.java | 0 .../maven/extension/internal/CoreExports.java | 0 .../internal/CoreExportsProvider.java | 0 .../internal/CoreExtensionEntry.java | 0 .../maven/graph/DefaultGraphBuilder.java | 0 .../graph/DefaultProjectDependencyGraph.java | 0 .../graph/FilteredProjectDependencyGraph.java | 0 .../org/apache/maven/graph/GraphBuilder.java | 0 .../apache/maven/graph/ProjectSelector.java | 0 .../org/apache/maven/internal/CoreRealm.java | 0 .../internal/MultilineMessageHelper.java | 0 ...DefaultRepositorySystemSessionFactory.java | 0 ...LegacyRepositorySystemSessionExtender.java | 0 .../aether/LoggingRepositoryListener.java | 0 .../maven/internal/aether/MavenDeployer.java | 0 .../aether/MavenExecutionRequestExtender.java | 0 .../maven/internal/aether/MavenInstaller.java | 0 .../aether/PropertyContributorExtender.java | 0 .../RepositorySystemSessionExtender.java | 0 .../internal/aether/ResolverLifecycle.java | 0 .../aether/ReverseTreeRepositoryListener.java | 0 .../internal/aether/TypeRegistryAdapter.java | 0 .../internal/impl/DefaultArtifactManager.java | 0 .../maven/internal/impl/DefaultEvent.java | 0 .../impl/DefaultLifecycleRegistry.java | 0 .../maven/internal/impl/DefaultLog.java | 0 .../maven/internal/impl/DefaultLookup.java | 0 .../internal/impl/DefaultMojoExecution.java | 0 .../impl/DefaultPackagingRegistry.java | 0 .../impl/DefaultPluginXmlFactory.java | 0 .../maven/internal/impl/DefaultProject.java | 0 .../internal/impl/DefaultProjectBuilder.java | 0 .../internal/impl/DefaultProjectManager.java | 0 .../maven/internal/impl/DefaultPrompter.java | 0 .../maven/internal/impl/DefaultSession.java | 0 .../internal/impl/DefaultSessionFactory.java | 0 .../impl/DefaultToolchainManager.java | 0 .../internal/impl/DefaultTypeRegistry.java | 0 .../maven/internal/impl/EventSpyImpl.java | 0 .../org/apache/maven/internal/impl/Graph.java | 0 .../internal/impl/InternalMavenSession.java | 0 .../maven/internal/impl/Lifecycles.java | 0 .../internal/impl/SisuDiBridgeModule.java | 0 .../impl/internal/DefaultCoreRealm.java | 0 .../ConsumerPomArtifactTransformer.java | 0 .../TransformationFailedException.java | 0 .../impl/ConsumerPomBuilder.java | 0 ...DefaultConsumerPomArtifactTransformer.java | 0 .../impl/DefaultConsumerPomBuilder.java | 0 .../impl/TransformedArtifact.java | 0 .../impl/TransformedArtifactHandler.java | 0 .../lifecycle/DefaultLifecycleExecutor.java | 0 .../maven/lifecycle/DefaultLifecycles.java | 0 .../lifecycle/LifeCyclePluginAnalyzer.java | 0 .../org/apache/maven/lifecycle/Lifecycle.java | 0 .../LifecycleExecutionException.java | 0 .../maven/lifecycle/LifecycleExecutor.java | 0 .../lifecycle/LifecycleMappingDelegate.java | 0 .../lifecycle/LifecycleNotFoundException.java | 0 .../LifecyclePhaseNotFoundException.java | 0 .../maven/lifecycle/MavenExecutionPlan.java | 0 .../lifecycle/MissingProjectException.java | 0 .../lifecycle/MojoExecutionConfigurator.java | 0 .../lifecycle/NoGoalSpecifiedException.java | 0 .../internal/BuildListCalculator.java | 0 .../internal/BuildThreadFactory.java | 0 .../CompoundProjectExecutionListener.java | 0 .../internal/DefaultExecutionEvent.java | 0 .../DefaultExecutionEventCatapult.java | 0 ...faultLifecycleExecutionPlanCalculator.java | 0 .../DefaultLifecycleMappingDelegate.java | 0 .../DefaultLifecyclePluginAnalyzer.java | 0 .../internal/DefaultLifecycleStarter.java | 0 ...DefaultLifecycleTaskSegmentCalculator.java | 0 .../DefaultMojoExecutionConfigurator.java | 0 .../DefaultProjectArtifactFactory.java | 0 .../lifecycle/internal/DependencyContext.java | 0 .../internal/ExecutionEventCatapult.java | 0 .../lifecycle/internal/ExecutionPlanItem.java | 0 .../maven/lifecycle/internal/GoalTask.java | 0 .../internal/LifecycleDebugLogger.java | 0 .../internal/LifecycleDependencyResolver.java | 0 .../LifecycleExecutionPlanCalculator.java | 0 .../internal/LifecycleModuleBuilder.java | 0 .../internal/LifecyclePluginResolver.java | 0 .../lifecycle/internal/LifecycleStarter.java | 0 .../lifecycle/internal/LifecycleTask.java | 0 .../LifecycleTaskSegmentCalculator.java | 0 .../internal/MojoDescriptorCreator.java | 0 .../lifecycle/internal/MojoExecutor.java | 0 .../lifecycle/internal/PhaseComparator.java | 0 .../internal/PhaseExecutionPoint.java | 0 .../maven/lifecycle/internal/PhaseId.java | 0 .../lifecycle/internal/PhaseRecorder.java | 0 .../internal/ProjectArtifactFactory.java | 0 .../lifecycle/internal/ProjectBuildList.java | 0 .../lifecycle/internal/ProjectIndex.java | 0 .../lifecycle/internal/ProjectSegment.java | 0 .../internal/ReactorBuildStatus.java | 0 .../lifecycle/internal/ReactorContext.java | 0 .../internal/SetWithResolutionResult.java | 0 .../apache/maven/lifecycle/internal/Task.java | 0 .../maven/lifecycle/internal/TaskSegment.java | 0 .../lifecycle/internal/builder/Builder.java | 0 .../internal/builder/BuilderCommon.java | 0 .../builder/BuilderNotFoundException.java | 0 .../ConcurrencyDependencyGraph.java | 0 .../multithreaded/MultiThreadedBuilder.java | 0 .../singlethreaded/SingleThreadedBuilder.java | 0 .../internal/concurrent/BuildPlan.java | 0 .../concurrent/BuildPlanExecutor.java | 0 .../internal/concurrent/BuildPlanLogger.java | 0 .../internal/concurrent/BuildStep.java | 0 .../ConcurrentLifecycleStarter.java | 0 .../internal/concurrent/MojoExecutor.java | 0 .../internal/concurrent/PluginLifecycle.java | 0 .../mapping/DefaultLifecycleMapping.java | 0 .../maven/lifecycle/mapping/Lifecycle.java | 0 .../lifecycle/mapping/LifecycleMapping.java | 0 .../lifecycle/mapping/LifecycleMojo.java | 0 .../lifecycle/mapping/LifecyclePhase.java | 0 .../providers/AbstractLifecycleProvider.java | 0 .../AbstractLifecycleMappingProvider.java | 0 .../BomLifecycleMappingProvider.java | 0 .../EarLifecycleMappingProvider.java | 0 .../EjbLifecycleMappingProvider.java | 0 .../JarLifecycleMappingProvider.java | 0 .../MavenPluginLifecycleMappingProvider.java | 0 .../PomLifecycleMappingProvider.java | 0 .../RarLifecycleMappingProvider.java | 0 .../WarLifecycleMappingProvider.java | 0 .../maven/logging/BuildEventListener.java | 0 .../logging/LoggingExecutionListener.java | 0 .../maven/logging/LoggingOutputStream.java | 0 .../maven/logging/MavenTransferListener.java | 0 .../logging/ProjectBuildLogAppender.java | 0 .../logging/SimpleBuildEventListener.java | 0 .../DefaultLifecycleBindingsInjector.java | 0 .../maven/monitor/event/EventDispatcher.java | 0 .../maven/monitor/event/EventMonitor.java | 0 .../maven/plugin/BuildPluginManager.java | 0 .../org/apache/maven/plugin/CacheUtils.java | 0 .../plugin/CompoundMojoExecutionListener.java | 0 .../CycleDetectedInPluginGraphException.java | 0 .../plugin/DebugConfigurationListener.java | 0 .../plugin/DefaultBuildPluginManager.java | 0 .../plugin/DefaultExtensionRealmCache.java | 0 .../plugin/DefaultMojosExecutionStrategy.java | 0 .../plugin/DefaultPluginArtifactsCache.java | 0 .../plugin/DefaultPluginDescriptorCache.java | 0 .../maven/plugin/DefaultPluginRealmCache.java | 0 .../maven/plugin/ExtensionRealmCache.java | 0 .../InvalidPluginDescriptorException.java | 0 .../maven/plugin/InvalidPluginException.java | 0 .../apache/maven/plugin/LegacySupport.java | 0 .../maven/plugin/MavenPluginManager.java | 0 .../MavenPluginPrerequisitesChecker.java | 0 .../apache/maven/plugin/MojoExecution.java | 0 .../maven/plugin/MojoExecutionRunner.java | 0 .../maven/plugin/MojosExecutionStrategy.java | 0 .../maven/plugin/PluginArtifactsCache.java | 0 .../plugin/PluginConfigurationException.java | 0 .../plugin/PluginContainerException.java | 0 .../maven/plugin/PluginDescriptorCache.java | 0 .../PluginDescriptorParsingException.java | 0 .../plugin/PluginExecutionException.java | 0 .../plugin/PluginIncompatibleException.java | 0 .../maven/plugin/PluginLoaderException.java | 0 .../maven/plugin/PluginManagerException.java | 0 .../maven/plugin/PluginNotFoundException.java | 0 .../plugin/PluginParameterException.java | 0 .../PluginParameterExpressionEvaluator.java | 0 .../PluginParameterExpressionEvaluatorV4.java | 0 .../apache/maven/plugin/PluginRealmCache.java | 0 .../plugin/PluginResolutionException.java | 0 .../maven/plugin/PluginValidationManager.java | 0 ...tractMavenPluginDependenciesValidator.java | 0 ...nDescriptorSourcedParametersValidator.java | 0 ...bstractMavenPluginParametersValidator.java | 0 .../plugin/internal/DefaultLegacySupport.java | 0 .../internal/DefaultMavenPluginManager.java | 0 .../internal/DefaultMavenPluginValidator.java | 0 .../DefaultPluginDependenciesResolver.java | 0 .../DefaultPluginValidationManager.java | 0 .../DeprecatedCoreExpressionValidator.java | 0 .../internal/DeprecatedPluginValidator.java | 0 .../internal/Maven2DependenciesValidator.java | 0 .../Maven3CompatDependenciesValidator.java | 0 .../MavenMixedDependenciesValidator.java | 0 .../MavenPluginConfigurationValidator.java | 0 .../MavenPluginDependenciesValidator.java | 0 .../MavenPluginJavaPrerequisiteChecker.java | 0 .../MavenPluginMavenPrerequisiteChecker.java | 0 .../plugin/internal/MavenPluginValidator.java | 0 .../MavenScopeDependenciesValidator.java | 0 .../maven/plugin/internal/MojoLogWrapper.java | 0 ...ContainerDefaultDependenciesValidator.java | 0 .../internal/PluginConfigurationModule.java | 0 .../internal/PluginDependenciesResolver.java | 0 .../ReadOnlyPluginParametersValidator.java | 0 .../ValidatingConfigurationListener.java | 0 .../prefix/DefaultPluginPrefixRequest.java | 0 .../NoPluginFoundForPrefixException.java | 0 .../plugin/prefix/PluginPrefixRequest.java | 0 .../plugin/prefix/PluginPrefixResolver.java | 0 .../plugin/prefix/PluginPrefixResult.java | 0 .../internal/DefaultPluginPrefixResolver.java | 0 .../internal/DefaultPluginPrefixResult.java | 0 .../version/DefaultPluginVersionRequest.java | 0 .../PluginVersionNotFoundException.java | 0 .../plugin/version/PluginVersionRequest.java | 0 .../PluginVersionResolutionException.java | 0 .../plugin/version/PluginVersionResolver.java | 0 .../plugin/version/PluginVersionResult.java | 0 .../DefaultPluginVersionResolver.java | 0 .../internal/DefaultPluginVersionResult.java | 0 .../maven/project/CycleDetectedException.java | 0 .../DefaultDependencyResolutionRequest.java | 0 .../DefaultDependencyResolutionResult.java | 0 .../project/DefaultMavenProjectHelper.java | 0 .../maven/project/DefaultProjectBuilder.java | 0 .../project/DefaultProjectBuildingHelper.java | 0 .../DefaultProjectBuildingRequest.java | 0 .../project/DefaultProjectBuildingResult.java | 0 .../DefaultProjectDependenciesResolver.java | 0 .../project/DefaultProjectRealmCache.java | 0 .../DependencyResolutionException.java | 0 .../project/DependencyResolutionRequest.java | 0 .../project/DependencyResolutionResult.java | 0 .../DuplicateArtifactAttachmentException.java | 0 .../project/DuplicateProjectException.java | 0 .../maven/project/ExtensionDescriptor.java | 0 .../project/ExtensionDescriptorBuilder.java | 0 .../java/org/apache/maven/project/Graph.java | 0 .../InvalidProjectVersionException.java | 0 .../apache/maven/project/MavenProject.java | 0 .../maven/project/MavenProjectHelper.java | 0 .../apache/maven/project/ProjectBuilder.java | 0 .../project/ProjectBuildingException.java | 0 .../maven/project/ProjectBuildingHelper.java | 0 .../maven/project/ProjectBuildingRequest.java | 0 .../maven/project/ProjectBuildingResult.java | 0 .../project/ProjectDependenciesResolver.java | 0 .../maven/project/ProjectModelResolver.java | 0 .../maven/project/ProjectRealmCache.java | 0 .../apache/maven/project/ProjectSorter.java | 0 .../maven/project/ReactorModelPool.java | 0 .../project/RepositorySessionDecorator.java | 0 .../artifact/ArtifactWithDependencies.java | 0 .../project/artifact/AttachedArtifact.java | 0 .../DefaultProjectArtifactsCache.java | 0 .../InvalidDependencyVersionException.java | 0 .../project/artifact/PluginArtifact.java | 0 .../project/artifact/ProjectArtifact.java | 0 .../artifact/ProjectArtifactsCache.java | 0 .../collector/DefaultProjectsSelector.java | 0 .../MultiModuleCollectionStrategy.java | 0 .../collector/PomlessCollectionStrategy.java | 0 .../collector/ProjectCollectionStrategy.java | 0 .../project/collector/ProjectsSelector.java | 0 .../RequestPomCollectionStrategy.java | 0 .../properties/internal/EnvironmentUtils.java | 0 .../properties/internal/SystemProperties.java | 0 .../resolver/MavenChainedWorkspaceReader.java | 0 .../RepositorySystemSessionFactory.java | 0 .../maven/rtinfo/RuntimeInformation.java | 0 .../internal/DefaultRuntimeInformation.java | 0 .../session/scope/internal/SessionScope.java | 0 .../scope/internal/SessionScopeModule.java | 0 .../SettingsConfigurationException.java | 0 .../apache/maven/settings/SettingsUtils.java | 0 .../maven/toolchain/DefaultToolchain.java | 0 .../toolchain/DefaultToolchainManager.java | 0 .../DefaultToolchainManagerPrivate.java | 0 .../MisconfiguredToolchainException.java | 0 .../maven/toolchain/RequirementMatcher.java | 0 .../toolchain/RequirementMatcherFactory.java | 0 .../org/apache/maven/toolchain/Toolchain.java | 0 .../maven/toolchain/ToolchainFactory.java | 0 .../maven/toolchain/ToolchainManager.java | 0 .../toolchain/ToolchainManagerPrivate.java | 0 .../maven/toolchain/ToolchainPrivate.java | 0 .../toolchain/java/DefaultJavaToolChain.java | 0 .../maven/toolchain/java/JavaToolchain.java | 0 .../toolchain/java/JavaToolchainFactory.java | 0 .../toolchain/java/JavaToolchainImpl.java | 0 .../maven-core}/src/main/mdo/extension.mdo | 0 .../resources/META-INF/maven/extension.xml | 0 .../apache/maven/messages/build.properties | 0 .../org/apache/maven/project/standalone.xml | 0 .../src/site/apt/artifact-handlers.apt | 0 .../src/site/apt/configuration-management.apt | 0 .../src/site/apt/core-extensions.apt.vm | 0 .../src/site/apt/default-bindings.apt.vm | 0 .../getting-to-container-configured-mojos.apt | 0 .../maven-core}/src/site/apt/index.apt | 0 .../maven-core}/src/site/apt/inheritance.apt | 0 .../src/site/apt/lifecycles.apt.vm | 0 .../maven-core}/src/site/apt/offline-mode.apt | 0 .../site/apt/plugin-execution-isolation.apt | 0 .../2.1-lifecycle-refactor-class-diagram.png | Bin ....1-lifecycle-refactor-sequence-diagram.png | Bin .../design/2.1-lifecycle-refactor.graffle | 0 .../maven-core}/src/site/site.xml | 0 .../AbstractCoreMavenComponentTestCase.java | 0 .../org/apache/maven/DefaultMavenTest.java | 0 .../maven/MavenLifecycleParticipantTest.java | 0 .../org/apache/maven/MavenTestHelper.java | 0 .../java/org/apache/maven/SimpleLookup.java | 0 .../artifact/handler/ArtifactHandlerTest.java | 0 .../filter/ExclusionArtifactFilterTest.java | 0 .../DefaultClassRealmManagerTest.java | 0 .../DefaultBeanConfiguratorPathTest.java | 0 .../DefaultBeanConfiguratorTest.java | 0 .../test/java/org/apache/maven/di/DiTest.java | 0 .../DefaultExceptionHandlerTest.java | 0 .../DefaultBuildResumptionAnalyzerTest.java | 0 ...aultBuildResumptionDataRepositoryTest.java | 0 ...ultMavenExecutionRequestPopulatorTest.java | 0 .../execution/DefaultMavenExecutionTest.java | 0 .../internal/MojoExecutionScopeTest.java | 0 .../maven/graph/DefaultGraphBuilderTest.java | 0 .../DefaultProjectDependencyGraphTest.java | 0 .../maven/graph/ProjectSelectorTest.java | 0 .../internal/MultilineMessageHelperTest.java | 0 ...ultRepositorySystemSessionFactoryTest.java | 0 .../ReverseTreeRepositoryListenerTest.java | 0 .../DefaultChecksumAlgorithmServiceTest.java | 0 .../impl/DefaultProjectManagerTest.java | 0 .../internal/impl/DefaultSessionTest.java | 0 .../internal/impl/PropertiesAsMapTest.java | 0 .../apache/maven/internal/impl/TestApi.java | 0 .../internal/impl/TestArtifactHandler.java | 0 .../AbstractRepositoryTestCase.java | 0 .../ConsumerPomArtifactTransformerTest.java | 0 .../impl/ConsumerPomBuilderTest.java | 0 .../lifecycle/DefaultLifecyclesTest.java | 0 .../DelegatingMojoExecutionListener.java | 0 .../DelegatingProjectExecutionListener.java | 0 .../EmptyLifecyclePluginAnalyzer.java | 0 .../LifecycleExecutorSubModulesTest.java | 0 .../lifecycle/LifecycleExecutorTest.java | 0 .../lifecycle/MavenExecutionPlanTest.java | 0 .../MojoExecutionXPathContainer.java | 0 .../internal/BuildListCalculatorTest.java | 0 .../ConcurrencyDependencyGraphTest.java | 0 .../LifecycleDependencyResolverTest.java | 0 .../LifecycleExecutionPlanCalculatorTest.java | 0 .../internal/LifecycleModuleBuilderTest.java | 0 ...ifecycleTaskSegmentCalculatorImplTest.java | 0 .../lifecycle/internal/PhaseRecorderTest.java | 0 .../internal/ProjectBuildListTest.java | 0 .../internal/builder/BuilderCommonTest.java | 0 .../ConcurrencyDependencyGraphTest.java | 0 .../concurrent/BuildPlanCreatorTest.java | 0 .../internal/stub/AboutTheStubs.html | 0 .../internal/stub/BuildPluginManagerStub.java | 0 .../internal/stub/CompletionServiceStub.java | 0 .../internal/stub/DefaultLifecyclesStub.java | 0 .../stub/ExecutionEventCatapultStub.java | 0 .../stub/LifeCyclePluginAnalyzerStub.java | 0 .../LifecycleExecutionPlanCalculatorStub.java | 0 .../LifecycleTaskSegmentCalculatorStub.java | 0 .../internal/stub/MojoExecutorStub.java | 0 .../stub/PluginPrefixResolverStub.java | 0 .../stub/PluginVersionResolverStub.java | 0 .../stub/ProjectDependencyGraphStub.java | 0 .../stub/ProjectDependencyGraphStubTest.java | 0 .../lifecycle/mapping/LifecyclePhaseTest.java | 0 .../apache/maven/model/ModelBuilderTest.java | 0 .../maven/plugin/PluginManagerTest.java | 0 .../plugin/PluginParameterExceptionTest.java | 0 ...luginParameterExpressionEvaluatorTest.java | 0 ...ginParameterExpressionEvaluatorV4Test.java | 0 .../internal/DefaultLegacySupportTest.java | 0 ...avenPluginJavaPrerequisiteCheckerTest.java | 0 .../internal/MavenPluginValidatorTest.java | 0 .../project/AbstractMavenProjectTestCase.java | 0 .../DefaultMavenProjectBuilderTest.java | 0 .../EmptyLifecycleBindingsInjector.java | 0 .../maven/project/EmptyLifecycleExecutor.java | 0 .../project/EmptyProjectBuildingHelper.java | 0 .../ExtensionDescriptorBuilderTest.java | 0 .../org/apache/maven/project/GraphTest.java | 0 .../project/LegacyLocalRepositoryManager.java | 0 .../maven/project/MavenProjectTest.java | 0 .../maven/project/PomConstructionTest.java | 0 .../maven/project/ProjectBuilderTest.java | 0 ...jectBuildingResultWithLocationMatcher.java | 0 ...ildingResultWithProblemMessageMatcher.java | 0 .../project/ProjectModelResolverTest.java | 0 .../maven/project/ProjectSorterTest.java | 0 .../DefaultProjectArtifactsCacheTest.java | 0 .../CanonicalProjectBuilderTest.java | 0 .../maven/project/harness/PomTestWrapper.java | 0 .../harness/Xpp3DomAttributeIterator.java | 0 .../harness/Xpp3DomAttributePointer.java | 0 .../project/harness/Xpp3DomNodeIterator.java | 0 .../project/harness/Xpp3DomNodePointer.java | 0 .../harness/Xpp3DomPointerFactory.java | 0 .../repository/TestMavenRepositorySystem.java | 0 .../repository/TestRepositoryConnector.java | 0 .../TestRepositoryConnectorFactory.java | 0 .../DefaultRuntimeInformationTest.java | 0 .../session/scope/SessionScopeProxyTest.java | 0 .../PomConstructionWithSettingsTest.java | 0 .../maven/settings/SettingsUtilsTest.java | 0 .../DefaultToolchainManagerPrivateTest.java | 0 .../DefaultToolchainManagerTest.java | 0 .../maven/toolchain/DefaultToolchainTest.java | 0 .../RequirementMatcherFactoryTest.java | 0 .../cyclic-reference/module-a/pom.xml | 0 .../cyclic-reference/module-b/pom.xml | 0 .../default-maven/cyclic-reference/pom.xml | 0 .../projects/default-maven/simple/pom.xml | 0 .../lifecycle-dependency-resolver/lib/pom.xml | 0 .../lifecycle-dependency-resolver/pom.xml | 0 .../lifecycle-dependency-resolver/war/pom.xml | 0 .../mojo-configuration/pom.xml | 0 .../lifecycle-executor/project-basic/pom.xml | 0 .../pom.xml | 0 .../org/apache/maven/lifecycle/test/App.java | 0 .../apache/maven/lifecycle/test/AppTest.java | 0 .../project-with-inheritance/pom.xml | 0 .../project-with-multiple-executions/pom.xml | 0 .../src/main/mdo/remote-resources.mdo | 0 .../src/main/mdo/supplemental-model.mdo | 0 .../pom.xml | 0 .../pom.xml | 0 .../module-a/pom.xml | 0 .../module-b/pom.xml | 0 .../pom.xml | 0 .../mng-5003-plugin-realm-cache/pom.xml | 0 .../pom.xml | 0 .../tools.jar | 0 .../pom.xml | 0 .../project-with-inheritance/pom.xml | 0 .../pom.xml | 0 .../sub/pom.xml | 0 .../apache/maven/its/mng3906/a/0.1/a-0.1.jar | Bin .../apache/maven/its/mng3906/a/0.1/a-0.1.pom | 0 .../apache/maven/its/mng3906/a/0.2/a-0.2.jar | Bin .../apache/maven/its/mng3906/a/0.2/a-0.2.pom | 0 .../maven/its/mng3906/a/maven-metadata.xml | 0 .../apache/maven/its/mng3906/b/0.1/b-0.1.jar | Bin .../apache/maven/its/mng3906/b/0.1/b-0.1.pom | 0 .../maven/its/mng3906/b/maven-metadata.xml | 0 .../apache/maven/its/mng3906/c/0.1/c-0.1.jar | Bin .../apache/maven/its/mng3906/c/0.1/c-0.1.pom | 0 .../maven/its/mng3906/c/maven-metadata.xml | 0 .../apache/maven/its/mng3906/d/0.1/d-0.1.jar | Bin .../apache/maven/its/mng3906/d/0.1/d-0.1.pom | 0 .../maven/its/mng3906/d/maven-metadata.xml | 0 .../apache/maven/its/mng3906/e/0.1/e-0.1.jar | Bin .../apache/maven/its/mng3906/e/0.1/e-0.1.pom | 0 .../maven/its/mng3906/e/maven-metadata.xml | 0 .../sub/settings-template.xml | 0 .../project-builder/MNG-6716/project/pom.xml | 0 .../project-builder/MNG-6723/.mvn/.gitkeep | 0 .../project-builder/MNG-6723/child/pom.xml | 0 .../projects/project-builder/MNG-6723/pom.xml | 0 .../project-builder/MNG-6983/parent-pom.xml | 0 .../projects/project-builder/MNG-6983/pom.xml | 0 .../projects/project-builder/MNG-7648/pom.xml | 0 .../it0063/jdk/jre/placeholder.txt | 0 .../project-builder/it0063/jdk/lib/tools.jar | Bin .../projects/project-builder/it0063/pom.xml | 0 .../project-builder/mng-3023/consumer/pom.xml | 0 .../mng-3023/dependency/dependency-1.jar | Bin .../mng-3023/dependency/pom.xml | 0 .../projects/project-builder/mng-3023/pom.xml | 0 .../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 .../apache/maven/its/bom/maven-metadata.xml | 0 .../maven/its/parent/0.1/parent-0.1.pom | 0 .../maven/its/parent/maven-metadata.xml | 0 .../0.1/maven-it-plugin-0.1.jar | Bin .../0.1/maven-it-plugin-0.1.pom | 0 .../its/plugins/maven-it-plugin/0.1/pom.xml | 0 .../maven-it-plugin/maven-metadata.xml | 0 .../maven/its/plugins/maven-metadata.xml | 0 .../2.0/maven-plugin-api-2.0.jar | Bin .../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 | 0 .../maven-clean-plugin/maven-metadata.xml | 0 .../0.1/maven-compiler-plugin-0.1.jar | Bin .../0.1/maven-compiler-plugin-0.1.pom | 0 .../maven-compiler-plugin/maven-metadata.xml | 0 .../0.1/maven-deploy-plugin-0.1.jar | Bin .../0.1/maven-deploy-plugin-0.1.pom | 0 .../maven-deploy-plugin/maven-metadata.xml | 0 .../0.1/maven-install-plugin-0.1.jar | Bin .../0.1/maven-install-plugin-0.1.pom | 0 .../maven-install-plugin/maven-metadata.xml | 0 .../0.1/maven-jar-plugin-0.1.jar | Bin .../0.1/maven-jar-plugin-0.1.pom | 0 .../maven-jar-plugin/maven-metadata.xml | 0 .../apache/maven/plugins/maven-metadata.xml | 0 .../0.1/maven-plugin-plugin-0.1.jar | Bin .../0.1/maven-plugin-plugin-0.1.pom | 0 .../maven-plugin-plugin/maven-metadata.xml | 0 .../0.1/maven-resources-plugin-0.1.jar | Bin .../0.1/maven-resources-plugin-0.1.pom | 0 .../maven-resources-plugin/maven-metadata.xml | 0 .../0.1/maven-surefire-plugin-0.1.jar | Bin .../0.1/maven-surefire-plugin-0.1.pom | 0 .../maven-surefire-plugin/maven-metadata.xml | 0 .../plexus-utils/1.1/plexus-utils-1.1.jar | Bin .../plexus-utils/1.1/plexus-utils-1.1.pom | 0 .../artifact-id-inheritance/child/pom.xml | 0 .../artifact-id-inheritance/pom.xml | 0 .../basedir-aligned-interpolation/pom.xml | 0 .../pom-with-unusual-name.xml | 0 .../baseuri-interpolation/pom.xml | 0 .../boolean-interpolation/pom.xml | 0 .../build-extension-inheritance/pom.xml | 0 .../build-extension-inheritance/sub/pom.xml | 0 .../complete-model/w-parent/pom.xml | 0 .../complete-model/w-parent/sub/pom.xml | 0 .../complete-model/w-parent/sub/sub/pom.xml | 0 .../complete-model/wo-parent/pom.xml | 0 .../complete-model/wo-parent/sub/pom.xml | 0 .../config-with-plugin-mng/pom.xml | 0 .../consecutive_empty_elements/pom.xml | 0 .../contributors-inheritance/child-2/pom.xml | 0 .../contributors-inheritance/pom.xml | 0 .../dependency-inheritance/maven-parent.xml | 0 .../dependency-inheritance/pom.xml | 0 .../dependency-inheritance/sub/pom.xml | 0 .../pom.xml | 0 .../sub/pom.xml | 0 .../dependency-order/w-plugin-mgmt/pom.xml | 0 .../dependency-order/wo-plugin-mgmt/pom.xml | 0 .../dependency-scope-inheritance/pom.xml | 0 .../dependency-scope-inheritance/sub/pom.xml | 0 .../dependency-scope/pom.xml | 0 .../dependency-scope/sub/pom.xml | 0 .../developers-inheritance/child-2/pom.xml | 0 .../developers-inheritance/pom.xml | 0 .../distribution-management/pom.xml | 0 .../dual-execution-ids/pom.xml | 0 .../dual-execution-ids/sub/pom.xml | 0 .../nexus-parent.xml | 0 .../duplicate-exclusions-dependency/pom.xml | 0 .../sub/pom.xml | 0 .../empty-distMng-repo-url/pom.xml | 0 .../empty-scm/pom.xml | 0 .../equal-plugin-deps/pom.xml | 0 .../equal-plugin-exec-ids/pom.xml | 0 .../execution-configuration-join/pom.xml | 0 .../pom.xml | 0 .../execution-configuration/pom.xml | 0 .../resources-project-builder/foo/sub/pom.xml | 0 .../full-interpolation/pom.xml | 0 .../pom.xml | 0 .../sub/pom.xml | 0 .../active-profile/pom.xml | 0 .../active-profile/sub/pom.xml | 0 .../no-profile/pom.xml | 0 .../no-profile/sub/pom.xml | 0 .../interpolation-cli-wins/pom.xml | 0 .../jdk-activation/pom.xml | 0 .../join-different-containers-same-id/pom.xml | 0 .../licenses-inheritance/child-2/pom.xml | 0 .../licenses-inheritance/pom.xml | 0 .../limited-inheritance/child/pom.xml | 0 .../limited-inheritance/pom.xml | 0 .../mailing-lists-inheritance/child-2/pom.xml | 0 .../mailing-lists-inheritance/pom.xml | 0 .../managed-profile-dependency/pom.xml | 0 .../managed-profile-dependency/sub/pom.xml | 0 .../merged-filter-order/pom.xml | 0 .../merged-filter-order/sub/pom.xml | 0 .../w-plugin-mgmt/pom.xml | 0 .../w-plugin-mgmt/sub/pom.xml | 0 .../wo-plugin-mgmt/pom.xml | 0 .../wo-plugin-mgmt/sub/pom.xml | 0 .../w-plugin-mgmt/pom.xml | 0 .../w-plugin-mgmt/sub/pom.xml | 0 .../wo-plugin-mgmt/pom.xml | 0 .../wo-plugin-mgmt/sub/pom.xml | 0 .../w-plugin-mgmt/pom.xml | 0 .../w-plugin-mgmt/sub/pom.xml | 0 .../wo-plugin-mgmt/pom.xml | 0 .../wo-plugin-mgmt/sub/pom.xml | 0 .../micromailer/pom.xml | 0 .../micromailer/spice-parent-9.pom | 0 .../multiple-filters/pom.xml | 0 .../multiple-repos/pom.xml | 0 .../multiple-repos/sub/pom.xml | 0 .../nested-build-dir-interpolation/pom.xml | 0 .../parent-inheritance/child3.xml | 0 .../parent-inheritance/pom.xml | 0 .../parent-inheritance/sub/pom.xml | 0 .../parent-interpolation/pom.xml | 0 .../parent-interpolation/sub/pom.xml | 0 .../parent-pom-packaging/pom.xml | 0 .../parent-pom-packaging/sub/pom.xml | 0 .../platform-file-separator/pom.xml | 0 .../plugin-config-append/no-profile/pom.xml | 0 .../no-profile/subproject/pom.xml | 0 .../plugin-config-append/with-profile/pom.xml | 0 .../with-profile/subproject/pom.xml | 0 .../w-plugin-mgmt/pom.xml | 0 .../w-profile/pom.xml | 0 .../wo-plugin-mgmt/pom.xml | 0 .../plugin-config-merging/child/pom.xml | 0 .../plugin-config-merging/pom.xml | 0 .../plugin-config-order/w-plugin-mgmt/pom.xml | 0 .../wo-plugin-mgmt/pom.xml | 0 .../plugin-config-properties/pom.xml | 0 .../w-plugin-mgmt/pom.xml | 0 .../wo-plugin-mgmt/pom.xml | 0 .../w-plugin-mgmt/pom.xml | 0 .../wo-plugin-mgmt/pom.xml | 0 .../plugin-exec-inheritance/pom.xml | 0 .../plugin-exec-inheritance/w-merge/pom.xml | 0 .../plugin-exec-inheritance/wo-merge/pom.xml | 0 .../pom.xml | 0 .../sub/pom.xml | 0 .../plugin-exec-merging-wo-version/pom.xml | 0 .../sub/pom.xml | 0 .../plugin-exec-merging/w-plugin-mgmt/pom.xml | 0 .../w-plugin-mgmt/sub/pom.xml | 0 .../wo-plugin-mgmt/pom.xml | 0 .../wo-plugin-mgmt/sub/pom.xml | 0 .../pom.xml | 0 .../plugin-exec-order-with-lifecycle/pom.xml | 0 .../plugin-exec-order/w-plugin-mgmt/pom.xml | 0 .../plugin-exec-order/wo-plugin-mgmt/pom.xml | 0 .../w-plugin-mgmt/pom.xml | 0 .../wo-plugin-mgmt/pom.xml | 0 .../plugin-inheritance-merge-order/pom.xml | 0 .../sub/pom.xml | 0 .../plugin-inheritance-order/child/pom.xml | 0 .../plugin-inheritance-order/pom.xml | 0 .../plugin-inheritance-simple/pom.xml | 0 .../plugin-inheritance-simple/sub/pom.xml | 0 .../plugin-injection-merge-order/pom.xml | 0 .../plugin-interpolation-build/pom.xml | 0 .../plugin-interpolation-reporting/pom.xml | 0 .../plugin-management-dependencies/pom.xml | 0 .../sub/pom.xml | 0 .../plugin-management-duplicate/pom.xml | 0 .../plugin-management-duplicate/sub/pom.xml | 0 .../child/pom.xml | 0 .../pom.xml | 0 .../plugin-management-inheritance/pom.xml | 0 .../plugin-merge-simple/pom.xml | 0 .../plugin-order/nexus-parent.xml | 0 .../plugin-order/pom.xml | 0 .../pluginmanagement-inherited/pom.xml | 0 .../pluginmanagement-inherited/sub/pom.xml | 0 .../pom-encoding/latin-1/pom.xml | 0 .../pom-encoding/utf-8/pom.xml | 0 .../pom-inheritance/child-1/pom.xml | 0 .../pom-inheritance/child-2/pom.xml | 0 .../pom-inheritance/pom.xml | 0 .../prerequisites-inheritance/child/pom.xml | 0 .../prerequisites-inheritance/pom.xml | 0 .../profile-default-deactivation/pom.xml | 0 .../pom.xml | 0 .../profile-injected-dependencies/pom.xml | 0 .../profile-injection-order/pom.xml | 0 .../maven-inherit-plugin/pom.xml | 0 .../maven-pax-plugin/pom.xml | 0 .../profile-module-inheritance/pom.xml | 0 .../profile-module-inheritance/sub/pom.xml | 0 .../profile-module/module-1/pom.xml | 0 .../profile-module/module-2/pom.xml | 0 .../profile-module/module-3/pom.xml | 0 .../profile-module/module-4/pom.xml | 0 .../profile-module/module-5/pom.xml | 0 .../profile-module/pom.xml | 0 .../profile-plugin-mng-dependencies/pom.xml | 0 .../sub/pom.xml | 0 .../profile-plugins/pom.xml | 0 .../profile-properties-interpolation/pom.xml | 0 .../properties-inheritance/pom.xml | 0 .../properties-inheritance/sub/pom.xml | 0 .../properties-no-duplication/pom.xml | 0 .../properties-no-duplication/sub/pom.xml | 0 .../repo-inheritance/pom.xml | 0 .../reporting-interpolation/pom.xml | 0 .../reporting-plugin-config/pom.xml | 0 .../reporting-plugin-config/sub/pom.xml | 0 .../jetty-parent.xml | 0 .../single-configuration-inheritance/pom.xml | 0 .../system-property-interpolation/pom.xml | 0 .../unc-path/pom.xml | 0 .../unc-path/sub/pom.xml | 0 .../dep-mgmt-in-profile/pom.xml | 0 .../unique-dependency-key/dep-mgmt/pom.xml | 0 .../deps-in-profile/pom.xml | 0 .../unique-dependency-key/deps/pom.xml | 0 .../artifact-repo-in-profile/pom.xml | 0 .../unique-repo-id/artifact-repo/pom.xml | 0 .../plugin-repo-in-profile/pom.xml | 0 .../unique-repo-id/plugin-repo/pom.xml | 0 .../url-append/child/pom.xml | 0 .../url-append/parent/pom.xml | 0 .../url-inheritance/another-parent/pom.xml | 0 .../another-parent/sub/pom.xml | 0 .../url-inheritance/pom.xml | 0 .../url-inheritance/sub/pom.xml | 0 .../url-no-decoding/pom.xml | 0 .../xml-coalesce-text/pom.xml | 0 .../xml-markup-interpolation/pom.xml | 0 .../xml-whitespace/pom.xml | 0 .../xml-whitespace/sub/pom.xml | 0 .../resources-settings/repositories/pom.xml | 0 .../repositories/settings.xml | 0 .../settings-no-pom/pom.xml | 0 .../settings-no-pom/settings.xml | 0 .../pom.xml | 0 .../settings.xml | 0 .../maven/org.apache.maven.api.di.Inject | 0 .../maven-core/pom.properties | 0 .../1.0.3/commons-logging-1.0.3.jar | Bin .../1.0.3/commons-logging-1.0.3.jar.sha1 | 0 .../1.0.3/commons-logging-1.0.3.pom | 0 .../1.0.3/commons-logging-1.0.3.pom.sha1 | 0 ...ng-1.0.4-javadoc-resources.jar.lastUpdated | 0 .../1.0.4/commons-logging-1.0.4.jar | Bin .../1.0.4/commons-logging-1.0.4.jar.sha1 | 0 .../1.0.4/commons-logging-1.0.4.pom | 0 .../1.0.4/commons-logging-1.0.4.pom.sha1 | 0 .../junit/junit/4.13.1/junit-4.13.1.jar | Bin .../junit/junit/4.13.1/junit-4.13.1.jar.sha1 | 0 .../junit/junit/4.13.1/junit-4.13.1.pom | 0 .../junit/junit/4.13.1/junit-4.13.1.pom.sha1 | 0 .../org/apache/apache/3/apache-3.pom | 0 .../org/apache/apache/3/apache-3.pom.md5 | 0 .../org/apache/apache/3/apache-3.pom.sha1 | 0 .../maven-artifact-3.0-SNAPSHOT.jar | Bin .../maven-artifact-3.0-SNAPSHOT.jar.md5 | 0 .../maven-artifact-3.0-SNAPSHOT.jar.sha1 | 0 .../maven-artifact-3.0-SNAPSHOT.pom | 0 .../maven-artifact-3.0-SNAPSHOT.pom.md5 | 0 .../maven-artifact-3.0-SNAPSHOT.pom.sha1 | 0 .../test-extension/1/test-extension-1.jar | Bin .../test-extension/1/test-extension-1.pom | 0 .../test-extension/1/test-extension-1.pom.md5 | 0 .../1/test-extension-1.pom.sha1 | 0 .../test-lifecycle-and-artifactHandler-1.jar | Bin .../test-lifecycle-and-artifactHandler-1.pom | 0 ...st-lifecycle-and-artifactHandler-1.pom.md5 | 0 ...t-lifecycle-and-artifactHandler-1.pom.sha1 | 0 .../maven/maven-parent/4/maven-parent-4.pom | 0 .../maven-parent/4/maven-parent-4.pom.md5 | 0 .../maven-parent/4/maven-parent-4.pom.sha1 | 0 .../maven/maven-parent/5/maven-parent-5.pom | 0 .../maven-parent/5/maven-parent-5.pom.md5 | 0 .../maven-parent/5/maven-parent-5.pom.sha1 | 0 .../wagon-provider-api-1.0-beta-2.jar | Bin .../wagon-provider-api-1.0-beta-2.jar.md5 | 0 .../wagon-provider-api-1.0-beta-2.jar.sha1 | 0 .../wagon-provider-api-1.0-beta-2.pom | 0 .../wagon-provider-api-1.0-beta-2.pom.md5 | 0 .../wagon-provider-api-1.0-beta-2.pom.sha1 | 0 .../1.0-beta-2/wagon-providers-1.0-beta-2.pom | 0 .../wagon-providers-1.0-beta-2.pom.md5 | 0 .../wagon-providers-1.0-beta-2.pom.sha1 | 0 .../1.0-beta-2/wagon-webdav-1.0-beta-2.jar | Bin .../wagon-webdav-1.0-beta-2.jar.md5 | 0 .../wagon-webdav-1.0-beta-2.jar.sha1 | 0 .../1.0-beta-2/wagon-webdav-1.0-beta-2.pom | 0 .../wagon-webdav-1.0-beta-2.pom.md5 | 0 .../wagon-webdav-1.0-beta-2.pom.sha1 | 0 .../wagon/1.0-beta-2/wagon-1.0-beta-2.pom | 0 .../wagon/1.0-beta-2/wagon-1.0-beta-2.pom.md5 | 0 .../1.0-beta-2/wagon-1.0-beta-2.pom.sha1 | 0 .../plexus-active-collections-1.0-beta-1.jar | Bin ...exus-active-collections-1.0-beta-1.jar.md5 | 0 ...xus-active-collections-1.0-beta-1.jar.sha1 | 0 .../plexus-active-collections-1.0-beta-1.pom | 0 ...exus-active-collections-1.0-beta-1.pom.md5 | 0 ...xus-active-collections-1.0-beta-1.pom.sha1 | 0 .../plexus-classworlds-1.2-alpha-10.jar | Bin .../plexus-classworlds-1.2-alpha-10.jar.md5 | 0 .../plexus-classworlds-1.2-alpha-10.jar.sha1 | 0 .../plexus-classworlds-1.2-alpha-10.pom | 0 .../plexus-classworlds-1.2-alpha-10.pom.md5 | 0 .../plexus-classworlds-1.2-alpha-10.pom.sha1 | 0 .../plexus-classworlds-1.2-alpha-7.jar | Bin .../plexus-classworlds-1.2-alpha-7.jar.md5 | 0 .../plexus-classworlds-1.2-alpha-7.jar.sha1 | 0 .../plexus-classworlds-1.2-alpha-7.pom | 0 .../plexus-classworlds-1.2-alpha-7.pom.md5 | 0 .../plexus-classworlds-1.2-alpha-7.pom.sha1 | 0 .../plexus-component-api-1.0-alpha-16.jar | Bin .../plexus-component-api-1.0-alpha-16.jar.md5 | 0 ...plexus-component-api-1.0-alpha-16.jar.sha1 | 0 .../plexus-component-api-1.0-alpha-16.pom | 0 .../plexus-component-api-1.0-alpha-16.pom.md5 | 0 ...plexus-component-api-1.0-alpha-16.pom.sha1 | 0 .../plexus-component-api-1.0-alpha-32.jar | Bin .../plexus-component-api-1.0-alpha-32.jar.md5 | 0 ...plexus-component-api-1.0-alpha-32.jar.sha1 | 0 .../plexus-component-api-1.0-alpha-32.pom | 0 .../plexus-component-api-1.0-alpha-32.pom.md5 | 0 ...plexus-component-api-1.0-alpha-32.pom.sha1 | 0 .../1.1.6/plexus-components-1.1.6.pom | 0 .../1.1.6/plexus-components-1.1.6.pom.md5 | 0 .../1.1.6/plexus-components-1.1.6.pom.sha1 | 0 .../plexus-container-default-1.0-alpha-16.jar | Bin ...xus-container-default-1.0-alpha-16.jar.md5 | 0 ...us-container-default-1.0-alpha-16.jar.sha1 | 0 .../plexus-container-default-1.0-alpha-16.pom | 0 ...xus-container-default-1.0-alpha-16.pom.md5 | 0 ...us-container-default-1.0-alpha-16.pom.sha1 | 0 .../plexus-container-default-1.0-alpha-32.jar | Bin ...xus-container-default-1.0-alpha-32.jar.md5 | 0 ...us-container-default-1.0-alpha-32.jar.sha1 | 0 .../plexus-container-default-1.0-alpha-32.pom | 0 ...xus-container-default-1.0-alpha-32.pom.md5 | 0 ...us-container-default-1.0-alpha-32.pom.sha1 | 0 .../plexus-containers-1.0-alpha-16.pom | 0 .../plexus-containers-1.0-alpha-16.pom.md5 | 0 .../plexus-containers-1.0-alpha-16.pom.sha1 | 0 .../plexus-containers-1.0-alpha-32.pom | 0 .../plexus-containers-1.0-alpha-32.pom.md5 | 0 .../plexus-containers-1.0-alpha-32.pom.sha1 | 0 .../plexus-utils/1.0.4/plexus-utils-1.0.4.jar | Bin .../1.0.4/plexus-utils-1.0.4.jar.sha1 | 0 .../plexus-utils/1.0.4/plexus-utils-1.0.4.pom | 0 .../1.0.4/plexus-utils-1.0.4.pom.sha1 | 0 .../plexus-utils/1.1/plexus-utils-1.1.jar | Bin .../plexus-utils/1.1/plexus-utils-1.1.jar.md5 | 0 .../1.1/plexus-utils-1.1.jar.sha1 | 0 .../plexus-utils/1.1/plexus-utils-1.1.pom | 0 .../plexus-utils/1.1/plexus-utils-1.1.pom.md5 | 0 .../1.1/plexus-utils-1.1.pom.sha1 | 0 .../plexus-utils/1.4.5/plexus-utils-1.4.5.jar | Bin .../1.4.5/plexus-utils-1.4.5.jar.md5 | 0 .../1.4.5/plexus-utils-1.4.5.jar.sha1 | 0 .../plexus-utils/1.4.5/plexus-utils-1.4.5.pom | 0 .../1.4.5/plexus-utils-1.4.5.pom.md5 | 0 .../1.4.5/plexus-utils-1.4.5.pom.sha1 | 0 .../plexus/plexus/1.0.10/plexus-1.0.10.pom | 0 .../plexus/1.0.10/plexus-1.0.10.pom.md5 | 0 .../plexus/1.0.10/plexus-1.0.10.pom.sha1 | 0 .../plexus/plexus/1.0.11/plexus-1.0.11.pom | 0 .../plexus/1.0.11/plexus-1.0.11.pom.md5 | 0 .../plexus/1.0.11/plexus-1.0.11.pom.sha1 | 0 .../plexus/plexus/1.0.4/plexus-1.0.4.pom | 0 .../plexus/plexus/1.0.4/plexus-1.0.4.pom.md5 | 0 .../plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 | 0 .../plexus/plexus/1.0.8/plexus-1.0.8.pom | 0 .../plexus/plexus/1.0.8/plexus-1.0.8.pom.md5 | 0 .../plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 | 0 .../plexus/plexus/1.0.9/plexus-1.0.9.pom | 0 .../plexus/plexus/1.0.9/plexus-1.0.9.pom.md5 | 0 .../plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 | 0 ...core-1.3-javadoc-resources.jar.lastUpdated | 0 .../1.3/hamcrest-core-1.3-javadoc.jar | Bin .../1.3/hamcrest-core-1.3-javadoc.jar.sha1 | 0 .../1.3/hamcrest-core-1.3-sources.jar | Bin .../1.3/hamcrest-core-1.3-sources.jar.sha1 | 0 .../hamcrest-core/1.3/hamcrest-core-1.3.jar | Bin .../1.3/hamcrest-core-1.3.jar.sha1 | 0 .../hamcrest-core/1.3/hamcrest-core-1.3.pom | 0 .../1.3/hamcrest-core-1.3.pom.sha1 | 0 .../1.3/hamcrest-parent-1.3.pom | 0 .../1.3/hamcrest-parent-1.3.pom.sha1 | 0 .../src/test/resources/canonical-pom.xml | 0 .../test/resources/consumer/simple/pom.xml | 0 .../consumer/simple/simple-parent/pom.xml | 0 .../simple-parent/simple-testutils/pom.xml | 0 .../simple-parent/simple-weather/pom.xml | 0 .../simple-parent/simple-webapp/pom.xml | 0 .../simple/simple-parent/utils-parent/pom.xml | 0 .../resources/consumer/trivial/child/pom.xml | 0 .../test/resources/consumer/trivial/pom.xml | 0 .../resources/dependencyManagement-pom.xml | 0 .../resources/distributionManagement-pom.xml | 0 .../t01/maven-test/jars/maven-test-a-1.0.jar | 0 .../t01/maven-test/jars/maven-test-a-1.1.jar | 0 .../t01/maven-test/jars/maven-test-b-1.0.jar | 0 .../t01/maven-test/jars/maven-test-b-1.1.jar | 0 .../t01/maven-test/jars/maven-test-c-1.0.jar | 0 .../t01/maven-test/jars/maven-test-c-1.1.jar | 0 .../t01/maven-test/jars/maven-test-d-1.0.jar | 0 .../t01/maven-test/jars/maven-test-d-1.1.jar | 0 .../t01/maven-test/jars/maven-test-d-1.2.jar | 0 .../t01/maven-test/poms/maven-test-a-1.0.pom | 0 .../t01/maven-test/poms/maven-test-a-1.1.pom | 0 .../t01/maven-test/poms/maven-test-b-1.0.pom | 0 .../t01/maven-test/poms/maven-test-b-1.1.pom | 0 .../t01/maven-test/poms/maven-test-c-1.0.pom | 0 .../t01/maven-test/poms/maven-test-c-1.1.pom | 0 .../t01/maven-test/poms/maven-test-d-1.0.pom | 0 .../t01/maven-test/poms/maven-test-d-1.1.pom | 0 .../t01/maven-test/poms/maven-test-d-1.2.pom | 0 .../resources/imports-repo/t01/p0/p1/pom.xml | 0 .../resources/imports-repo/t01/p0/p2/pom.xml | 0 .../resources/imports-repo/t01/p0/p3/pom.xml | 0 .../resources/imports-repo/t01/p0/p4/pom.xml | 0 .../resources/imports-repo/t01/p0/pom.xml | 0 .../src/test/resources/local-repo/marker.txt | 0 .../maven-test/jars/maven-test-a-1.0.jar | 0 .../maven-test/jars/maven-test-b-1.0.jar | 0 .../maven-test/jars/maven-test-c-1.0.jar | 0 .../maven-test/jars/maven-test-d-1.0.jar | 0 .../maven-test/poms/maven-test-a-1.0.pom | 0 .../maven-test/poms/maven-test-b-1.0.pom | 0 .../maven-test/poms/maven-test-c-1.0.pom | 0 .../maven-test/poms/maven-test-d-1.1.pom | 0 .../maven-test/poms/maven-test-d-1.2.pom | 0 .../jars/maven-snapshot-a-1.0-SNAPSHOT.jar | 0 ...apshot-a-1.0-SNAPSHOT.jar.snapshot-version | 0 .../jars/maven-snapshot-b-1.0-SNAPSHOT.jar | 0 ...apshot-b-1.0-SNAPSHOT.jar.snapshot-version | 0 .../jars/maven-snapshot-e-1.0-SNAPSHOT.jar | 0 ...apshot-e-1.0-SNAPSHOT.jar.snapshot-version | 0 .../maven-test-snapshot-resolving-1.0.pom | 0 .../maven/MavenLifecycleParticipantTest.xml | 0 .../apache/maven/execution/resume.properties | 0 .../maven/execution/test-extension-1.jar | Bin .../org/apache/apache/3/apache-3.pom | 0 .../org/apache/apache/3/apache-3.pom.md5 | 0 .../org/apache/apache/3/apache-3.pom.sha1 | 0 .../maven-artifact-3.0-SNAPSHOT.jar | Bin .../maven-artifact-3.0-SNAPSHOT.jar.md5 | 0 .../maven-artifact-3.0-SNAPSHOT.jar.sha1 | 0 .../maven-artifact-3.0-SNAPSHOT.pom | 0 .../maven-artifact-3.0-SNAPSHOT.pom.md5 | 0 .../maven-artifact-3.0-SNAPSHOT.pom.sha1 | 0 .../test-extension/1/test-extension-1.jar | Bin .../test-extension/1/test-extension-1.pom | 0 .../test-extension/1/test-extension-1.pom.md5 | 0 .../1/test-extension-1.pom.sha1 | 0 .../test-lifecycle-and-artifactHandler-1.jar | Bin .../test-lifecycle-and-artifactHandler-1.pom | 0 ...st-lifecycle-and-artifactHandler-1.pom.md5 | 0 ...t-lifecycle-and-artifactHandler-1.pom.sha1 | 0 .../maven/maven-parent/4/maven-parent-4.pom | 0 .../maven-parent/4/maven-parent-4.pom.md5 | 0 .../maven-parent/4/maven-parent-4.pom.sha1 | 0 .../maven/maven-parent/5/maven-parent-5.pom | 0 .../maven-parent/5/maven-parent-5.pom.md5 | 0 .../maven-parent/5/maven-parent-5.pom.sha1 | 0 .../wagon-provider-api-1.0-beta-2.jar | Bin .../wagon-provider-api-1.0-beta-2.jar.md5 | 0 .../wagon-provider-api-1.0-beta-2.jar.sha1 | 0 .../wagon-provider-api-1.0-beta-2.pom | 0 .../wagon-provider-api-1.0-beta-2.pom.md5 | 0 .../wagon-provider-api-1.0-beta-2.pom.sha1 | 0 .../wagon/1.0-beta-2/wagon-1.0-beta-2.pom | 0 .../wagon/1.0-beta-2/wagon-1.0-beta-2.pom.md5 | 0 .../1.0-beta-2/wagon-1.0-beta-2.pom.sha1 | 0 .../plexus-active-collections-1.0-beta-1.jar | Bin ...exus-active-collections-1.0-beta-1.jar.md5 | 0 ...xus-active-collections-1.0-beta-1.jar.sha1 | 0 .../plexus-active-collections-1.0-beta-1.pom | 0 ...exus-active-collections-1.0-beta-1.pom.md5 | 0 ...xus-active-collections-1.0-beta-1.pom.sha1 | 0 .../plexus-classworlds-1.2-alpha-10.jar | Bin .../plexus-classworlds-1.2-alpha-10.jar.md5 | 0 .../plexus-classworlds-1.2-alpha-10.jar.sha1 | 0 .../plexus-classworlds-1.2-alpha-10.pom | 0 .../plexus-classworlds-1.2-alpha-10.pom.md5 | 0 .../plexus-classworlds-1.2-alpha-10.pom.sha1 | 0 .../plexus-classworlds-1.2-alpha-7.jar | Bin .../plexus-classworlds-1.2-alpha-7.jar.md5 | 0 .../plexus-classworlds-1.2-alpha-7.jar.sha1 | 0 .../plexus-classworlds-1.2-alpha-7.pom | 0 .../plexus-classworlds-1.2-alpha-7.pom.md5 | 0 .../plexus-classworlds-1.2-alpha-7.pom.sha1 | 0 .../plexus-component-api-1.0-alpha-16.jar | Bin .../plexus-component-api-1.0-alpha-16.jar.md5 | 0 ...plexus-component-api-1.0-alpha-16.jar.sha1 | 0 .../plexus-component-api-1.0-alpha-16.pom | 0 .../plexus-component-api-1.0-alpha-16.pom.md5 | 0 ...plexus-component-api-1.0-alpha-16.pom.sha1 | 0 .../plexus-component-api-1.0-alpha-32.jar | Bin .../plexus-component-api-1.0-alpha-32.jar.md5 | 0 ...plexus-component-api-1.0-alpha-32.jar.sha1 | 0 .../plexus-component-api-1.0-alpha-32.pom | 0 .../plexus-component-api-1.0-alpha-32.pom.md5 | 0 ...plexus-component-api-1.0-alpha-32.pom.sha1 | 0 .../1.1.6/plexus-components-1.1.6.pom | 0 .../1.1.6/plexus-components-1.1.6.pom.md5 | 0 .../1.1.6/plexus-components-1.1.6.pom.sha1 | 0 .../plexus-container-default-1.0-alpha-16.jar | Bin ...xus-container-default-1.0-alpha-16.jar.md5 | 0 ...us-container-default-1.0-alpha-16.jar.sha1 | 0 .../plexus-container-default-1.0-alpha-16.pom | 0 ...xus-container-default-1.0-alpha-16.pom.md5 | 0 ...us-container-default-1.0-alpha-16.pom.sha1 | 0 .../plexus-container-default-1.0-alpha-32.jar | Bin ...xus-container-default-1.0-alpha-32.jar.md5 | 0 ...us-container-default-1.0-alpha-32.jar.sha1 | 0 .../plexus-container-default-1.0-alpha-32.pom | 0 ...xus-container-default-1.0-alpha-32.pom.md5 | 0 ...us-container-default-1.0-alpha-32.pom.sha1 | 0 .../plexus-containers-1.0-alpha-16.pom | 0 .../plexus-containers-1.0-alpha-16.pom.md5 | 0 .../plexus-containers-1.0-alpha-16.pom.sha1 | 0 .../plexus-containers-1.0-alpha-32.pom | 0 .../plexus-containers-1.0-alpha-32.pom.md5 | 0 .../plexus-containers-1.0-alpha-32.pom.sha1 | 0 .../plexus-utils/1.1/plexus-utils-1.1.jar | Bin .../plexus-utils/1.1/plexus-utils-1.1.jar.md5 | 0 .../1.1/plexus-utils-1.1.jar.sha1 | 0 .../plexus-utils/1.1/plexus-utils-1.1.pom | 0 .../plexus-utils/1.1/plexus-utils-1.1.pom.md5 | 0 .../1.1/plexus-utils-1.1.pom.sha1 | 0 .../plexus-utils/1.4.5/plexus-utils-1.4.5.jar | Bin .../1.4.5/plexus-utils-1.4.5.jar.md5 | 0 .../1.4.5/plexus-utils-1.4.5.jar.sha1 | 0 .../plexus-utils/1.4.5/plexus-utils-1.4.5.pom | 0 .../1.4.5/plexus-utils-1.4.5.pom.md5 | 0 .../1.4.5/plexus-utils-1.4.5.pom.sha1 | 0 .../plexus/plexus/1.0.10/plexus-1.0.10.pom | 0 .../plexus/1.0.10/plexus-1.0.10.pom.md5 | 0 .../plexus/1.0.10/plexus-1.0.10.pom.sha1 | 0 .../plexus/plexus/1.0.11/plexus-1.0.11.pom | 0 .../plexus/1.0.11/plexus-1.0.11.pom.md5 | 0 .../plexus/1.0.11/plexus-1.0.11.pom.sha1 | 0 .../plexus/plexus/1.0.4/plexus-1.0.4.pom | 0 .../plexus/plexus/1.0.4/plexus-1.0.4.pom.md5 | 0 .../plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 | 0 .../plexus/plexus/1.0.8/plexus-1.0.8.pom | 0 .../plexus/plexus/1.0.8/plexus-1.0.8.pom.md5 | 0 .../plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 | 0 .../plexus/plexus/1.0.9/plexus-1.0.9.pom | 0 .../plexus/plexus/1.0.9/plexus-1.0.9.pom.md5 | 0 .../plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 | 0 .../test-extension-repo/repo-marker.txt | 0 .../maven/lifecycle/LifecycleExecutorTest.xml | 0 .../org/apache/maven/lifecycle/pom.xml | 0 .../apache/maven/plugin/PluginManagerTest.xml | 0 .../project/AbstractMavenProjectTestCase.xml | 0 .../maven/project/PomConstructionTest.xml | 0 .../project/workspace/buildFromFile/pom.xml | 0 .../project-caching/1/project-caching-1.pom | 0 .../project-caching/maven-metadata-local.xml | 0 .../workspace/buildModelLineage/pom.xml | 0 .../childAndParent/child/pom.xml | 0 .../resolveParentPom/childAndParent/pom.xml | 0 .../workspace/resolveParentPom/pom.xml | 0 .../PomConstructionWithSettingsTest.xml | 0 .../plexus-utils/1.1/plexus-utils-1.1.jar | Bin .../1.1/plexus-utils-1.1.jar.sha1 | 0 .../plexus-utils/1.1/plexus-utils-1.1.pom | 0 .../1.1/plexus-utils-1.1.pom.sha1 | 0 .../maven-core}/src/test/resources/pom.xml | 0 .../project-dynamism/plugin-level-dep.pom.xml | 0 .../resources/project-dynamism/pom-interp.xml | 0 .../project-dynamism/pom-relative.xml | 0 .../test/resources/project-dynamism/pom.xml | 0 .../projects/artifactMissingVersion/pom.xml | 0 .../resources/projects/bad-dependency.xml | 0 .../test/resources/projects/bad-project.xml | 0 .../src/test/resources/projects/badPom.xml | 0 ...-which-needs-directory-alignment-child.xml | 0 ...roject-which-needs-directory-alignment.xml | 0 ...-which-needs-directory-alignment-child.xml | 0 .../projects/basic-resolveDependencies.xml | 0 .../projects/build-path-expression-pom.xml | 0 .../test/resources/projects/build.properties | 0 .../child-which-inherits-from-super-model.xml | 0 .../projects/child-with-bogus-parent.xml | 0 .../src/test/resources/projects/child.xml | 0 .../projects/duplicate-plugins-merged-pom.xml | 0 .../projects/fully-populated-child.xml | 0 .../projects/future-model-version-pom.xml | 0 .../future-schema-model-version-pom.xml | 0 .../grandchild-check/child/grandchild/pom.xml | 0 .../projects/grandchild-check/child/pom.xml | 0 .../projects/grandchild-check/pom.xml | 0 .../projects/modelsource/module01/pom.xml | 0 .../resources/projects/modelsource/pom.xml | 0 .../projects/modelsourcebasedir/pom.xml | 0 .../pom.xml | 0 .../pom.xml | 0 .../pom.xml | 0 .../pom.xml | 0 .../pom.xml | 0 .../pom.xml | 0 .../pom.xml | 0 .../child/pom.xml | 0 .../pom.xml | 0 .../child/pom.xml | 0 .../pom.xml | 0 .../child/pom.xml | 0 .../pom.xml | 0 .../child/pom.xml | 0 .../pom.xml | 0 .../child/pom.xml | 0 .../parent-version-range-local-valid/pom.xml | 0 .../projects/past-model-version-pom.xml | 0 .../src/test/resources/projects/project.xml | 0 .../test/resources/projects/reread/pom1.xml | 0 .../test/resources/projects/reread/pom2.xml | 0 .../subprojects-discover/child/pom.xml | 0 .../projects/subprojects-discover/pom.xml | 0 .../resources/projects/transform/after.pom | 0 .../resources/projects/transform/before.pom | 0 .../projects/transform/jar/after.pom | 0 .../projects/transform/jar/before.pom | 0 .../resources/projects/tree/consumer/pom.xml | 0 .../test/resources/projects/tree/dep/pom.xml | 0 .../src/test/resources/projects/tree/pom.xml | 0 .../versionless-managed-dependency.xml | 0 .../maven-test/jars/maven-test-b-1.0.jar | Bin .../maven-test/jars/maven-test-b-1.0.jar.md5 | 0 .../maven-test/poms/maven-test-b-1.0.pom | 0 .../jars/maven-snapshot-a-1.0-SNAPSHOT.jar | 0 ...apshot-a-1.0-SNAPSHOT.jar.snapshot-version | 0 .../jars/maven-snapshot-b-1.0-SNAPSHOT.jar | 0 ...apshot-b-1.0-SNAPSHOT.jar.snapshot-version | 0 .../jars/maven-snapshot-c-1.0-SNAPSHOT.jar | 0 ...apshot-c-1.0-SNAPSHOT.jar.snapshot-version | 0 .../maven-test/jars/maven-test-z-1.0.jar | 0 .../withActiveByDefaultProfile-pom.xml | 0 {maven-di => impl/maven-di}/pom.xml | 2 + .../java/org/apache/maven/di/Injector.java | 0 .../main/java/org/apache/maven/di/Key.java | 0 .../main/java/org/apache/maven/di/Scope.java | 0 .../org/apache/maven/di/impl/Binding.java | 0 .../maven/di/impl/BindingInitializer.java | 0 .../org/apache/maven/di/impl/DIException.java | 0 .../org/apache/maven/di/impl/Dependency.java | 0 .../apache/maven/di/impl/InjectorImpl.java | 0 .../apache/maven/di/impl/ReflectionUtils.java | 0 .../java/org/apache/maven/di/impl/Types.java | 0 .../java/org/apache/maven/di/impl/Utils.java | 0 .../maven-di}/src/site/site.xml | 0 .../maven/di/impl/InjectorImplTest.java | 0 .../apache/maven/di/impl/TypeUtilsTest.java | 0 {maven-api-impl => impl/maven-impl}/pom.xml | 22 ++++---- .../model/DependencyManagementImporter.java | 0 .../model/DependencyManagementInjector.java | 0 .../services/model/InheritanceAssembler.java | 0 .../model/LifecycleBindingsInjector.java | 0 .../maven/api/services/model/ModelCache.java | 0 .../api/services/model/ModelCacheFactory.java | 0 .../api/services/model/ModelInterpolator.java | 0 .../api/services/model/ModelNormalizer.java | 0 .../services/model/ModelPathTranslator.java | 0 .../api/services/model/ModelProcessor.java | 0 .../api/services/model/ModelResolver.java | 0 .../model/ModelResolverException.java | 0 .../services/model/ModelUrlNormalizer.java | 0 .../api/services/model/ModelValidator.java | 0 .../services/model/ModelVersionParser.java | 0 .../api/services/model/PathTranslator.java | 0 .../model/PluginConfigurationExpander.java | 0 .../model/PluginManagementInjector.java | 0 .../model/ProfileActivationContext.java | 0 .../api/services/model/ProfileActivator.java | 0 .../api/services/model/ProfileInjector.java | 0 .../api/services/model/ProfileSelector.java | 0 .../api/services/model/RootDetector.java | 0 .../maven/api/services/model/RootLocator.java | 0 .../api/services/model/UrlNormalizer.java | 0 .../maven/internal/impl/AbstractNode.java | 0 .../maven/internal/impl/AbstractSession.java | 0 .../impl/AetherDependencyWrapper.java | 0 .../maven/internal/impl/DefaultArtifact.java | 0 .../impl/DefaultArtifactCoordinates.java | 0 .../DefaultArtifactCoordinatesFactory.java | 0 .../impl/DefaultArtifactDeployer.java | 0 .../internal/impl/DefaultArtifactFactory.java | 0 .../impl/DefaultArtifactInstaller.java | 0 .../impl/DefaultArtifactResolver.java | 0 .../internal/impl/DefaultBuilderProblem.java | 0 .../impl/DefaultChecksumAlgorithmService.java | 0 .../internal/impl/DefaultDependency.java | 0 .../impl/DefaultDependencyCoordinates.java | 0 .../DefaultDependencyCoordinatesFactory.java | 0 .../impl/DefaultDependencyResolver.java | 0 .../impl/DefaultDependencyResolverResult.java | 0 .../impl/DefaultDownloadedArtifact.java | 0 .../internal/impl/DefaultLocalRepository.java | 0 .../impl/DefaultLocalRepositoryManager.java | 0 .../internal/impl/DefaultMessageBuilder.java | 0 .../impl/DefaultMessageBuilderFactory.java | 0 .../impl/DefaultModelUrlNormalizer.java | 0 .../impl/DefaultModelVersionParser.java | 0 .../internal/impl/DefaultModelXmlFactory.java | 0 .../maven/internal/impl/DefaultNode.java | 0 .../DefaultPluginConfigurationExpander.java | 0 .../impl/DefaultProducedArtifact.java | 0 .../impl/DefaultRemoteRepository.java | 0 .../impl/DefaultRepositoryFactory.java | 0 .../internal/impl/DefaultSettingsBuilder.java | 0 .../impl/DefaultSettingsValidator.java | 0 .../impl/DefaultSettingsXmlFactory.java | 0 .../impl/DefaultSuperPomProvider.java | 0 .../impl/DefaultToolchainsBuilder.java | 0 .../impl/DefaultToolchainsXmlFactory.java | 0 .../maven/internal/impl/DefaultTransport.java | 0 .../impl/DefaultTransportProvider.java | 0 .../internal/impl/DefaultUrlNormalizer.java | 0 .../internal/impl/DefaultVersionParser.java | 0 .../impl/DefaultVersionRangeResolver.java | 0 .../internal/impl/DefaultVersionResolver.java | 0 .../impl/ExtensibleEnumRegistries.java | 0 .../maven/internal/impl/InternalSession.java | 0 .../maven/internal/impl/MappedCollection.java | 0 .../maven/internal/impl/MappedList.java | 0 .../internal/impl/PathModularization.java | 0 .../impl/PathModularizationCache.java | 0 .../maven/internal/impl/PropertiesAsMap.java | 0 .../maven/internal/impl/SettingsUtilsV4.java | 0 .../maven/internal/impl/StaxLocation.java | 0 .../org/apache/maven/internal/impl/Utils.java | 0 .../maven/internal/impl/WrapperNode.java | 0 .../internal/impl/di/MojoExecutionScope.java | 0 .../internal/impl/di/OutOfScopeException.java | 0 .../maven/internal/impl/di/SessionScope.java | 0 .../DefaultDependencyManagementImporter.java | 0 .../DefaultDependencyManagementInjector.java | 0 .../model/DefaultInheritanceAssembler.java | 0 .../impl/model/DefaultInterpolator.java | 0 .../DefaultLifecycleBindingsInjector.java | 0 .../impl/model/DefaultModelBuilder.java | 0 .../impl/model/DefaultModelBuilderResult.java | 0 .../impl/model/DefaultModelCache.java | 0 .../impl/model/DefaultModelCacheFactory.java | 0 .../impl/model/DefaultModelInterpolator.java | 0 .../impl/model/DefaultModelNormalizer.java | 0 .../model/DefaultModelPathTranslator.java | 0 .../impl/model/DefaultModelProblem.java | 0 .../impl/model/DefaultModelProcessor.java | 0 .../impl/model/DefaultModelValidator.java | 0 .../impl/model/DefaultPathTranslator.java | 0 .../DefaultPluginManagementInjector.java | 0 .../DefaultProfileActivationContext.java | 0 .../impl/model/DefaultProfileInjector.java | 0 .../impl/model/DefaultProfileSelector.java | 0 .../impl/model/FileToRawModelMerger.java | 0 .../maven/internal/impl/model/Graph.java | 0 .../impl/model/MavenBuildTimestamp.java | 0 .../internal/impl/model/MavenModelMerger.java | 0 .../maven/internal/impl/model/ModelData.java | 0 .../impl/model/ModelProblemUtils.java | 0 ...ProfileActivationFilePathInterpolator.java | 0 .../maven/internal/impl/model/Result.java | 0 .../model/profile/FileProfileActivator.java | 0 .../profile/JdkVersionProfileActivator.java | 0 .../OperatingSystemProfileActivator.java | 0 .../maven/internal/impl/model/profile/Os.java | 0 .../profile/PackagingProfileActivator.java | 0 .../profile/PropertyProfileActivator.java | 0 .../impl/model/reflection/ClassMap.java | 0 .../reflection/IntrospectionException.java | 0 .../impl/model/reflection/MethodMap.java | 0 .../reflection/ReflectionValueExtractor.java | 0 .../model/rootlocator/DefaultRootLocator.java | 0 .../model/rootlocator/DotMvnRootDetector.java | 0 .../model/rootlocator/PomXmlRootDetector.java | 0 .../ArtifactDescriptorReaderDelegate.java | 0 .../resolver/ArtifactDescriptorUtils.java | 0 .../DefaultArtifactDescriptorReader.java | 0 .../impl/resolver/DefaultModelResolver.java | 0 .../resolver/DefaultVersionRangeResolver.java | 0 .../impl/resolver/DefaultVersionResolver.java | 0 .../impl/resolver/LocalSnapshotMetadata.java | 0 .../LocalSnapshotMetadataGenerator.java | 0 .../MavenArtifactRelocationSource.java | 0 .../internal/impl/resolver/MavenMetadata.java | 0 .../resolver/MavenSessionBuilderSupplier.java | 0 .../impl/resolver/MavenSnapshotMetadata.java | 0 .../impl/resolver/MavenVersionScheme.java | 0 .../impl/resolver/MavenWorkspaceReader.java | 0 .../impl/resolver/PluginsMetadata.java | 0 .../resolver/PluginsMetadataGenerator.java | 0 .../PluginsMetadataGeneratorFactory.java | 0 .../impl/resolver/RelocatedArtifact.java | 0 .../impl/resolver/RemoteSnapshotMetadata.java | 0 .../RemoteSnapshotMetadataGenerator.java | 0 .../impl/resolver/RequestTraceHelper.java | 0 .../SnapshotMetadataGeneratorFactory.java | 0 .../impl/resolver/VersionsMetadata.java | 0 .../resolver/VersionsMetadataGenerator.java | 0 .../VersionsMetadataGeneratorFactory.java | 0 .../artifact/FatArtifactTraverser.java | 0 .../artifact/MavenArtifactProperties.java | 0 .../internal/impl/resolver/package-info.java | 0 ...ionManagementArtifactRelocationSource.java | 0 ...serPropertiesArtifactRelocationSource.java | 0 .../Maven3ScopeManagerConfiguration.java | 0 .../Maven4ScopeManagerConfiguration.java | 0 .../impl/resolver/type/DefaultType.java | 0 .../resolver/type/DefaultTypeProvider.java | 0 .../internal/impl/util/PhasingExecutor.java | 0 ...ache.maven.api.services.model.RootDetector | 0 ...pache.maven.api.services.model.RootLocator | 0 .../org/apache/maven/model/pom-4.0.0.xml | 0 .../org/apache/maven/model/pom-4.1.0.xml | 0 .../maven-impl}/src/site/site.xml | 0 .../impl/DefaultModelVersionParserTest.java | 0 .../DefaultSettingsBuilderFactoryTest.java | 0 .../impl/DefaultSettingsValidatorTest.java | 0 .../impl/model/ComplexActivationTest.java | 0 ...faultDependencyManagementImporterTest.java | 0 .../impl/model/DefaultInterpolatorTest.java | 0 .../impl/model/MavenModelMergerTest.java | 0 .../ReflectionValueExtractorTest.java | 0 .../resolver/DefaultModelResolverTest.java | 0 .../internal/impl/standalone/ApiRunner.java | 0 .../internal/impl/standalone/DiTest.java | 0 .../standalone/RepositorySystemSupplier.java | 0 .../impl/standalone/TestApiStandalone.java | 0 .../impl/util/PhasingExecutorTest.java | 0 .../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 .../apache/maven/its/bom/maven-metadata.xml | 0 .../maven/its/parent/0.1/parent-0.1.pom | 0 .../maven/its/parent/maven-metadata.xml | 0 .../0.1/maven-it-plugin-0.1.jar | Bin .../0.1/maven-it-plugin-0.1.pom | 0 .../its/plugins/maven-it-plugin/0.1/pom.xml | 0 .../maven-it-plugin/maven-metadata.xml | 0 .../maven/its/plugins/maven-metadata.xml | 0 .../2.0/maven-plugin-api-2.0.jar | Bin .../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 | 0 .../maven-clean-plugin/maven-metadata.xml | 0 .../0.1/maven-compiler-plugin-0.1.jar | Bin .../0.1/maven-compiler-plugin-0.1.pom | 0 .../maven-compiler-plugin/maven-metadata.xml | 0 .../0.1/maven-deploy-plugin-0.1.jar | Bin .../0.1/maven-deploy-plugin-0.1.pom | 0 .../maven-deploy-plugin/maven-metadata.xml | 0 .../0.1/maven-install-plugin-0.1.jar | Bin .../0.1/maven-install-plugin-0.1.pom | 0 .../maven-install-plugin/maven-metadata.xml | 0 .../0.1/maven-jar-plugin-0.1.jar | Bin .../0.1/maven-jar-plugin-0.1.pom | 0 .../maven-jar-plugin/maven-metadata.xml | 0 .../apache/maven/plugins/maven-metadata.xml | 0 .../0.1/maven-plugin-plugin-0.1.jar | Bin .../0.1/maven-plugin-plugin-0.1.pom | 0 .../maven-plugin-plugin/maven-metadata.xml | 0 .../0.1/maven-resources-plugin-0.1.jar | Bin .../0.1/maven-resources-plugin-0.1.pom | 0 .../maven-resources-plugin/maven-metadata.xml | 0 .../0.1/maven-surefire-plugin-0.1.jar | Bin .../0.1/maven-surefire-plugin-0.1.pom | 0 .../maven-surefire-plugin/maven-metadata.xml | 0 .../plexus-utils/1.1/plexus-utils-1.1.jar | Bin .../plexus-utils/1.1/plexus-utils-1.1.pom | 0 .../test/resources/poms/factory/complex.xml | 0 .../poms/factory/complexExistsAndMissing.xml | 0 .../src/test/resources/settings-simple.xml | 0 {maven-jline => impl/maven-jline}/pom.xml | 2 + .../org/apache/maven/jline/FastTerminal.java | 0 .../jline/JLineMessageBuilderFactory.java | 0 .../org/apache/maven/jline/MessageUtils.java | 0 .../maven-jline}/src/site/site.xml | 0 {maven-logging => impl/maven-logging}/pom.xml | 2 + .../maven/logging/api/LogLevelRecorder.java | 0 .../maven/slf4j/DefaultLogLevelRecorder.java | 0 .../apache/maven/slf4j/MavenBaseLogger.java | 0 .../slf4j/MavenFailOnSeverityLogger.java | 0 .../maven/slf4j/MavenLoggerFactory.java | 0 .../maven/slf4j/MavenServiceProvider.java | 0 .../apache/maven/slf4j/MavenSimpleLogger.java | 0 .../org/apache/maven/slf4j/OutputChoice.java | 0 .../slf4j/SimpleLoggerConfiguration.java | 0 .../org.slf4j.spi.SLF4JServiceProvider | 0 .../maven-logging}/src/site/apt/index.apt | 0 .../maven-logging}/src/site/site.xml | 0 .../maven/slf4j/LogLevelRecorderTest.java | 0 .../maven/slf4j/MavenLoggerFactoryTest.java | 0 .../maven/slf4j/MavenSimpleLoggerTest.java | 0 {maven-xml-impl => impl/maven-xml}/pom.xml | 6 ++- .../internal/xml/ImmutableCollections.java | 0 .../maven/internal/xml/XmlNodeBuilder.java | 0 .../maven/internal/xml/XmlNodeImpl.java | 0 .../internal/xml/XmlNodeStaxBuilder.java | 0 .../maven/internal/xml/XmlNodeWriter.java | 0 .../internal/xml/XmlPlexusConfiguration.java | 0 .../maven/internal/xml/package-info.java | 0 .../maven-xml}/src/site/markdown/index.md | 0 .../maven-xml}/src/site/site.xml | 0 .../internal/xml/XmlNodeBuilderTest.java | 0 .../maven/internal/xml/XmlNodeImplTest.java | 0 impl/pom.xml | 42 +++++++++++++++ maven-docgen/pom.xml | 2 +- pom.xml | 28 ++-------- 2587 files changed, 174 insertions(+), 62 deletions(-) rename {maven-artifact => compat/maven-artifact}/pom.xml (98%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/Artifact.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/ArtifactUtils.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/repository/Authentication.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/versioning/Restriction.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/repository/Proxy.java (100%) rename {maven-artifact => compat/maven-artifact}/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java (100%) rename {maven-artifact => compat/maven-artifact}/src/site/apt/index.apt (100%) rename {maven-api-impl => compat/maven-artifact}/src/site/site.xml (100%) rename {maven-artifact => compat/maven-artifact}/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java (100%) rename {maven-artifact => compat/maven-artifact}/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java (100%) rename {maven-artifact => compat/maven-artifact}/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java (100%) rename {maven-artifact => compat/maven-artifact}/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java (100%) rename {maven-artifact => compat/maven-artifact}/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java (100%) rename {maven-artifact => compat/maven-artifact}/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java (100%) rename {maven-artifact => compat/maven-artifact}/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java (100%) rename {maven-builder-support => compat/maven-builder-support}/pom.xml (97%) rename {maven-builder-support => compat/maven-builder-support}/src/main/java/org/apache/maven/building/DefaultProblem.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/main/java/org/apache/maven/building/DefaultProblemCollector.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/main/java/org/apache/maven/building/FileSource.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/main/java/org/apache/maven/building/Problem.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/main/java/org/apache/maven/building/ProblemCollector.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/main/java/org/apache/maven/building/Source.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/main/java/org/apache/maven/building/StringSource.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/main/java/org/apache/maven/building/UrlSource.java (100%) rename {maven-artifact => compat/maven-builder-support}/src/site/site.xml (100%) rename {maven-builder-support => compat/maven-builder-support}/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/test/java/org/apache/maven/building/DefaultProblemTest.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/test/java/org/apache/maven/building/FileSourceTest.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/test/java/org/apache/maven/building/StringSourceTest.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/test/java/org/apache/maven/building/UrlSourceTest.java (100%) rename {maven-builder-support => compat/maven-builder-support}/src/test/resources/source.txt (100%) rename {maven-compat => compat/maven-compat}/pom.xml (99%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/ArtifactFilterManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/ArtifactFilterManagerDelegate.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/ProjectDependenciesResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/ArtifactStatus.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/manager/WagonManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/execution/RuntimeInformation.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/plugin/PluginManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/profiles/ProfileManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/InvalidProjectModelException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/MavenProjectBuilder.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/ModelUtils.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/ProjectUtils.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/path/PathTranslator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/project/validation/ModelValidator.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/reporting/MavenReportException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/MetadataGraph.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/MetadataGraphNode.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/MirrorSelector.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/RepositorySystem.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/VersionNotFoundException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/ChecksumFailedException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/WagonManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverNotFoundException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java (100%) rename {maven-compat => compat/maven-compat}/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java (100%) rename {maven-compat => compat/maven-compat}/src/main/mdo/paramdoc.mdo (100%) rename {maven-compat => compat/maven-compat}/src/main/mdo/profiles.mdo (100%) rename {maven-compat => compat/maven-compat}/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml (100%) rename {maven-compat => compat/maven-compat}/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml (100%) rename {maven-compat => compat/maven-compat}/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml (100%) rename {maven-compat => compat/maven-compat}/src/site/apt/index.apt (100%) rename {maven-builder-support => compat/maven-compat}/src/site/site.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/SimpleLookup.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/metadata/SwitchableMetadataSource.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/resolver/TestMavenWorkspaceReader.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/ProjectClasspathTestType.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/TestArtifactResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/TestModelResolver.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/TestProjectBuilder.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/TestArtifactHandler.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/TestRepositorySystem.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/PerLookupWagon.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/StringWagon.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/WagonA.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/WagonB.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/WagonC.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/WagonMock.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTestType.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java (100%) rename {maven-compat => compat/maven-compat}/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java (100%) rename {maven-compat => compat/maven-compat}/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt (100%) rename {maven-compat => compat/maven-compat}/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/tools.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/projects/project-dependencies-resolver/it0063/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/projects/project-dependencies-resolver/project-with-exclusions/pom.xml (100%) rename {maven-api-impl => compat/maven-compat}/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar (100%) rename {maven-api-impl => compat/maven-compat}/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom (100%) rename {maven-api-impl => compat/maven-compat}/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml (100%) rename {maven-api-impl => compat/maven-compat}/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar (100%) rename {maven-api-impl => compat/maven-compat}/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom (100%) rename {maven-api-impl => compat/maven-compat}/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/repository-system/maven-core-2.1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/artifact-install/artifact-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t02/p0/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t03/p0/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t04/p0/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t05/p0/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t06/p0/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t07/p0/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t08/p0/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t09/p0/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t10/p0/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t11/p0/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t12/p0/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/inheritance-repo/t12scm/p0/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/marker.txt (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/org/apache/maven/artifact/resolver/ArtifactUpdatePolicyTest.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/pom.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/projects/scope/project-with-scoped-dependencies.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/projects/scope/transitive-compile-dep.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/projects/scope/transitive-default-dep.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/projects/scope/transitive-provided-dep.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/projects/scope/transitive-runtime-dep.xml (100%) rename {maven-compat => compat/maven-compat}/src/test/resources/projects/scope/transitive-test-dep.xml (100%) rename {maven-embedder => compat/maven-embedder}/pom.xml (97%) rename {maven-embedder => compat/maven-embedder}/src/examples/simple-project/pom.xml (100%) rename {maven-embedder => compat/maven-embedder}/src/examples/simple-project/settings.xml (100%) rename {maven-embedder => compat/maven-embedder}/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java (100%) rename {maven-embedder => compat/maven-embedder}/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/CLIManager.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/CLIReportingUtils.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/CleanArgument.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/CliRequest.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/ExtensionConfigurationModule.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/MavenCli.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/ResolveFile.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/internal/ExtensionResolutionException.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/logging/impl/MavenSimpleConfiguration.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/props/MavenProperties.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/props/MavenPropertiesLoader.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/transfer/FileSizeFormat.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/transfer/QuietMavenTransferListener.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/transfer/SimplexTransferListener.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/apache/maven/cli/transfer/TransferResourceIdentifier.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/eclipse/sisu/plexus/PlexusXmlBeanConverter.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/java/org/fusesource/jansi/Ansi.java (100%) rename {maven-embedder => compat/maven-embedder}/src/main/resources/META-INF/maven/slf4j-configuration.properties (100%) rename {maven-embedder => compat/maven-embedder}/src/site/apt/cli.apt.vm (100%) rename {maven-embedder => compat/maven-embedder}/src/site/apt/index.apt.vm (100%) rename {maven-embedder => compat/maven-embedder}/src/site/apt/logging.apt (100%) rename {maven-compat => compat/maven-embedder}/src/site/site.xml (100%) rename {maven-embedder => compat/maven-embedder}/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java (100%) rename {maven-embedder => compat/maven-embedder}/src/test/java/org/apache/maven/cli/CLIReportingUtilsTest.java (100%) rename {maven-embedder => compat/maven-embedder}/src/test/java/org/apache/maven/cli/CleanArgumentTest.java (100%) rename {maven-embedder => compat/maven-embedder}/src/test/java/org/apache/maven/cli/MavenCliTest.java (100%) rename {maven-embedder => compat/maven-embedder}/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java (100%) rename {maven-embedder => compat/maven-embedder}/src/test/java/org/apache/maven/cli/props/MavenPropertiesLoaderTest.java (100%) rename {maven-embedder => compat/maven-embedder}/src/test/java/org/apache/maven/cli/props/MavenPropertiesTest.java (100%) rename {maven-embedder => compat/maven-embedder}/src/test/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListenerTest.java (100%) rename {maven-embedder => compat/maven-embedder}/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java (100%) rename {maven-embedder => compat/maven-embedder}/src/test/java/org/apache/maven/cli/transfer/SimplexTransferListenerTest.java (100%) rename {maven-embedder => compat/maven-embedder}/src/test/projects/config-illegal/.mvn/maven.config (100%) rename {maven-embedder => compat/maven-embedder}/src/test/projects/config/.mvn/maven.config (100%) rename {maven-embedder => compat/maven-embedder}/src/test/projects/mavenConfigProperties/.mvn/maven.config (100%) rename {maven-embedder => compat/maven-embedder}/src/test/projects/root-attribute/child/pom.xml (100%) rename {maven-embedder => compat/maven-embedder}/src/test/projects/root-attribute/pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/pom.xml (99%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/BuildModelSourceTransformer.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/DefaultTransformerContextBuilder.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/FileModelSource.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/Graph.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelBuilder.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelBuildingException.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelCache.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelCacheTag.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelData.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelProblem.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelProcessor.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelSource.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelSource2.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelSource3.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/Result.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/StringModelSource.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/TransformerContext.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/TransformerContextBuilder.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/TransformerException.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/building/UrlModelSource.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/ModelVersionProcessor.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/ObjectBasedValueSource.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/PrefixedObjectValueSource.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/reflection/ClassMap.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/reflection/IntrospectionException.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/reflection/MethodMap.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractor.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/io/DefaultModelReader.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/io/ModelParseException.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/io/ModelReader.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/io/ModelWriter.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/locator/ModelLocator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/path/PathTranslator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/path/ProfileActivationFilePathInterpolator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/path/UrlNormalizer.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/profile/ProfileInjector.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/profile/ProfileSelector.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/profile/activation/PackagingProfileActivator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/resolution/ModelResolver.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/resolution/WorkspaceModelResolver.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/root/DefaultRootLocator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/root/RootLocator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/model/validation/ModelValidator.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/java/org/apache/maven/utils/Os.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/main/resources/META-INF/services/org.apache.maven.model.root.RootLocator (100%) rename {maven-api-impl => compat/maven-model-builder}/src/main/resources/org/apache/maven/model/pom-4.0.0.xml (100%) rename {maven-api-impl => compat/maven-model-builder}/src/main/resources/org/apache/maven/model/pom-4.1.0.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/site/apt/index.apt (100%) rename {maven-model-builder => compat/maven-model-builder}/src/site/apt/super-pom.apt.vm (100%) rename {maven-di => compat/maven-model-builder}/src/site/site.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/building/BuildModelSourceTransformerTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/building/ComplexActivationTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/building/GraphTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/building/ModelBuildingExceptionTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/inheritance/MergerTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractorTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/path/DefaultUrlNormalizerTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/profile/DefaultProfileSelectorTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/profile/activation/FileProfileActivatorTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/dag.txt (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/depmgmt/distant-import.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/depmgmt/import.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/depmgmt/junit-0.1.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/depmgmt/junit-0.2.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/depmgmt/other-import.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/depmgmt/root-dep-first.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/depmgmt/root-dep-last.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/depmgmt/root-distance-explicit.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/depmgmt/root-distance.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/depmgmt/root-two-imports.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/factory/complex.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/factory/simple.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/empty-urls-child.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/empty-urls-expected.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/empty-urls-parent.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/flat-urls-child.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/flat-urls-expected.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/flat-urls-parent.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/module-path-not-artifactId-parent.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/no-append-urls-child.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/no-append-urls-expected.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/no-append-urls-parent.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/no-append-urls2-child.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/no-append-urls2-expected.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/no-append-urls2-parent.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/no-append-urls3-child.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/no-append-urls3-expected.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/no-append-urls3-parent.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/plugin-configuration-child.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/plugin-configuration-expected.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/plugin-configuration-parent.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-child.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-expected.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-parent.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/tricky-flat-directory-urls-child.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/tricky-flat-directory-urls-expected.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/tricky-flat-directory-urls-parent.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/urls-child.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/urls-expected.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/inheritance/urls-parent.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/bad-dependency-exclusion-id.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/bad-dependency-management-scope.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/bad-dependency-scope.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/bad-dependency-version.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/bad-import-scope-classifier.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/bad-import-scope-type.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/bad-modelVersion.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/bad-plugin-dependency-scope.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/bad-plugin-dependency-version.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/bad-plugin-version.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/bad-repository-id.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/bad-snapshot-version.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/bad-version.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/basedir-system-path.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/deprecated-dependency-metaversions-latest-and-release.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/distribution-management-status.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/duplicate-module.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/duplicate-plugin-execution.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/duplicate-plugin.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/duplicate-profile-id.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/empty-module.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/empty-plugin-version.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/hard-coded-system-path.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/incomplete-parent.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/invalid-coordinate-ids-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/invalid-profile-ids.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-1-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-artifactId-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-dependency-artifactId-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-dependency-exclusion-id.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-dependency-groupId-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-dependency-mgmt-artifactId-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-dependency-mgmt-groupId-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-dependency-mgmt-version-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-dependency-version-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-groupId-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-modelVersion-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-plugin-artifactId-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-plugin-dependency-artifactId.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-plugin-dependency-groupId.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-plugin-dependency-version.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-plugin-version-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-report-artifactId-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-report-version-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-repository-id-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-resource-directory-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-type-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/missing-version-pom.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/modelVersion-4_0.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/bad-ci-friendly.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/missing-artifactId-pluginManagement.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/missing-ga-pluginManagement.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/missing-groupId-pluginManagement.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/missing-plugin-version-pluginManagement.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/ok-ci-friendly-all-expressions.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/ok-ci-friendly-changelist.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/ok-ci-friendly-revision.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/profile-activation-file-with-allowed-expressions.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/profile-activation-file-with-project-expressions.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/profile-activation-property-with-project-expressions.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/repository-with-basedir-expression.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/repository-with-expression.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/raw-model/self-referencing.xml (100%) rename {maven-model-builder => compat/maven-model-builder}/src/test/resources/poms/validation/reserved-repository-id.xml (100%) rename {maven-model => compat/maven-model}/pom.xml (96%) rename {maven-model => compat/maven-model}/src/main/java/org/apache/maven/model/BaseObject.java (100%) rename {maven-model => compat/maven-model}/src/main/java/org/apache/maven/model/InputLocation.java (100%) rename {maven-model => compat/maven-model}/src/main/java/org/apache/maven/model/InputLocationTracker.java (100%) rename {maven-model => compat/maven-model}/src/main/java/org/apache/maven/model/InputSource.java (100%) rename {maven-model => compat/maven-model}/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3Reader.java (100%) rename {maven-model => compat/maven-model}/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3ReaderEx.java (100%) rename {maven-model => compat/maven-model}/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3Writer.java (100%) rename {maven-model => compat/maven-model}/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3WriterEx.java (100%) rename {maven-model => compat/maven-model}/src/main/java/org/apache/maven/model/io/xpp3/package-info.java (100%) rename {maven-model => compat/maven-model}/src/main/java/org/apache/maven/model/merge/package-info.java (100%) rename {maven-model => compat/maven-model}/src/site/apt/index.apt (100%) rename {maven-embedder => compat/maven-model}/src/site/site.xml (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ActivationFileTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ActivationOSTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ActivationPropertyTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ActivationTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/BuildTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/CiManagementTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ContributorTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/DependencyManagementTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/DependencyTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/DeveloperTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/DistributionManagementTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ExclusionTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ExtensionTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/IssueManagementTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/LicenseTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/MailingListTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ModelTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/NotifierTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/OrganizationTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ParentTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/PluginConfigurationTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/PluginContainerTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/PluginExecutionTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/PluginManagementTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/PluginTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/PrerequisitesTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ProfileTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/RelocationTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ReportPluginTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ReportSetTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ReportingTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/RepositoryTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ResourceTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/ScmTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/SerializationTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/SiteTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/merge/MavenMergerTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/v4/MavenModelVersionTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/v4/ModelXmlTest.java (100%) rename {maven-model => compat/maven-model}/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java (100%) rename {maven-model => compat/maven-model}/src/test/resources/xml/pom.xml (98%) rename {maven-plugin-api => compat/maven-plugin-api}/pom.xml (94%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/AbstractMojo.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/AbstractMojoExecutionException.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/ContextEnabled.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/Mojo.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/MojoExecutionException.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/MojoFailureException.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/descriptor/DuplicateParameterException.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/descriptor/InvalidParameterException.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/descriptor/InvalidPluginDescriptorException.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/descriptor/Requirement.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/lifecycle/Execution.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/lifecycle/Lifecycle.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/lifecycle/LifecycleConfiguration.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/lifecycle/Phase.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/logging/Log.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/site/apt/index.apt (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/site/site.xml (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/test/java/org/apache/maven/plugin/descriptor/MojoDescriptorTest.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java (100%) rename {maven-plugin-api => compat/maven-plugin-api}/src/test/resources/plugin.xml (100%) rename {maven-repository-metadata => compat/maven-repository-metadata}/pom.xml (90%) rename {maven-repository-metadata => compat/maven-repository-metadata}/src/main/java/org/apache/maven/artifact/repository/metadata/BaseObject.java (100%) rename {maven-repository-metadata => compat/maven-repository-metadata}/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java (100%) rename {maven-repository-metadata => compat/maven-repository-metadata}/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java (100%) rename {maven-repository-metadata => compat/maven-repository-metadata}/src/site/apt/index.apt (100%) rename {maven-jline => compat/maven-repository-metadata}/src/site/site.xml (100%) rename {maven-repository-metadata => compat/maven-repository-metadata}/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTest.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/pom.xml (97%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/DefaultModelCacheFactory.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/DefaultVersionSchemeProvider.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/MavenArtifactRelocationSource.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSupplier.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/ModelCacheFactory.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/PluginsMetadata.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/RequestTraceHelper.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/artifact/FatArtifactTraverser.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/artifact/MavenArtifactProperties.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/package-info.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/relocation/DistributionManagementArtifactRelocationSource.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/scopes/Maven3ScopeManagerConfiguration.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/type/DefaultType.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/main/java/org/apache/maven/repository/internal/type/DefaultTypeProvider.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/site/apt/dependency-types.apt (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/site/apt/index.apt (100%) rename {maven-logging => compat/maven-resolver-provider}/src/site/site.xml (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/java/org/apache/maven/repository/internal/AbstractVersionTest.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/java/org/apache/maven/repository/internal/ModelVersionParserTest.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/java/org/apache/maven/repository/internal/VersionRangeTest.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/java/org/apache/maven/repository/internal/VersionTest.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/java/org/apache/maven/repository/internal/util/ConsoleRepositoryListener.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/META-INF/sisu/javax.inject.Named (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/repo/org/apache/maven/its/dep-mng5324/07.20.3-SNAPSHOT/maven-metadata.xml (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/repo/org/apache/maven/its/dep-mng5459/0.4.0-SNAPSHOT/maven-metadata.xml (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0-classifier.zip (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.jar (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.zip (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/repo/ut/simple/artifact/maven-metadata.xml (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0-sources.jar (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.jar (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.pom (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/repo/ut/simple/dependency/maven-metadata.xml (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/repo/ut/simple/parent/1.0/parent-1.0.pom (100%) rename {maven-resolver-provider => compat/maven-resolver-provider}/src/test/resources/repo/ut/simple/parent/maven-metadata.xml (100%) rename {maven-settings-builder => compat/maven-settings-builder}/pom.xml (98%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/SettingsProblem.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/SettingsSource.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/crypto/MavenSecDispatcher.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/io/SettingsParseException.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/io/SettingsReader.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/io/SettingsWriter.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java (100%) rename {maven-model-builder => compat/maven-settings-builder}/src/site/site.xml (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java (100%) rename {maven-settings-builder => compat/maven-settings-builder}/src/test/resources/settings/factory/simple.xml (100%) rename {maven-settings => compat/maven-settings}/pom.xml (95%) rename {maven-settings => compat/maven-settings}/src/main/java/org/apache/maven/settings/BaseObject.java (100%) rename {maven-settings => compat/maven-settings}/src/main/java/org/apache/maven/settings/io/xpp3/SettingsXpp3Reader.java (100%) rename {maven-settings => compat/maven-settings}/src/main/java/org/apache/maven/settings/io/xpp3/SettingsXpp3Writer.java (100%) rename {maven-settings => compat/maven-settings}/src/site/apt/index.apt (100%) rename {maven-model => compat/maven-settings}/src/site/site.xml (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/pom.xml (98%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuilder.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingRequest.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/site/site.xml (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/global.xml (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks-extend.xml (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks-extra.xml (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks.xml (100%) rename {maven-toolchain-builder => compat/maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/user.xml (100%) rename {maven-toolchain-model => compat/maven-toolchain-model}/pom.xml (95%) rename {maven-toolchain-model => compat/maven-toolchain-model}/src/main/java/org/apache/maven/toolchain/model/BaseObject.java (100%) rename {maven-toolchain-model => compat/maven-toolchain-model}/src/site/apt/index.apt (100%) rename {maven-toolchain-model => compat/maven-toolchain-model}/src/site/site.xml (100%) create mode 100644 compat/pom.xml rename {maven-cli => impl/maven-cli}/pom.xml (98%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/ClingSupport.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/MavenCling.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/MavenEncCling.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/BaseInvokerRequest.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/BaseParser.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/CommonsCliOptions.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/ContainerCapsule.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/ContainerCapsuleFactory.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/LayeredOptions.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/PlexusContainerCapsule.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/PlexusContainerCapsuleFactory.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/ProtoLogger.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/ProtoLookup.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/Utils.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvn/BaseMavenParser.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvn/CommonsCliMavenOptions.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenInvoker.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenInvokerRequest.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenParser.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvn/LayeredMavenOptions.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvn/ProtoSession.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvn/RepositorySystemSupplier.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvoker.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvokerRequest.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenParser.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvn/local/DefaultLocalMavenInvoker.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvn/resident/DefaultResidentMavenInvoker.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvnenc/CommonsCliEncryptOptions.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvnenc/ConsolePasswordPrompt.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptInvoker.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptInvokerRequest.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptParser.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvnenc/Goal.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/ConfiguredGoalSupport.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Decrypt.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Diag.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Encrypt.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/GoalSupport.java (100%) rename {maven-cli => impl/maven-cli}/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Init.java (100%) rename {maven-cli => impl/maven-cli}/src/site/site.xml (100%) rename {maven-cli => impl/maven-cli}/src/test/java/org/apache/maven/cling/invoker/mvn/MavenInvokerTestSupport.java (100%) rename {maven-cli => impl/maven-cli}/src/test/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvokerTest.java (100%) rename {maven-cli => impl/maven-cli}/src/test/java/org/apache/maven/cling/invoker/mvn/local/DefaultLocalMavenInvokerTest.java (100%) rename {maven-cli => impl/maven-cli}/src/test/java/org/apache/maven/cling/invoker/mvn/resident/DefaultResidentMavenInvokerTest.java (100%) rename {maven-core => impl/maven-core}/lifecycle-executor.txt (100%) rename {maven-core => impl/maven-core}/plugin-manager.txt (100%) rename {maven-core => impl/maven-core}/pom.xml (99%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/BuildAbort.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/BuildFailureException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/DefaultMaven.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/DuplicateProjectException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/InternalErrorException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/Maven.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/MavenExecutionException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/MissingProfilesException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/ProjectBuildFailureException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/ProjectCycleException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/ReactorReader.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/RepositoryUtils.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/SessionScoped.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/handler/manager/LegacyArtifactHandlerManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/AbstractScopeArtifactFilter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/classrealm/DefaultClassRealmRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/configuration/BeanConfigurator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/configuration/internal/EnhancedComponentConfigurator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/configuration/internal/EnhancedConfigurationConverter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/configuration/internal/EnhancedConverterLookup.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/eventspy/AbstractEventSpy.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/eventspy/EventSpy.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/exception/ExceptionHandler.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/exception/ExceptionSummary.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/AbstractExecutionListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/ActivationSettings.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/BuildFailure.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/BuildResumptionAnalyzer.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/BuildResumptionData.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/BuildResumptionPersistenceException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/BuildSuccess.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/BuildSummary.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/ExecutionEvent.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/ExecutionListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulationException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/MavenExecutionResult.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/MavenSession.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/MojoExecutionListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/ProfileActivation.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/ProjectActivation.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/ReactorManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/extension/internal/CoreExports.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/graph/GraphBuilder.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/graph/ProjectSelector.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/CoreRealm.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/MultilineMessageHelper.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/aether/LegacyRepositorySystemSessionExtender.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/aether/MavenDeployer.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/aether/MavenExecutionRequestExtender.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/aether/MavenInstaller.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/aether/PropertyContributorExtender.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/aether/RepositorySystemSessionExtender.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultEvent.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultLog.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultLookup.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultMojoExecution.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultPackagingRegistry.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultPluginXmlFactory.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultProject.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultPrompter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultSession.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultSessionFactory.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultToolchainManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/EventSpyImpl.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/Graph.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/InternalMavenSession.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/Lifecycles.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/SisuDiBridgeModule.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/impl/internal/DefaultCoreRealm.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/transformation/ConsumerPomArtifactTransformer.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/transformation/TransformationFailedException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilder.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomArtifactTransformer.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifact.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifactHandler.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/Lifecycle.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/BuildThreadFactory.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleStarter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/PhaseComparator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/PhaseExecutionPoint.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/PhaseId.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/PhaseRecorder.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/SetWithResolutionResult.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/Task.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlan.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanLogger.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildStep.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/concurrent/ConcurrentLifecycleStarter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/concurrent/MojoExecutor.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/internal/concurrent/PluginLifecycle.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/providers/AbstractLifecycleProvider.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/providers/packaging/BomLifecycleMappingProvider.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/providers/packaging/EarLifecycleMappingProvider.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/providers/packaging/EjbLifecycleMappingProvider.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/providers/packaging/JarLifecycleMappingProvider.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/providers/packaging/MavenPluginLifecycleMappingProvider.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/providers/packaging/PomLifecycleMappingProvider.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/providers/packaging/RarLifecycleMappingProvider.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/lifecycle/providers/packaging/WarLifecycleMappingProvider.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/logging/BuildEventListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/logging/LoggingExecutionListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/logging/LoggingOutputStream.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/logging/MavenTransferListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/logging/ProjectBuildLogAppender.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/logging/SimpleBuildEventListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/monitor/event/EventMonitor.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/BuildPluginManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/CacheUtils.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/DefaultMojosExecutionStrategy.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/InvalidPluginException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/LegacySupport.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/MavenPluginManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/MavenPluginPrerequisitesChecker.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/MojoExecution.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/MojoExecutionRunner.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/MojosExecutionStrategy.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginContainerException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginDescriptorParsingException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginExecutionException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginIncompatibleException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginLoaderException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginManagerException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginParameterException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginRealmCache.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginResolutionException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/PluginValidationManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginDependenciesValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginDescriptorSourcedParametersValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginParametersValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/DeprecatedCoreExpressionValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/Maven2DependenciesValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/Maven3CompatDependenciesValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/MavenMixedDependenciesValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/MavenPluginConfigurationValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/MavenPluginDependenciesValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteChecker.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/MavenPluginMavenPrerequisiteChecker.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/MavenPluginValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/MavenScopeDependenciesValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/PlexusContainerDefaultDependenciesValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/PluginConfigurationModule.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/ReadOnlyPluginParametersValidator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/CycleDetectedException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DefaultDependencyResolutionRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DependencyResolutionException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DependencyResolutionResult.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/DuplicateProjectException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/ExtensionDescriptor.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/Graph.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/MavenProject.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/MavenProjectHelper.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/ProjectBuilder.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/ProjectBuildingException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/ProjectBuildingResult.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/ProjectModelResolver.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/ProjectRealmCache.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/ProjectSorter.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/ReactorModelPool.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/collector/ProjectCollectionStrategy.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/collector/ProjectsSelector.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/properties/internal/SystemProperties.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/resolver/RepositorySystemSessionFactory.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/settings/SettingsUtils.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/Toolchain.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/ToolchainManager.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java (100%) rename {maven-core => impl/maven-core}/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java (100%) rename {maven-core => impl/maven-core}/src/main/mdo/extension.mdo (100%) rename {maven-core => impl/maven-core}/src/main/resources/META-INF/maven/extension.xml (100%) rename {maven-core => impl/maven-core}/src/main/resources/org/apache/maven/messages/build.properties (100%) rename {maven-core => impl/maven-core}/src/main/resources/org/apache/maven/project/standalone.xml (100%) rename {maven-core => impl/maven-core}/src/site/apt/artifact-handlers.apt (100%) rename {maven-core => impl/maven-core}/src/site/apt/configuration-management.apt (100%) rename {maven-core => impl/maven-core}/src/site/apt/core-extensions.apt.vm (100%) rename {maven-core => impl/maven-core}/src/site/apt/default-bindings.apt.vm (100%) rename {maven-core => impl/maven-core}/src/site/apt/getting-to-container-configured-mojos.apt (100%) rename {maven-core => impl/maven-core}/src/site/apt/index.apt (100%) rename {maven-core => impl/maven-core}/src/site/apt/inheritance.apt (100%) rename {maven-core => impl/maven-core}/src/site/apt/lifecycles.apt.vm (100%) rename {maven-core => impl/maven-core}/src/site/apt/offline-mode.apt (100%) rename {maven-core => impl/maven-core}/src/site/apt/plugin-execution-isolation.apt (100%) rename {maven-core => impl/maven-core}/src/site/resources/design/2.1-lifecycle-refactor-class-diagram.png (100%) rename {maven-core => impl/maven-core}/src/site/resources/design/2.1-lifecycle-refactor-sequence-diagram.png (100%) rename {maven-core => impl/maven-core}/src/site/resources/design/2.1-lifecycle-refactor.graffle (100%) rename {maven-core => impl/maven-core}/src/site/site.xml (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/DefaultMavenTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/MavenTestHelper.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/SimpleLookup.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorPathTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/di/DiTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/graph/ProjectSelectorTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/internal/MultilineMessageHelperTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListenerTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmServiceTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/internal/impl/DefaultProjectManagerTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/internal/impl/DefaultSessionTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/internal/impl/TestApi.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/internal/impl/TestArtifactHandler.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/internal/transformation/AbstractRepositoryTestCase.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomArtifactTransformerTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilderTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/MojoExecutionXPathContainer.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilderTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/builder/BuilderCommonTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanCreatorTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/stub/BuildPluginManagerStub.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/stub/CompletionServiceStub.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/stub/ExecutionEventCatapultStub.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/stub/LifeCyclePluginAnalyzerStub.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/stub/PluginPrefixResolverStub.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/stub/PluginVersionResolverStub.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStubTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/model/ModelBuilderTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/plugin/PluginManagerTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteCheckerTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/plugin/internal/MavenPluginValidatorTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/GraphTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/MavenProjectTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/PomConstructionTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/ProjectBuilderTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/ProjectBuildingResultWithLocationMatcher.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/ProjectBuildingResultWithProblemMessageMatcher.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/ProjectSorterTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/repository/TestMavenRepositorySystem.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/repository/TestRepositoryConnectorFactory.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformationTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/session/scope/SessionScopeProxyTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java (100%) rename {maven-core => impl/maven-core}/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java (100%) rename {maven-core => impl/maven-core}/src/test/projects/default-maven/cyclic-reference/module-a/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/default-maven/cyclic-reference/module-b/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/default-maven/cyclic-reference/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/default-maven/simple/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-dependency-resolver/lib/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-dependency-resolver/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-dependency-resolver/war/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-executor/project-basic/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-executor/project-with-multiple-executions/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-executor/project-with-multiple-executions/src/main/mdo/remote-resources.mdo (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-executor/project-with-multiple-executions/src/main/mdo/supplemental-model.mdo (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-executor/project-with-plugin-level-configuration-only/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-a/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-b/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/mng-5003-plugin-realm-cache/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/tools.jar (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-build-extensions-plugin/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.1/a-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.1/a-0.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.2/a-0.2.jar (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.2/a-0.2.pom (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/maven-metadata.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/0.1/b-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/0.1/b-0.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/maven-metadata.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/0.1/c-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/0.1/c-0.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/maven-metadata.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/0.1/d-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/0.1/d-0.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/maven-metadata.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/0.1/e-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/0.1/e-0.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/maven-metadata.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/settings-template.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/MNG-6716/project/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/MNG-6723/.mvn/.gitkeep (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/MNG-6723/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/MNG-6723/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/MNG-6983/parent-pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/MNG-6983/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/MNG-7648/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/it0063/jdk/lib/tools.jar (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/it0063/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/mng-3023/consumer/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/mng-3023/dependency/dependency-1.jar (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/mng-3023/dependency/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/projects/project-builder/mng-3023/pom.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/apache/1/apache-1.pom (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/apache/maven-metadata.xml (100%) rename {maven-compat => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar (100%) rename {maven-compat => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom (100%) rename {maven-compat => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml (100%) rename {maven-compat => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar (100%) rename {maven-compat => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom (100%) rename {maven-compat => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/bom/0.1/bom-0.1.pom (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/bom/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/parent/0.1/parent-0.1.pom (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/parent/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/pom.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/its/plugins/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/maven/2.0/maven-2.0.pom (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.pom (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.pom (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.pom (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.pom (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.pom (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.pom (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.pom (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.pom (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar (100%) rename {maven-api-impl => impl/maven-core}/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/artifact-id-inheritance/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/artifact-id-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/baseuri-interpolation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/boolean-interpolation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/build-extension-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/complete-model/w-parent/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/complete-model/w-parent/sub/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/complete-model/wo-parent/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/complete-model/wo-parent/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/config-with-plugin-mng/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/consecutive_empty_elements/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/contributors-inheritance/child-2/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/contributors-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/dependency-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/dependency-order/w-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/dependency-order/wo-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/dependency-scope/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/dependency-scope/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/developers-inheritance/child-2/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/developers-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/distribution-management/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/dual-execution-ids/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/empty-distMng-repo-url/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/empty-scm/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/equal-plugin-deps/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/execution-configuration-join/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/execution-configuration/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/foo/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/full-interpolation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/interpolation-cli-wins/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/jdk-activation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/join-different-containers-same-id/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/licenses-inheritance/child-2/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/licenses-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/limited-inheritance/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/limited-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/mailing-lists-inheritance/child-2/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/mailing-lists-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/managed-profile-dependency/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-filter-order/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-filter-order/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/micromailer/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/micromailer/spice-parent-9.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/multiple-filters/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/multiple-repos/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/multiple-repos/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/parent-inheritance/child3.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/parent-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/parent-inheritance/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/parent-interpolation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/parent-interpolation/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/parent-pom-packaging/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/parent-pom-packaging/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/platform-file-separator/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-config-merging/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-config-merging/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-config-order/w-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-config-order/wo-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-config-properties/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-inheritance/w-merge/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-inheritance/wo-merge/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-order-and-default-exec/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-order/w-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-inheritance-merge-order/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-inheritance-merge-order/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-inheritance-order/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-injection-merge-order/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-interpolation-build/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-interpolation-reporting/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-management-dependencies/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-management-dependencies/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-management-duplicate/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-management-for-implicit-plugin/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-management-for-implicit-plugin/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-management-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-merge-simple/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-order/nexus-parent.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/plugin-order/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/pom-inheritance/child-1/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/pom-inheritance/child-2/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/pom-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/prerequisites-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-default-deactivation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-injected-dependencies/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-injection-order/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-module-inheritance/maven-inherit-plugin/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-module-inheritance/maven-pax-plugin/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-module-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-module-inheritance/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-module/module-1/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-module/module-2/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-module/module-3/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-module/module-4/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-module/module-5/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-module/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-plugins/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/profile-properties-interpolation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/properties-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/properties-inheritance/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/properties-no-duplication/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/repo-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/reporting-interpolation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/reporting-plugin-config/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/single-configuration-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/system-property-interpolation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/unc-path/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/unc-path/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/unique-dependency-key/dep-mgmt-in-profile/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/unique-dependency-key/dep-mgmt/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/unique-dependency-key/deps-in-profile/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/unique-dependency-key/deps/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/unique-repo-id/artifact-repo-in-profile/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/unique-repo-id/artifact-repo/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/unique-repo-id/plugin-repo-in-profile/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/unique-repo-id/plugin-repo/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/url-append/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/url-append/parent/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/url-inheritance/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/url-inheritance/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/url-no-decoding/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/xml-coalesce-text/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/xml-markup-interpolation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/xml-whitespace/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-project-builder/xml-whitespace/sub/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-settings/repositories/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-settings/repositories/settings.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-settings/settings-no-pom/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-settings/settings-no-pom/settings.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources-settings/test-pom-and-settings-interpolation/settings.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject (100%) rename {maven-core => impl/maven-core}/src/test/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc-resources.jar.lastUpdated (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 (100%) rename {maven-core/src/test/remote-repo => impl/maven-core/src/test/resources/apiv4-repo}/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 (100%) rename {maven-core/src/test/remote-repo => impl/maven-core/src/test/resources/apiv4-repo}/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc-resources.jar.lastUpdated (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/canonical-pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/consumer/simple/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/consumer/simple/simple-parent/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/consumer/simple/simple-parent/simple-webapp/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/consumer/trivial/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/consumer/trivial/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/dependencyManagement-pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/distributionManagement-pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/p0/p1/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/p0/p2/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/p0/p3/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/p0/p4/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/imports-repo/t01/p0/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/marker.txt (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version (100%) rename {maven-core => impl/maven-core}/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/MavenLifecycleParticipantTest.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/execution/resume.properties (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/execution/test-extension-1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.sha1 (100%) rename {maven-core/src/test/resources/apiv4-repo => impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo}/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 (100%) rename {maven-core/src/test/resources/apiv4-repo => impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo}/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/extension/test-extension-repo/repo-marker.txt (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/lifecycle/LifecycleExecutorTest.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/lifecycle/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/plugin/PluginManagerTest.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/project/PomConstructionTest.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/maven-metadata-local.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/apache/maven/settings/PomConstructionWithSettingsTest.xml (100%) rename {maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo => impl/maven-core/src/test/resources}/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 (100%) rename {maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo => impl/maven-core/src/test/resources}/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 (100%) rename {maven-core => impl/maven-core}/src/test/resources/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/project-dynamism/plugin-level-dep.pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/project-dynamism/pom-interp.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/project-dynamism/pom-relative.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/project-dynamism/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/artifactMissingVersion/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/bad-dependency.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/bad-project.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/badPom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/basic-resolveDependencies.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/build-path-expression-pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/build.properties (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/child-which-inherits-from-super-model.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/child-with-bogus-parent.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/child.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/duplicate-plugins-merged-pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/fully-populated-child.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/future-model-version-pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/future-schema-model-version-pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/grandchild-check/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/grandchild-check/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/modelsource/module01/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/modelsource/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/modelsourcebasedir/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-external-child-pom-parent-version-expression/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-external-child-pom-version-expression/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-external-child-project-parent-version-expression/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-external-child-project-version-expression/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-external-child-revision-expression/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-external-child-without-version/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-external-valid/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-local-child-project-parent-version-expression/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-local-child-project-parent-version-expression/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-local-child-project-version-expression/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-local-child-project-version-expression/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-local-child-revision-expression/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-local-child-revision-expression/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-local-child-without-version/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-local-child-without-version/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-local-valid/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/parent-version-range-local-valid/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/past-model-version-pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/project.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/reread/pom1.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/reread/pom2.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/subprojects-discover/child/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/subprojects-discover/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/transform/after.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/transform/before.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/transform/jar/after.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/transform/jar/before.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/tree/consumer/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/tree/dep/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/tree/pom.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/projects/versionless-managed-dependency.xml (100%) rename {maven-core => impl/maven-core}/src/test/resources/remote-repo-1/maven-test/jars/maven-test-b-1.0.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/remote-repo-1/maven-test/jars/maven-test-b-1.0.jar.md5 (100%) rename {maven-core => impl/maven-core}/src/test/resources/remote-repo-1/maven-test/poms/maven-test-b-1.0.pom (100%) rename {maven-core => impl/maven-core}/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version (100%) rename {maven-core => impl/maven-core}/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version (100%) rename {maven-core => impl/maven-core}/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar.snapshot-version (100%) rename {maven-core => impl/maven-core}/src/test/resources/remote-repo-2/maven-test/jars/maven-test-z-1.0.jar (100%) rename {maven-core => impl/maven-core}/src/test/resources/withActiveByDefaultProfile-pom.xml (100%) rename {maven-di => impl/maven-di}/pom.xml (97%) rename {maven-di => impl/maven-di}/src/main/java/org/apache/maven/di/Injector.java (100%) rename {maven-di => impl/maven-di}/src/main/java/org/apache/maven/di/Key.java (100%) rename {maven-di => impl/maven-di}/src/main/java/org/apache/maven/di/Scope.java (100%) rename {maven-di => impl/maven-di}/src/main/java/org/apache/maven/di/impl/Binding.java (100%) rename {maven-di => impl/maven-di}/src/main/java/org/apache/maven/di/impl/BindingInitializer.java (100%) rename {maven-di => impl/maven-di}/src/main/java/org/apache/maven/di/impl/DIException.java (100%) rename {maven-di => impl/maven-di}/src/main/java/org/apache/maven/di/impl/Dependency.java (100%) rename {maven-di => impl/maven-di}/src/main/java/org/apache/maven/di/impl/InjectorImpl.java (100%) rename {maven-di => impl/maven-di}/src/main/java/org/apache/maven/di/impl/ReflectionUtils.java (100%) rename {maven-di => impl/maven-di}/src/main/java/org/apache/maven/di/impl/Types.java (100%) rename {maven-di => impl/maven-di}/src/main/java/org/apache/maven/di/impl/Utils.java (100%) rename {maven-repository-metadata => impl/maven-di}/src/site/site.xml (100%) rename {maven-di => impl/maven-di}/src/test/java/org/apache/maven/di/impl/InjectorImplTest.java (100%) rename {maven-di => impl/maven-di}/src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java (100%) rename {maven-api-impl => impl/maven-impl}/pom.xml (92%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/DependencyManagementImporter.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/DependencyManagementInjector.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/InheritanceAssembler.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/LifecycleBindingsInjector.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ModelCache.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ModelCacheFactory.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ModelInterpolator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ModelNormalizer.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ModelPathTranslator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ModelProcessor.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ModelResolver.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ModelResolverException.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ModelUrlNormalizer.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ModelValidator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ModelVersionParser.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/PathTranslator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/PluginConfigurationExpander.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/PluginManagementInjector.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ProfileActivationContext.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ProfileActivator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ProfileInjector.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/ProfileSelector.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/RootDetector.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/RootLocator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/api/services/model/UrlNormalizer.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/AbstractNode.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/AbstractSession.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/AetherDependencyWrapper.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinates.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinatesFactory.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifactFactory.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultBuilderProblem.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmService.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinates.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinatesFactory.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolverResult.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultDownloadedArtifact.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilder.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultModelUrlNormalizer.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultNode.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultPluginConfigurationExpander.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultProducedArtifact.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultSettingsValidator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultSuperPomProvider.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultUrlNormalizer.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultVersionParser.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultVersionRangeResolver.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/DefaultVersionResolver.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/ExtensibleEnumRegistries.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/InternalSession.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/MappedCollection.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/MappedList.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/PathModularization.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/PathModularizationCache.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/PropertiesAsMap.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/SettingsUtilsV4.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/StaxLocation.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/Utils.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/WrapperNode.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/di/MojoExecutionScope.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/di/OutOfScopeException.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/di/SessionScope.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporter.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementInjector.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultInheritanceAssembler.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultInterpolator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultLifecycleBindingsInjector.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilderResult.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCache.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCacheFactory.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultModelInterpolator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultModelNormalizer.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultModelPathTranslator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProblem.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProcessor.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultPathTranslator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultPluginManagementInjector.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileActivationContext.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileInjector.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileSelector.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/FileToRawModelMerger.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/Graph.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/MavenBuildTimestamp.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/MavenModelMerger.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/ModelData.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/ModelProblemUtils.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/ProfileActivationFilePathInterpolator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/Result.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/profile/FileProfileActivator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/profile/JdkVersionProfileActivator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/profile/OperatingSystemProfileActivator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/profile/Os.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/profile/PackagingProfileActivator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/profile/PropertyProfileActivator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/reflection/ClassMap.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/reflection/IntrospectionException.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/reflection/MethodMap.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractor.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DefaultRootLocator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DotMvnRootDetector.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/model/rootlocator/PomXmlRootDetector.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorReaderDelegate.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorUtils.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionRangeResolver.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionResolver.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadata.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadataGenerator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/MavenArtifactRelocationSource.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/MavenMetadata.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/MavenSnapshotMetadata.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/MavenVersionScheme.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/MavenWorkspaceReader.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadata.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGenerator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGeneratorFactory.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadata.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadataGenerator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/RequestTraceHelper.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/SnapshotMetadataGeneratorFactory.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadata.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGenerator.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGeneratorFactory.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/artifact/FatArtifactTraverser.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/artifact/MavenArtifactProperties.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/package-info.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultType.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultTypeProvider.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/java/org/apache/maven/internal/impl/util/PhasingExecutor.java (100%) rename {maven-api-impl => impl/maven-impl}/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootDetector (100%) rename {maven-api-impl => impl/maven-impl}/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootLocator (100%) rename {maven-model-builder => impl/maven-impl}/src/main/resources/org/apache/maven/model/pom-4.0.0.xml (100%) rename {maven-model-builder => impl/maven-impl}/src/main/resources/org/apache/maven/model/pom-4.1.0.xml (100%) rename {maven-resolver-provider => impl/maven-impl}/src/site/site.xml (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/DefaultModelVersionParserTest.java (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/DefaultSettingsBuilderFactoryTest.java (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/DefaultSettingsValidatorTest.java (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/model/ComplexActivationTest.java (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporterTest.java (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/model/DefaultInterpolatorTest.java (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/model/MavenModelMergerTest.java (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractorTest.java (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/resolver/DefaultModelResolverTest.java (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/standalone/ApiRunner.java (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/standalone/DiTest.java (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/standalone/RepositorySystemSupplier.java (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/standalone/TestApiStandalone.java (100%) rename {maven-api-impl => impl/maven-impl}/src/test/java/org/apache/maven/internal/impl/util/PhasingExecutorTest.java (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/apache/1/apache-1.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/apache/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/bom/0.1/bom-0.1.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/bom/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/parent/0.1/parent-0.1.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/parent/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.jar (100%) rename {maven-api-impl => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.pom (100%) rename {maven-api-impl => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/pom.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/its/plugins/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/maven/2.0/maven-2.0.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.jar (100%) rename {maven-api-impl => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.jar (100%) rename {maven-api-impl => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.jar (100%) rename {maven-api-impl => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.jar (100%) rename {maven-api-impl => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.jar (100%) rename {maven-api-impl => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.jar (100%) rename {maven-api-impl => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.jar (100%) rename {maven-api-impl => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/maven-metadata.xml (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.jar (100%) rename {maven-api-impl => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.pom (100%) rename {maven-core => impl/maven-impl}/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml (100%) rename {maven-core/src/test/resources => impl/maven-impl/src/test/remote-repo}/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar (100%) rename {maven-core/src/test/resources => impl/maven-impl/src/test/remote-repo}/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom (100%) rename {maven-api-impl => impl/maven-impl}/src/test/resources/poms/factory/complex.xml (100%) rename {maven-api-impl => impl/maven-impl}/src/test/resources/poms/factory/complexExistsAndMissing.xml (100%) rename {maven-api-impl => impl/maven-impl}/src/test/resources/settings-simple.xml (100%) rename {maven-jline => impl/maven-jline}/pom.xml (98%) rename {maven-jline => impl/maven-jline}/src/main/java/org/apache/maven/jline/FastTerminal.java (100%) rename {maven-jline => impl/maven-jline}/src/main/java/org/apache/maven/jline/JLineMessageBuilderFactory.java (100%) rename {maven-jline => impl/maven-jline}/src/main/java/org/apache/maven/jline/MessageUtils.java (100%) rename {maven-settings-builder => impl/maven-jline}/src/site/site.xml (100%) rename {maven-logging => impl/maven-logging}/pom.xml (98%) rename {maven-logging => impl/maven-logging}/src/main/java/org/apache/maven/logging/api/LogLevelRecorder.java (100%) rename {maven-logging => impl/maven-logging}/src/main/java/org/apache/maven/slf4j/DefaultLogLevelRecorder.java (100%) rename {maven-logging => impl/maven-logging}/src/main/java/org/apache/maven/slf4j/MavenBaseLogger.java (100%) rename {maven-logging => impl/maven-logging}/src/main/java/org/apache/maven/slf4j/MavenFailOnSeverityLogger.java (100%) rename {maven-logging => impl/maven-logging}/src/main/java/org/apache/maven/slf4j/MavenLoggerFactory.java (100%) rename {maven-logging => impl/maven-logging}/src/main/java/org/apache/maven/slf4j/MavenServiceProvider.java (100%) rename {maven-logging => impl/maven-logging}/src/main/java/org/apache/maven/slf4j/MavenSimpleLogger.java (100%) rename {maven-logging => impl/maven-logging}/src/main/java/org/apache/maven/slf4j/OutputChoice.java (100%) rename {maven-logging => impl/maven-logging}/src/main/java/org/apache/maven/slf4j/SimpleLoggerConfiguration.java (100%) rename {maven-logging => impl/maven-logging}/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider (100%) rename {maven-logging => impl/maven-logging}/src/site/apt/index.apt (100%) rename {maven-settings => impl/maven-logging}/src/site/site.xml (100%) rename {maven-logging => impl/maven-logging}/src/test/java/org/apache/maven/slf4j/LogLevelRecorderTest.java (100%) rename {maven-logging => impl/maven-logging}/src/test/java/org/apache/maven/slf4j/MavenLoggerFactoryTest.java (100%) rename {maven-logging => impl/maven-logging}/src/test/java/org/apache/maven/slf4j/MavenSimpleLoggerTest.java (100%) rename {maven-xml-impl => impl/maven-xml}/pom.xml (95%) rename {maven-xml-impl => impl/maven-xml}/src/main/java/org/apache/maven/internal/xml/ImmutableCollections.java (100%) rename {maven-xml-impl => impl/maven-xml}/src/main/java/org/apache/maven/internal/xml/XmlNodeBuilder.java (100%) rename {maven-xml-impl => impl/maven-xml}/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java (100%) rename {maven-xml-impl => impl/maven-xml}/src/main/java/org/apache/maven/internal/xml/XmlNodeStaxBuilder.java (100%) rename {maven-xml-impl => impl/maven-xml}/src/main/java/org/apache/maven/internal/xml/XmlNodeWriter.java (100%) rename {maven-xml-impl => impl/maven-xml}/src/main/java/org/apache/maven/internal/xml/XmlPlexusConfiguration.java (100%) rename {maven-xml-impl => impl/maven-xml}/src/main/java/org/apache/maven/internal/xml/package-info.java (100%) rename {maven-xml-impl => impl/maven-xml}/src/site/markdown/index.md (100%) rename {maven-xml-impl => impl/maven-xml}/src/site/site.xml (100%) rename {maven-xml-impl => impl/maven-xml}/src/test/java/org/apache/maven/internal/xml/XmlNodeBuilderTest.java (100%) rename {maven-xml-impl => impl/maven-xml}/src/test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java (100%) create mode 100644 impl/pom.xml diff --git a/maven-artifact/pom.xml b/compat/maven-artifact/pom.xml similarity index 98% rename from maven-artifact/pom.xml rename to compat/maven-artifact/pom.xml index aa34cdb691..d896192ff8 100644 --- a/maven-artifact/pom.xml +++ b/compat/maven-artifact/pom.xml @@ -24,6 +24,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-artifact diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout2.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java b/compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java rename to compat/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java diff --git a/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java b/compat/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java rename to compat/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java diff --git a/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java b/compat/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java similarity index 100% rename from maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java rename to compat/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java diff --git a/maven-artifact/src/site/apt/index.apt b/compat/maven-artifact/src/site/apt/index.apt similarity index 100% rename from maven-artifact/src/site/apt/index.apt rename to compat/maven-artifact/src/site/apt/index.apt diff --git a/maven-api-impl/src/site/site.xml b/compat/maven-artifact/src/site/site.xml similarity index 100% rename from maven-api-impl/src/site/site.xml rename to compat/maven-artifact/src/site/site.xml diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java b/compat/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java similarity index 100% rename from maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java rename to compat/maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java b/compat/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java similarity index 100% rename from maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java rename to compat/maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java b/compat/maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java similarity index 100% rename from maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java rename to compat/maven-artifact/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java b/compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java similarity index 100% rename from maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java rename to compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java b/compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java similarity index 100% rename from maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java rename to compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java b/compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java similarity index 100% rename from maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java rename to compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java b/compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java similarity index 100% rename from maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java rename to compat/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java diff --git a/maven-builder-support/pom.xml b/compat/maven-builder-support/pom.xml similarity index 97% rename from maven-builder-support/pom.xml rename to compat/maven-builder-support/pom.xml index f528a89688..7130aeff48 100644 --- a/maven-builder-support/pom.xml +++ b/compat/maven-builder-support/pom.xml @@ -24,6 +24,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-builder-support diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java b/compat/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java similarity index 100% rename from maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java rename to compat/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblem.java diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java b/compat/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java similarity index 100% rename from maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java rename to compat/maven-builder-support/src/main/java/org/apache/maven/building/DefaultProblemCollector.java diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java b/compat/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java similarity index 100% rename from maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java rename to compat/maven-builder-support/src/main/java/org/apache/maven/building/FileSource.java diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/Problem.java b/compat/maven-builder-support/src/main/java/org/apache/maven/building/Problem.java similarity index 100% rename from maven-builder-support/src/main/java/org/apache/maven/building/Problem.java rename to compat/maven-builder-support/src/main/java/org/apache/maven/building/Problem.java diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollector.java b/compat/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollector.java similarity index 100% rename from maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollector.java rename to compat/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollector.java diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java b/compat/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java similarity index 100% rename from maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java rename to compat/maven-builder-support/src/main/java/org/apache/maven/building/ProblemCollectorFactory.java diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/Source.java b/compat/maven-builder-support/src/main/java/org/apache/maven/building/Source.java similarity index 100% rename from maven-builder-support/src/main/java/org/apache/maven/building/Source.java rename to compat/maven-builder-support/src/main/java/org/apache/maven/building/Source.java diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/StringSource.java b/compat/maven-builder-support/src/main/java/org/apache/maven/building/StringSource.java similarity index 100% rename from maven-builder-support/src/main/java/org/apache/maven/building/StringSource.java rename to compat/maven-builder-support/src/main/java/org/apache/maven/building/StringSource.java diff --git a/maven-builder-support/src/main/java/org/apache/maven/building/UrlSource.java b/compat/maven-builder-support/src/main/java/org/apache/maven/building/UrlSource.java similarity index 100% rename from maven-builder-support/src/main/java/org/apache/maven/building/UrlSource.java rename to compat/maven-builder-support/src/main/java/org/apache/maven/building/UrlSource.java diff --git a/maven-artifact/src/site/site.xml b/compat/maven-builder-support/src/site/site.xml similarity index 100% rename from maven-artifact/src/site/site.xml rename to compat/maven-builder-support/src/site/site.xml diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java b/compat/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java similarity index 100% rename from maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java rename to compat/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java b/compat/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java similarity index 100% rename from maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java rename to compat/maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java b/compat/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java similarity index 100% rename from maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java rename to compat/maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java b/compat/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java similarity index 100% rename from maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java rename to compat/maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java b/compat/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java similarity index 100% rename from maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java rename to compat/maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java diff --git a/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java b/compat/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java similarity index 100% rename from maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java rename to compat/maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java diff --git a/maven-builder-support/src/test/resources/source.txt b/compat/maven-builder-support/src/test/resources/source.txt similarity index 100% rename from maven-builder-support/src/test/resources/source.txt rename to compat/maven-builder-support/src/test/resources/source.txt diff --git a/maven-compat/pom.xml b/compat/maven-compat/pom.xml similarity index 99% rename from maven-compat/pom.xml rename to compat/maven-compat/pom.xml index 08796d456a..0fe2ec9e10 100644 --- a/maven-compat/pom.xml +++ b/compat/maven-compat/pom.xml @@ -24,6 +24,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-compat diff --git a/maven-compat/src/main/java/org/apache/maven/ArtifactFilterManager.java b/compat/maven-compat/src/main/java/org/apache/maven/ArtifactFilterManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/ArtifactFilterManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/ArtifactFilterManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/ArtifactFilterManagerDelegate.java b/compat/maven-compat/src/main/java/org/apache/maven/ArtifactFilterManagerDelegate.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/ArtifactFilterManagerDelegate.java rename to compat/maven-compat/src/main/java/org/apache/maven/ArtifactFilterManagerDelegate.java diff --git a/maven-compat/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/compat/maven-compat/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java rename to compat/maven-compat/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java diff --git a/maven-compat/src/main/java/org/apache/maven/ProjectDependenciesResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/ProjectDependenciesResolver.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/ProjectDependenciesResolver.java rename to compat/maven-compat/src/main/java/org/apache/maven/ProjectDependenciesResolver.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactStatus.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeploymentException.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstallationException.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryFactory.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataReadException.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionListenerForDepMgmt.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/InversionArtifactFilter.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/TypeArtifactFilter.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java b/compat/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java rename to compat/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java diff --git a/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java b/compat/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java rename to compat/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java diff --git a/maven-compat/src/main/java/org/apache/maven/execution/RuntimeInformation.java b/compat/maven-compat/src/main/java/org/apache/maven/execution/RuntimeInformation.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/execution/RuntimeInformation.java rename to compat/maven-compat/src/main/java/org/apache/maven/execution/RuntimeInformation.java diff --git a/maven-compat/src/main/java/org/apache/maven/plugin/PluginManager.java b/compat/maven-compat/src/main/java/org/apache/maven/plugin/PluginManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/plugin/PluginManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/plugin/PluginManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java b/compat/maven-compat/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java rename to compat/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java rename to compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/DetectedProfileActivator.java diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java rename to compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java rename to compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java rename to compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java rename to compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivationException.java diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java rename to compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java b/compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java rename to compat/maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java b/compat/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java b/compat/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/compat/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java b/compat/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java b/compat/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java b/compat/maven-compat/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java b/compat/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/compat/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java b/compat/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java b/compat/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/path/PathTranslator.java b/compat/maven-compat/src/main/java/org/apache/maven/project/path/PathTranslator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/path/PathTranslator.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/path/PathTranslator.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java b/compat/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java b/compat/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java diff --git a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java b/compat/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java rename to compat/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidator.java diff --git a/maven-compat/src/main/java/org/apache/maven/reporting/MavenReportException.java b/compat/maven-compat/src/main/java/org/apache/maven/reporting/MavenReportException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/reporting/MavenReportException.java rename to compat/maven-compat/src/main/java/org/apache/maven/reporting/MavenReportException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionRequest.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/MirrorSelector.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/VersionNotFoundException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/ChecksumFailedException.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/ChecksumFailedException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/ChecksumFailedException.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/ChecksumFailedException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/MavenArtifact.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/UpdateCheckManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonConfigurationException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolver.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverFactory.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverNotFoundException.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverNotFoundException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverNotFoundException.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/ConflictResolverNotFoundException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolver.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolver.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolver.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/DefaultConflictResolverFactory.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolver.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolver.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolver.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolver.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/AbstractVersionTransformation.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/DefaultArtifactTransformationManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/LatestArtifactTransformation.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ReleaseArtifactTransformation.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathTransformation.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultClasspathTransformation.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicy.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolver.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java rename to compat/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java diff --git a/maven-compat/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java b/compat/maven-compat/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java rename to compat/maven-compat/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java diff --git a/maven-compat/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java b/compat/maven-compat/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java rename to compat/maven-compat/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java diff --git a/maven-compat/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java b/compat/maven-compat/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java rename to compat/maven-compat/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java diff --git a/maven-compat/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java b/compat/maven-compat/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java rename to compat/maven-compat/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java diff --git a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java b/compat/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java rename to compat/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java diff --git a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java b/compat/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java rename to compat/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java diff --git a/maven-compat/src/main/mdo/paramdoc.mdo b/compat/maven-compat/src/main/mdo/paramdoc.mdo similarity index 100% rename from maven-compat/src/main/mdo/paramdoc.mdo rename to compat/maven-compat/src/main/mdo/paramdoc.mdo diff --git a/maven-compat/src/main/mdo/profiles.mdo b/compat/maven-compat/src/main/mdo/profiles.mdo similarity index 100% rename from maven-compat/src/main/mdo/profiles.mdo rename to compat/maven-compat/src/main/mdo/profiles.mdo diff --git a/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml b/compat/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml similarity index 100% rename from maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml rename to compat/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/project.paramdoc.xml diff --git a/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml b/compat/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml similarity index 100% rename from maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml rename to compat/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/rootless.paramdoc.xml diff --git a/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml b/compat/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml similarity index 100% rename from maven-compat/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml rename to compat/maven-compat/src/main/resources/META-INF/maven/plugin-expressions/settings.paramdoc.xml diff --git a/maven-compat/src/site/apt/index.apt b/compat/maven-compat/src/site/apt/index.apt similarity index 100% rename from maven-compat/src/site/apt/index.apt rename to compat/maven-compat/src/site/apt/index.apt diff --git a/maven-builder-support/src/site/site.xml b/compat/maven-compat/src/site/site.xml similarity index 100% rename from maven-builder-support/src/site/site.xml rename to compat/maven-compat/src/site/site.xml diff --git a/maven-compat/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java b/compat/maven-compat/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java rename to compat/maven-compat/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java diff --git a/maven-compat/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java b/compat/maven-compat/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/SimpleLookup.java b/compat/maven-compat/src/test/java/org/apache/maven/SimpleLookup.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/SimpleLookup.java rename to compat/maven-compat/src/test/java/org/apache/maven/SimpleLookup.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/metadata/SwitchableMetadataSource.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/metadata/SwitchableMetadataSource.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/metadata/SwitchableMetadataSource.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/metadata/SwitchableMetadataSource.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestMavenWorkspaceReader.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestMavenWorkspaceReader.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestMavenWorkspaceReader.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestMavenWorkspaceReader.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java b/compat/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/compat/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java b/compat/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/ClasspathArtifactResolver.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java b/compat/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java b/compat/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java b/compat/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTestType.java b/compat/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTestType.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTestType.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTestType.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/TestArtifactResolver.java b/compat/maven-compat/src/test/java/org/apache/maven/project/TestArtifactResolver.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/TestArtifactResolver.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/TestArtifactResolver.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java b/compat/maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/TestModelResolver.java b/compat/maven-compat/src/test/java/org/apache/maven/project/TestModelResolver.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/TestModelResolver.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/TestModelResolver.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java b/compat/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java b/compat/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/TestArtifactHandler.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/TestArtifactHandler.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/TestArtifactHandler.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/TestArtifactHandler.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/TestRepositorySystem.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/TestRepositorySystem.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/TestRepositorySystem.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/TestRepositorySystem.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/PerLookupWagon.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/PerLookupWagon.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/PerLookupWagon.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/PerLookupWagon.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTestType.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTestType.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTestType.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTestType.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java b/compat/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java similarity index 100% rename from maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java rename to compat/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java diff --git a/maven-compat/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt b/compat/maven-compat/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt similarity index 100% rename from maven-compat/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt rename to compat/maven-compat/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt diff --git a/maven-compat/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/tools.jar b/compat/maven-compat/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/tools.jar similarity index 100% rename from maven-compat/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/tools.jar rename to compat/maven-compat/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/tools.jar diff --git a/maven-compat/src/test/projects/project-dependencies-resolver/it0063/pom.xml b/compat/maven-compat/src/test/projects/project-dependencies-resolver/it0063/pom.xml similarity index 100% rename from maven-compat/src/test/projects/project-dependencies-resolver/it0063/pom.xml rename to compat/maven-compat/src/test/projects/project-dependencies-resolver/it0063/pom.xml diff --git a/maven-compat/src/test/projects/project-dependencies-resolver/project-with-exclusions/pom.xml b/compat/maven-compat/src/test/projects/project-dependencies-resolver/project-with-exclusions/pom.xml similarity index 100% rename from maven-compat/src/test/projects/project-dependencies-resolver/project-with-exclusions/pom.xml rename to compat/maven-compat/src/test/projects/project-dependencies-resolver/project-with-exclusions/pom.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar b/compat/maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar rename to compat/maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom b/compat/maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom rename to compat/maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml b/compat/maven-compat/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml rename to compat/maven-compat/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar b/compat/maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar rename to compat/maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom b/compat/maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom rename to compat/maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml b/compat/maven-compat/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml rename to compat/maven-compat/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml diff --git a/maven-compat/src/test/repository-system/maven-core-2.1.0.jar b/compat/maven-compat/src/test/repository-system/maven-core-2.1.0.jar similarity index 100% rename from maven-compat/src/test/repository-system/maven-core-2.1.0.jar rename to compat/maven-compat/src/test/repository-system/maven-core-2.1.0.jar diff --git a/maven-compat/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject b/compat/maven-compat/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject similarity index 100% rename from maven-compat/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject rename to compat/maven-compat/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject diff --git a/maven-compat/src/test/resources/artifact-install/artifact-1.0.jar b/compat/maven-compat/src/test/resources/artifact-install/artifact-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/artifact-install/artifact-1.0.jar rename to compat/maven-compat/src/test/resources/artifact-install/artifact-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t02/p0/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t02/p0/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t02/p0/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t02/p0/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t03/p0/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t03/p0/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t03/p0/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t03/p0/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t04/p0/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t04/p0/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t04/p0/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t04/p0/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t05/p0/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t05/p0/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t05/p0/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t05/p0/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t07/p0/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t07/p0/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t07/p0/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t07/p0/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t08/p0/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t08/p0/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t08/p0/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t08/p0/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t09/p0/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t09/p0/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t09/p0/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t09/p0/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar b/compat/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar rename to compat/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar diff --git a/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t10/p0/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t10/p0/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t10/p0/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t10/p0/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t11/p0/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t11/p0/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t11/p0/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t11/p0/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom b/compat/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom rename to compat/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom diff --git a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml diff --git a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml b/compat/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml similarity index 100% rename from maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml rename to compat/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml diff --git a/maven-compat/src/test/resources/local-repo/marker.txt b/compat/maven-compat/src/test/resources/local-repo/marker.txt similarity index 100% rename from maven-compat/src/test/resources/local-repo/marker.txt rename to compat/maven-compat/src/test/resources/local-repo/marker.txt diff --git a/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar b/compat/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar rename to compat/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar diff --git a/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar b/compat/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar rename to compat/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar diff --git a/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar b/compat/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar rename to compat/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar diff --git a/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar b/compat/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar similarity index 100% rename from maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar rename to compat/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar diff --git a/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom b/compat/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom rename to compat/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom diff --git a/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom b/compat/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom rename to compat/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom diff --git a/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom b/compat/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom rename to compat/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom diff --git a/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom b/compat/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom similarity index 100% rename from maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom rename to compat/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom diff --git a/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom b/compat/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom similarity index 100% rename from maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom rename to compat/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar b/compat/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar similarity index 100% rename from maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar rename to compat/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version b/compat/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version similarity index 100% rename from maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version rename to compat/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar b/compat/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar similarity index 100% rename from maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar rename to compat/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version b/compat/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version similarity index 100% rename from maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version rename to compat/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar b/compat/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar similarity index 100% rename from maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar rename to compat/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version b/compat/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version similarity index 100% rename from maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version rename to compat/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom b/compat/maven-compat/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom similarity index 100% rename from maven-compat/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom rename to compat/maven-compat/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom diff --git a/maven-compat/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml b/compat/maven-compat/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml similarity index 100% rename from maven-compat/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml rename to compat/maven-compat/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml diff --git a/maven-compat/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml b/compat/maven-compat/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml similarity index 100% rename from maven-compat/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml rename to compat/maven-compat/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml diff --git a/maven-compat/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml b/compat/maven-compat/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml similarity index 100% rename from maven-compat/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml rename to compat/maven-compat/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml diff --git a/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml b/compat/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml similarity index 100% rename from maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml rename to compat/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml diff --git a/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactUpdatePolicyTest.xml b/compat/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactUpdatePolicyTest.xml similarity index 100% rename from maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactUpdatePolicyTest.xml rename to compat/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactUpdatePolicyTest.xml diff --git a/maven-compat/src/test/resources/pom.xml b/compat/maven-compat/src/test/resources/pom.xml similarity index 100% rename from maven-compat/src/test/resources/pom.xml rename to compat/maven-compat/src/test/resources/pom.xml diff --git a/maven-compat/src/test/resources/projects/scope/project-with-scoped-dependencies.xml b/compat/maven-compat/src/test/resources/projects/scope/project-with-scoped-dependencies.xml similarity index 100% rename from maven-compat/src/test/resources/projects/scope/project-with-scoped-dependencies.xml rename to compat/maven-compat/src/test/resources/projects/scope/project-with-scoped-dependencies.xml diff --git a/maven-compat/src/test/resources/projects/scope/transitive-compile-dep.xml b/compat/maven-compat/src/test/resources/projects/scope/transitive-compile-dep.xml similarity index 100% rename from maven-compat/src/test/resources/projects/scope/transitive-compile-dep.xml rename to compat/maven-compat/src/test/resources/projects/scope/transitive-compile-dep.xml diff --git a/maven-compat/src/test/resources/projects/scope/transitive-default-dep.xml b/compat/maven-compat/src/test/resources/projects/scope/transitive-default-dep.xml similarity index 100% rename from maven-compat/src/test/resources/projects/scope/transitive-default-dep.xml rename to compat/maven-compat/src/test/resources/projects/scope/transitive-default-dep.xml diff --git a/maven-compat/src/test/resources/projects/scope/transitive-provided-dep.xml b/compat/maven-compat/src/test/resources/projects/scope/transitive-provided-dep.xml similarity index 100% rename from maven-compat/src/test/resources/projects/scope/transitive-provided-dep.xml rename to compat/maven-compat/src/test/resources/projects/scope/transitive-provided-dep.xml diff --git a/maven-compat/src/test/resources/projects/scope/transitive-runtime-dep.xml b/compat/maven-compat/src/test/resources/projects/scope/transitive-runtime-dep.xml similarity index 100% rename from maven-compat/src/test/resources/projects/scope/transitive-runtime-dep.xml rename to compat/maven-compat/src/test/resources/projects/scope/transitive-runtime-dep.xml diff --git a/maven-compat/src/test/resources/projects/scope/transitive-test-dep.xml b/compat/maven-compat/src/test/resources/projects/scope/transitive-test-dep.xml similarity index 100% rename from maven-compat/src/test/resources/projects/scope/transitive-test-dep.xml rename to compat/maven-compat/src/test/resources/projects/scope/transitive-test-dep.xml diff --git a/maven-embedder/pom.xml b/compat/maven-embedder/pom.xml similarity index 97% rename from maven-embedder/pom.xml rename to compat/maven-embedder/pom.xml index 1434afb3cd..1970fff6ad 100644 --- a/maven-embedder/pom.xml +++ b/compat/maven-embedder/pom.xml @@ -24,6 +24,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-embedder @@ -187,7 +189,7 @@ under the License. 1.2.0 - ../api/maven-api-cli/src/main/mdo/core-extensions.mdo + ../../api/maven-api-cli/src/main/mdo/core-extensions.mdo @@ -197,7 +199,7 @@ under the License. packageModelV4=org.apache.maven.api.cli.extensions packageToolV4=org.apache.maven.cli.internal.extension.io - ${project.basedir}/../src/mdo + ${project.basedir}/../../src/mdo diff --git a/maven-embedder/src/examples/simple-project/pom.xml b/compat/maven-embedder/src/examples/simple-project/pom.xml similarity index 100% rename from maven-embedder/src/examples/simple-project/pom.xml rename to compat/maven-embedder/src/examples/simple-project/pom.xml diff --git a/maven-embedder/src/examples/simple-project/settings.xml b/compat/maven-embedder/src/examples/simple-project/settings.xml similarity index 100% rename from maven-embedder/src/examples/simple-project/settings.xml rename to compat/maven-embedder/src/examples/simple-project/settings.xml diff --git a/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java b/compat/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java similarity index 100% rename from maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java rename to compat/maven-embedder/src/examples/simple-project/src/main/java/org/apache/maven/embedder/App.java diff --git a/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java b/compat/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java similarity index 100% rename from maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java rename to compat/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/CleanArgument.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/ExtensionConfigurationModule.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/ExtensionConfigurationModule.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/ExtensionConfigurationModule.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/ExtensionConfigurationModule.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/ResolveFile.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/ResolveFile.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/ResolveFile.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/ResolveFile.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/configuration/ConfigurationProcessor.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/event/DefaultEventSpyContext.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/internal/BootstrapCoreExtensionManager.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/internal/ExtensionResolutionException.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/internal/ExtensionResolutionException.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/internal/ExtensionResolutionException.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/internal/ExtensionResolutionException.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/MavenSimpleConfiguration.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/MavenSimpleConfiguration.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/MavenSimpleConfiguration.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/MavenSimpleConfiguration.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/UnsupportedSlf4jBindingConfiguration.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenProperties.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenPropertiesLoader.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenPropertiesLoader.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/props/MavenPropertiesLoader.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/props/MavenPropertiesLoader.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/AbstractMavenTransferListener.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/FileSizeFormat.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/FileSizeFormat.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/transfer/FileSizeFormat.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/FileSizeFormat.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/QuietMavenTransferListener.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/QuietMavenTransferListener.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/transfer/QuietMavenTransferListener.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/QuietMavenTransferListener.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/SimplexTransferListener.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/SimplexTransferListener.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/transfer/SimplexTransferListener.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/SimplexTransferListener.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/TransferResourceIdentifier.java b/compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/TransferResourceIdentifier.java similarity index 100% rename from maven-embedder/src/main/java/org/apache/maven/cli/transfer/TransferResourceIdentifier.java rename to compat/maven-embedder/src/main/java/org/apache/maven/cli/transfer/TransferResourceIdentifier.java diff --git a/maven-embedder/src/main/java/org/eclipse/sisu/plexus/PlexusXmlBeanConverter.java b/compat/maven-embedder/src/main/java/org/eclipse/sisu/plexus/PlexusXmlBeanConverter.java similarity index 100% rename from maven-embedder/src/main/java/org/eclipse/sisu/plexus/PlexusXmlBeanConverter.java rename to compat/maven-embedder/src/main/java/org/eclipse/sisu/plexus/PlexusXmlBeanConverter.java diff --git a/maven-embedder/src/main/java/org/fusesource/jansi/Ansi.java b/compat/maven-embedder/src/main/java/org/fusesource/jansi/Ansi.java similarity index 100% rename from maven-embedder/src/main/java/org/fusesource/jansi/Ansi.java rename to compat/maven-embedder/src/main/java/org/fusesource/jansi/Ansi.java diff --git a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties b/compat/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties similarity index 100% rename from maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties rename to compat/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties diff --git a/maven-embedder/src/site/apt/cli.apt.vm b/compat/maven-embedder/src/site/apt/cli.apt.vm similarity index 100% rename from maven-embedder/src/site/apt/cli.apt.vm rename to compat/maven-embedder/src/site/apt/cli.apt.vm diff --git a/maven-embedder/src/site/apt/index.apt.vm b/compat/maven-embedder/src/site/apt/index.apt.vm similarity index 100% rename from maven-embedder/src/site/apt/index.apt.vm rename to compat/maven-embedder/src/site/apt/index.apt.vm diff --git a/maven-embedder/src/site/apt/logging.apt b/compat/maven-embedder/src/site/apt/logging.apt similarity index 100% rename from maven-embedder/src/site/apt/logging.apt rename to compat/maven-embedder/src/site/apt/logging.apt diff --git a/maven-compat/src/site/site.xml b/compat/maven-embedder/src/site/site.xml similarity index 100% rename from maven-compat/src/site/site.xml rename to compat/maven-embedder/src/site/site.xml diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java similarity index 100% rename from maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java rename to compat/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIReportingUtilsTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/CLIReportingUtilsTest.java similarity index 100% rename from maven-embedder/src/test/java/org/apache/maven/cli/CLIReportingUtilsTest.java rename to compat/maven-embedder/src/test/java/org/apache/maven/cli/CLIReportingUtilsTest.java diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java similarity index 100% rename from maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java rename to compat/maven-embedder/src/test/java/org/apache/maven/cli/CleanArgumentTest.java diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java similarity index 100% rename from maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java rename to compat/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java similarity index 100% rename from maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java rename to compat/maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesLoaderTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesLoaderTest.java similarity index 100% rename from maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesLoaderTest.java rename to compat/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesLoaderTest.java diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesTest.java similarity index 100% rename from maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesTest.java rename to compat/maven-embedder/src/test/java/org/apache/maven/cli/props/MavenPropertiesTest.java diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListenerTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListenerTest.java similarity index 100% rename from maven-embedder/src/test/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListenerTest.java rename to compat/maven-embedder/src/test/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListenerTest.java diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java similarity index 100% rename from maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java rename to compat/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/SimplexTransferListenerTest.java b/compat/maven-embedder/src/test/java/org/apache/maven/cli/transfer/SimplexTransferListenerTest.java similarity index 100% rename from maven-embedder/src/test/java/org/apache/maven/cli/transfer/SimplexTransferListenerTest.java rename to compat/maven-embedder/src/test/java/org/apache/maven/cli/transfer/SimplexTransferListenerTest.java diff --git a/maven-embedder/src/test/projects/config-illegal/.mvn/maven.config b/compat/maven-embedder/src/test/projects/config-illegal/.mvn/maven.config similarity index 100% rename from maven-embedder/src/test/projects/config-illegal/.mvn/maven.config rename to compat/maven-embedder/src/test/projects/config-illegal/.mvn/maven.config diff --git a/maven-embedder/src/test/projects/config/.mvn/maven.config b/compat/maven-embedder/src/test/projects/config/.mvn/maven.config similarity index 100% rename from maven-embedder/src/test/projects/config/.mvn/maven.config rename to compat/maven-embedder/src/test/projects/config/.mvn/maven.config diff --git a/maven-embedder/src/test/projects/mavenConfigProperties/.mvn/maven.config b/compat/maven-embedder/src/test/projects/mavenConfigProperties/.mvn/maven.config similarity index 100% rename from maven-embedder/src/test/projects/mavenConfigProperties/.mvn/maven.config rename to compat/maven-embedder/src/test/projects/mavenConfigProperties/.mvn/maven.config diff --git a/maven-embedder/src/test/projects/root-attribute/child/pom.xml b/compat/maven-embedder/src/test/projects/root-attribute/child/pom.xml similarity index 100% rename from maven-embedder/src/test/projects/root-attribute/child/pom.xml rename to compat/maven-embedder/src/test/projects/root-attribute/child/pom.xml diff --git a/maven-embedder/src/test/projects/root-attribute/pom.xml b/compat/maven-embedder/src/test/projects/root-attribute/pom.xml similarity index 100% rename from maven-embedder/src/test/projects/root-attribute/pom.xml rename to compat/maven-embedder/src/test/projects/root-attribute/pom.xml diff --git a/maven-model-builder/pom.xml b/compat/maven-model-builder/pom.xml similarity index 99% rename from maven-model-builder/pom.xml rename to compat/maven-model-builder/pom.xml index f8c3256557..1217fdfafe 100644 --- a/maven-model-builder/pom.xml +++ b/compat/maven-model-builder/pom.xml @@ -24,6 +24,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-model-builder @@ -59,7 +61,7 @@ under the License. org.apache.maven - maven-api-impl + maven-impl org.apache.maven diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/BuildModelSourceTransformer.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/BuildModelSourceTransformer.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/BuildModelSourceTransformer.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/BuildModelSourceTransformer.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContextBuilder.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContextBuilder.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContextBuilder.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContextBuilder.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/FilterModelBuildingRequest.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/Graph.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/Graph.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/Graph.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/Graph.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEvent.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingListener.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingRequest.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingResult.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCache.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelData.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorExt.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemUtils.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProcessor.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource3.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource3.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource3.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource3.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSourceTransformer.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContext.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContext.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContext.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContext.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContextBuilder.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContextBuilder.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContextBuilder.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerContextBuilder.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerException.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerException.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerException.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/TransformerException.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/composition/DefaultDependencyManagementImporter.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/composition/DependencyManagementImporter.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/InheritanceAssembler.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/BuildTimestampValueSource.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/MavenBuildTimestamp.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelInterpolator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelVersionProcessor.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelVersionProcessor.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelVersionProcessor.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ModelVersionProcessor.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ObjectBasedValueSource.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ObjectBasedValueSource.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ObjectBasedValueSource.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ObjectBasedValueSource.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PathTranslatingPostProcessor.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PrefixedObjectValueSource.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PrefixedObjectValueSource.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PrefixedObjectValueSource.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/PrefixedObjectValueSource.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/ClassMap.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/ClassMap.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/ClassMap.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/ClassMap.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/IntrospectionException.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/IntrospectionException.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/IntrospectionException.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/IntrospectionException.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/MethodMap.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/MethodMap.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/MethodMap.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/MethodMap.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractor.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractor.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractor.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractor.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelParseException.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelWriter.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelWriter.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/io/ModelWriter.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelWriter.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/locator/ModelLocator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/management/DependencyManagementInjector.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/management/PluginManagementInjector.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/normalization/ModelNormalizer.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelPathTranslator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultModelUrlNormalizer.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultPathTranslator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/path/DefaultUrlNormalizer.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelPathTranslator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/path/ModelUrlNormalizer.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/PathTranslator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/path/PathTranslator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/path/PathTranslator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/path/PathTranslator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/ProfileActivationFilePathInterpolator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/path/ProfileActivationFilePathInterpolator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/path/ProfileActivationFilePathInterpolator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/path/ProfileActivationFilePathInterpolator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/path/UrlNormalizer.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/path/UrlNormalizer.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/path/UrlNormalizer.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/path/UrlNormalizer.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultPluginConfigurationExpander.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportConfigurationExpander.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/LifecycleBindingsInjector.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/PluginConfigurationExpander.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportConfigurationExpander.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/plugin/ReportingConverter.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileInjector.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PackagingProfileActivator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PackagingProfileActivator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PackagingProfileActivator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PackagingProfileActivator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/resolution/InvalidRepositoryException.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/resolution/ModelResolver.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/resolution/UnresolvableModelException.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/resolution/WorkspaceModelResolver.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/resolution/WorkspaceModelResolver.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/resolution/WorkspaceModelResolver.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/resolution/WorkspaceModelResolver.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/root/DefaultRootLocator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/root/DefaultRootLocator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/root/DefaultRootLocator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/root/DefaultRootLocator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/root/RootLocator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/root/RootLocator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/root/RootLocator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/root/RootLocator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/superpom/SuperPomProvider.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/model/validation/ModelValidator.java diff --git a/maven-model-builder/src/main/java/org/apache/maven/utils/Os.java b/compat/maven-model-builder/src/main/java/org/apache/maven/utils/Os.java similarity index 100% rename from maven-model-builder/src/main/java/org/apache/maven/utils/Os.java rename to compat/maven-model-builder/src/main/java/org/apache/maven/utils/Os.java diff --git a/maven-model-builder/src/main/resources/META-INF/services/org.apache.maven.model.root.RootLocator b/compat/maven-model-builder/src/main/resources/META-INF/services/org.apache.maven.model.root.RootLocator similarity index 100% rename from maven-model-builder/src/main/resources/META-INF/services/org.apache.maven.model.root.RootLocator rename to compat/maven-model-builder/src/main/resources/META-INF/services/org.apache.maven.model.root.RootLocator diff --git a/maven-api-impl/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml similarity index 100% rename from maven-api-impl/src/main/resources/org/apache/maven/model/pom-4.0.0.xml rename to compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml diff --git a/maven-api-impl/src/main/resources/org/apache/maven/model/pom-4.1.0.xml b/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.1.0.xml similarity index 100% rename from maven-api-impl/src/main/resources/org/apache/maven/model/pom-4.1.0.xml rename to compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.1.0.xml diff --git a/maven-model-builder/src/site/apt/index.apt b/compat/maven-model-builder/src/site/apt/index.apt similarity index 100% rename from maven-model-builder/src/site/apt/index.apt rename to compat/maven-model-builder/src/site/apt/index.apt diff --git a/maven-model-builder/src/site/apt/super-pom.apt.vm b/compat/maven-model-builder/src/site/apt/super-pom.apt.vm similarity index 100% rename from maven-model-builder/src/site/apt/super-pom.apt.vm rename to compat/maven-model-builder/src/site/apt/super-pom.apt.vm diff --git a/maven-di/src/site/site.xml b/compat/maven-model-builder/src/site/site.xml similarity index 100% rename from maven-di/src/site/site.xml rename to compat/maven-model-builder/src/site/site.xml diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/BuildModelSourceTransformerTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/BuildModelSourceTransformerTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/building/BuildModelSourceTransformerTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/building/BuildModelSourceTransformerTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/ComplexActivationTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/ComplexActivationTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/building/ComplexActivationTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/building/ComplexActivationTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/GraphTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/GraphTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/building/GraphTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/building/GraphTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/ModelBuildingExceptionTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/ModelBuildingExceptionTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/building/ModelBuildingExceptionTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/building/ModelBuildingExceptionTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/building/SimpleProblemCollector.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/MergerTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/MergerTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/inheritance/MergerTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/MergerTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolatorTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractorTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractorTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/reflection/ReflectionValueExtractorTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/path/DefaultUrlNormalizerTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/path/DefaultUrlNormalizerTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/path/DefaultUrlNormalizerTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/path/DefaultUrlNormalizerTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/DefaultProfileSelectorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/DefaultProfileSelectorTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/profile/DefaultProfileSelectorTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/DefaultProfileSelectorTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/AbstractProfileActivatorTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/FileProfileActivatorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/FileProfileActivatorTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/FileProfileActivatorTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/FileProfileActivatorTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/compat/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java similarity index 100% rename from maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java rename to compat/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java diff --git a/maven-model-builder/src/test/resources/dag.txt b/compat/maven-model-builder/src/test/resources/dag.txt similarity index 100% rename from maven-model-builder/src/test/resources/dag.txt rename to compat/maven-model-builder/src/test/resources/dag.txt diff --git a/maven-model-builder/src/test/resources/poms/depmgmt/distant-import.xml b/compat/maven-model-builder/src/test/resources/poms/depmgmt/distant-import.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/depmgmt/distant-import.xml rename to compat/maven-model-builder/src/test/resources/poms/depmgmt/distant-import.xml diff --git a/maven-model-builder/src/test/resources/poms/depmgmt/import.xml b/compat/maven-model-builder/src/test/resources/poms/depmgmt/import.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/depmgmt/import.xml rename to compat/maven-model-builder/src/test/resources/poms/depmgmt/import.xml diff --git a/maven-model-builder/src/test/resources/poms/depmgmt/junit-0.1.xml b/compat/maven-model-builder/src/test/resources/poms/depmgmt/junit-0.1.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/depmgmt/junit-0.1.xml rename to compat/maven-model-builder/src/test/resources/poms/depmgmt/junit-0.1.xml diff --git a/maven-model-builder/src/test/resources/poms/depmgmt/junit-0.2.xml b/compat/maven-model-builder/src/test/resources/poms/depmgmt/junit-0.2.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/depmgmt/junit-0.2.xml rename to compat/maven-model-builder/src/test/resources/poms/depmgmt/junit-0.2.xml diff --git a/maven-model-builder/src/test/resources/poms/depmgmt/other-import.xml b/compat/maven-model-builder/src/test/resources/poms/depmgmt/other-import.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/depmgmt/other-import.xml rename to compat/maven-model-builder/src/test/resources/poms/depmgmt/other-import.xml diff --git a/maven-model-builder/src/test/resources/poms/depmgmt/root-dep-first.xml b/compat/maven-model-builder/src/test/resources/poms/depmgmt/root-dep-first.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/depmgmt/root-dep-first.xml rename to compat/maven-model-builder/src/test/resources/poms/depmgmt/root-dep-first.xml diff --git a/maven-model-builder/src/test/resources/poms/depmgmt/root-dep-last.xml b/compat/maven-model-builder/src/test/resources/poms/depmgmt/root-dep-last.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/depmgmt/root-dep-last.xml rename to compat/maven-model-builder/src/test/resources/poms/depmgmt/root-dep-last.xml diff --git a/maven-model-builder/src/test/resources/poms/depmgmt/root-distance-explicit.xml b/compat/maven-model-builder/src/test/resources/poms/depmgmt/root-distance-explicit.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/depmgmt/root-distance-explicit.xml rename to compat/maven-model-builder/src/test/resources/poms/depmgmt/root-distance-explicit.xml diff --git a/maven-model-builder/src/test/resources/poms/depmgmt/root-distance.xml b/compat/maven-model-builder/src/test/resources/poms/depmgmt/root-distance.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/depmgmt/root-distance.xml rename to compat/maven-model-builder/src/test/resources/poms/depmgmt/root-distance.xml diff --git a/maven-model-builder/src/test/resources/poms/depmgmt/root-two-imports.xml b/compat/maven-model-builder/src/test/resources/poms/depmgmt/root-two-imports.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/depmgmt/root-two-imports.xml rename to compat/maven-model-builder/src/test/resources/poms/depmgmt/root-two-imports.xml diff --git a/maven-model-builder/src/test/resources/poms/factory/complex.xml b/compat/maven-model-builder/src/test/resources/poms/factory/complex.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/factory/complex.xml rename to compat/maven-model-builder/src/test/resources/poms/factory/complex.xml diff --git a/maven-model-builder/src/test/resources/poms/factory/simple.xml b/compat/maven-model-builder/src/test/resources/poms/factory/simple.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/factory/simple.xml rename to compat/maven-model-builder/src/test/resources/poms/factory/simple.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-child.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-child.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/empty-urls-child.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-child.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-expected.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-expected.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/empty-urls-expected.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-expected.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-parent.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-parent.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/empty-urls-parent.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/empty-urls-parent.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-child.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-child.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/flat-urls-child.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-child.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-expected.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-expected.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/flat-urls-expected.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-expected.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-parent.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-parent.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/flat-urls-parent.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/flat-urls-parent.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-parent.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-parent.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-parent.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-parent.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-child.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-child.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-child.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-child.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-expected.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-expected.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-expected.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-expected.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-parent.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-parent.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-parent.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-parent.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-child.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-child.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-child.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-child.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-expected.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-expected.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-expected.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-expected.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-parent.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-parent.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-parent.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls2-parent.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-child.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-child.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-child.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-child.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-expected.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-expected.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-expected.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-expected.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-parent.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-parent.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-parent.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls3-parent.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-child.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-child.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-child.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-child.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-expected.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-expected.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-expected.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-expected.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-parent.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-parent.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-parent.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-artifactId-urls-parent.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-child.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-child.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-child.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-child.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-expected.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-expected.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-expected.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-expected.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-parent.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-parent.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-parent.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/tricky-flat-directory-urls-parent.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/urls-child.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/urls-child.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/urls-child.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/urls-child.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/urls-expected.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/urls-expected.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/urls-expected.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/urls-expected.xml diff --git a/maven-model-builder/src/test/resources/poms/inheritance/urls-parent.xml b/compat/maven-model-builder/src/test/resources/poms/inheritance/urls-parent.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/inheritance/urls-parent.xml rename to compat/maven-model-builder/src/test/resources/poms/inheritance/urls-parent.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-dependency-exclusion-id.xml b/compat/maven-model-builder/src/test/resources/poms/validation/bad-dependency-exclusion-id.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/bad-dependency-exclusion-id.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/bad-dependency-exclusion-id.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-dependency-management-scope.xml b/compat/maven-model-builder/src/test/resources/poms/validation/bad-dependency-management-scope.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/bad-dependency-management-scope.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/bad-dependency-management-scope.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-dependency-scope.xml b/compat/maven-model-builder/src/test/resources/poms/validation/bad-dependency-scope.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/bad-dependency-scope.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/bad-dependency-scope.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-dependency-version.xml b/compat/maven-model-builder/src/test/resources/poms/validation/bad-dependency-version.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/bad-dependency-version.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/bad-dependency-version.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-import-scope-classifier.xml b/compat/maven-model-builder/src/test/resources/poms/validation/bad-import-scope-classifier.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/bad-import-scope-classifier.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/bad-import-scope-classifier.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-import-scope-type.xml b/compat/maven-model-builder/src/test/resources/poms/validation/bad-import-scope-type.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/bad-import-scope-type.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/bad-import-scope-type.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-modelVersion.xml b/compat/maven-model-builder/src/test/resources/poms/validation/bad-modelVersion.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/bad-modelVersion.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/bad-modelVersion.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-plugin-dependency-scope.xml b/compat/maven-model-builder/src/test/resources/poms/validation/bad-plugin-dependency-scope.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/bad-plugin-dependency-scope.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/bad-plugin-dependency-scope.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-plugin-dependency-version.xml b/compat/maven-model-builder/src/test/resources/poms/validation/bad-plugin-dependency-version.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/bad-plugin-dependency-version.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/bad-plugin-dependency-version.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-plugin-version.xml b/compat/maven-model-builder/src/test/resources/poms/validation/bad-plugin-version.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/bad-plugin-version.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/bad-plugin-version.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-repository-id.xml b/compat/maven-model-builder/src/test/resources/poms/validation/bad-repository-id.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/bad-repository-id.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/bad-repository-id.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-snapshot-version.xml b/compat/maven-model-builder/src/test/resources/poms/validation/bad-snapshot-version.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/bad-snapshot-version.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/bad-snapshot-version.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/bad-version.xml b/compat/maven-model-builder/src/test/resources/poms/validation/bad-version.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/bad-version.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/bad-version.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/basedir-system-path.xml b/compat/maven-model-builder/src/test/resources/poms/validation/basedir-system-path.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/basedir-system-path.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/basedir-system-path.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/deprecated-dependency-metaversions-latest-and-release.xml b/compat/maven-model-builder/src/test/resources/poms/validation/deprecated-dependency-metaversions-latest-and-release.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/deprecated-dependency-metaversions-latest-and-release.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/deprecated-dependency-metaversions-latest-and-release.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/distribution-management-status.xml b/compat/maven-model-builder/src/test/resources/poms/validation/distribution-management-status.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/distribution-management-status.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/distribution-management-status.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/duplicate-module.xml b/compat/maven-model-builder/src/test/resources/poms/validation/duplicate-module.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/duplicate-module.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/duplicate-module.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/duplicate-plugin-execution.xml b/compat/maven-model-builder/src/test/resources/poms/validation/duplicate-plugin-execution.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/duplicate-plugin-execution.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/duplicate-plugin-execution.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/duplicate-plugin.xml b/compat/maven-model-builder/src/test/resources/poms/validation/duplicate-plugin.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/duplicate-plugin.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/duplicate-plugin.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/duplicate-profile-id.xml b/compat/maven-model-builder/src/test/resources/poms/validation/duplicate-profile-id.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/duplicate-profile-id.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/duplicate-profile-id.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/empty-module.xml b/compat/maven-model-builder/src/test/resources/poms/validation/empty-module.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/empty-module.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/empty-module.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/empty-plugin-version.xml b/compat/maven-model-builder/src/test/resources/poms/validation/empty-plugin-version.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/empty-plugin-version.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/empty-plugin-version.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/hard-coded-system-path.xml b/compat/maven-model-builder/src/test/resources/poms/validation/hard-coded-system-path.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/hard-coded-system-path.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/hard-coded-system-path.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/incomplete-parent.xml b/compat/maven-model-builder/src/test/resources/poms/validation/incomplete-parent.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/incomplete-parent.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/incomplete-parent.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/invalid-aggregator-packaging-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/invalid-coordinate-ids-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/invalid-coordinate-ids-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/invalid-coordinate-ids-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/invalid-coordinate-ids-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/invalid-profile-ids.xml b/compat/maven-model-builder/src/test/resources/poms/validation/invalid-profile-ids.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/invalid-profile-ids.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/invalid-profile-ids.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-1-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-1-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-1-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-1-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-artifactId-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-artifactId-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-artifactId-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-artifactId-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-dependency-artifactId-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-artifactId-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-dependency-artifactId-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-artifactId-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-dependency-exclusion-id.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-exclusion-id.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-dependency-exclusion-id.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-exclusion-id.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-dependency-groupId-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-groupId-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-dependency-groupId-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-groupId-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-dependency-mgmt-artifactId-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-mgmt-artifactId-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-dependency-mgmt-artifactId-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-mgmt-artifactId-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-dependency-mgmt-groupId-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-mgmt-groupId-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-dependency-mgmt-groupId-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-mgmt-groupId-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-dependency-mgmt-version-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-mgmt-version-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-dependency-mgmt-version-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-mgmt-version-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-dependency-version-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-version-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-dependency-version-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-dependency-version-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-groupId-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-groupId-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-groupId-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-groupId-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-modelVersion-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-modelVersion-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-modelVersion-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-modelVersion-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-plugin-artifactId-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-plugin-artifactId-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-plugin-artifactId-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-plugin-artifactId-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-artifactId.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-artifactId.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-artifactId.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-artifactId.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-groupId.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-groupId.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-groupId.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-groupId.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-version.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-version.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-version.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-plugin-dependency-version.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-plugin-version-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-plugin-version-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-plugin-version-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-plugin-version-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-report-artifactId-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-report-artifactId-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-report-artifactId-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-report-artifactId-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-report-version-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-report-version-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-report-version-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-report-version-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-repository-id-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-repository-id-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-repository-id-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-repository-id-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-resource-directory-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-resource-directory-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-resource-directory-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-resource-directory-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-type-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-type-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-type-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-type-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/missing-version-pom.xml b/compat/maven-model-builder/src/test/resources/poms/validation/missing-version-pom.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/missing-version-pom.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/missing-version-pom.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/modelVersion-4_0.xml b/compat/maven-model-builder/src/test/resources/poms/validation/modelVersion-4_0.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/modelVersion-4_0.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/modelVersion-4_0.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly-sha1plus2.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-ci-friendly.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-latest.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/bad-parent-version-release.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-artifactId-pluginManagement.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-artifactId-pluginManagement.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/missing-artifactId-pluginManagement.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-artifactId-pluginManagement.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-ga-pluginManagement.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-ga-pluginManagement.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/missing-ga-pluginManagement.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-ga-pluginManagement.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-groupId-pluginManagement.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-groupId-pluginManagement.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/missing-groupId-pluginManagement.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-groupId-pluginManagement.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-plugin-version-pluginManagement.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-plugin-version-pluginManagement.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/missing-plugin-version-pluginManagement.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/missing-plugin-version-pluginManagement.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-all-expressions.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-all-expressions.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-all-expressions.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-all-expressions.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-changelist.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-changelist.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-changelist.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-changelist.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-revision.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-revision.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-revision.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-revision.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/ok-ci-friendly-sha1.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/profile-activation-file-with-allowed-expressions.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/profile-activation-file-with-allowed-expressions.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/profile-activation-file-with-allowed-expressions.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/profile-activation-file-with-allowed-expressions.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/profile-activation-file-with-project-expressions.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/profile-activation-file-with-project-expressions.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/profile-activation-file-with-project-expressions.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/profile-activation-file-with-project-expressions.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/profile-activation-property-with-project-expressions.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/profile-activation-property-with-project-expressions.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/profile-activation-property-with-project-expressions.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/profile-activation-property-with-project-expressions.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-basedir-expression.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-basedir-expression.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-basedir-expression.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-basedir-expression.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-expression.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-expression.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-expression.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-expression.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing-classifier.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.xml b/compat/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/raw-model/self-referencing.xml diff --git a/maven-model-builder/src/test/resources/poms/validation/reserved-repository-id.xml b/compat/maven-model-builder/src/test/resources/poms/validation/reserved-repository-id.xml similarity index 100% rename from maven-model-builder/src/test/resources/poms/validation/reserved-repository-id.xml rename to compat/maven-model-builder/src/test/resources/poms/validation/reserved-repository-id.xml diff --git a/maven-model/pom.xml b/compat/maven-model/pom.xml similarity index 96% rename from maven-model/pom.xml rename to compat/maven-model/pom.xml index 975a9dde84..35c67fab24 100644 --- a/maven-model/pom.xml +++ b/compat/maven-model/pom.xml @@ -24,6 +24,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-model @@ -46,7 +48,7 @@ under the License. org.apache.maven - maven-api-impl + maven-impl org.codehaus.plexus @@ -77,8 +79,8 @@ under the License. org.codehaus.modello modello-maven-plugin - ${project.basedir}/../api/maven-api-model - ${project.basedir}/../src/mdo + ${project.basedir}/../../api/maven-api-model + ${project.basedir}/../../src/mdo 4.1.0 src/main/mdo/maven.mdo diff --git a/maven-model/src/main/java/org/apache/maven/model/BaseObject.java b/compat/maven-model/src/main/java/org/apache/maven/model/BaseObject.java similarity index 100% rename from maven-model/src/main/java/org/apache/maven/model/BaseObject.java rename to compat/maven-model/src/main/java/org/apache/maven/model/BaseObject.java diff --git a/maven-model/src/main/java/org/apache/maven/model/InputLocation.java b/compat/maven-model/src/main/java/org/apache/maven/model/InputLocation.java similarity index 100% rename from maven-model/src/main/java/org/apache/maven/model/InputLocation.java rename to compat/maven-model/src/main/java/org/apache/maven/model/InputLocation.java diff --git a/maven-model/src/main/java/org/apache/maven/model/InputLocationTracker.java b/compat/maven-model/src/main/java/org/apache/maven/model/InputLocationTracker.java similarity index 100% rename from maven-model/src/main/java/org/apache/maven/model/InputLocationTracker.java rename to compat/maven-model/src/main/java/org/apache/maven/model/InputLocationTracker.java diff --git a/maven-model/src/main/java/org/apache/maven/model/InputSource.java b/compat/maven-model/src/main/java/org/apache/maven/model/InputSource.java similarity index 100% rename from maven-model/src/main/java/org/apache/maven/model/InputSource.java rename to compat/maven-model/src/main/java/org/apache/maven/model/InputSource.java diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3Reader.java b/compat/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3Reader.java similarity index 100% rename from maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3Reader.java rename to compat/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3Reader.java diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3ReaderEx.java b/compat/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3ReaderEx.java similarity index 100% rename from maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3ReaderEx.java rename to compat/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3ReaderEx.java diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3Writer.java b/compat/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3Writer.java similarity index 100% rename from maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3Writer.java rename to compat/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3Writer.java diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3WriterEx.java b/compat/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3WriterEx.java similarity index 100% rename from maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3WriterEx.java rename to compat/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3WriterEx.java diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java b/compat/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java similarity index 100% rename from maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java rename to compat/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java diff --git a/maven-model/src/main/java/org/apache/maven/model/merge/package-info.java b/compat/maven-model/src/main/java/org/apache/maven/model/merge/package-info.java similarity index 100% rename from maven-model/src/main/java/org/apache/maven/model/merge/package-info.java rename to compat/maven-model/src/main/java/org/apache/maven/model/merge/package-info.java diff --git a/maven-model/src/site/apt/index.apt b/compat/maven-model/src/site/apt/index.apt similarity index 100% rename from maven-model/src/site/apt/index.apt rename to compat/maven-model/src/site/apt/index.apt diff --git a/maven-embedder/src/site/site.xml b/compat/maven-model/src/site/site.xml similarity index 100% rename from maven-embedder/src/site/site.xml rename to compat/maven-model/src/site/site.xml diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ActivationTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/BuildTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/BuildTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/BuildTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/BuildTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ContributorTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/DependencyTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/LicenseTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/MailingListTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ModelTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ModelTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ModelTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ModelTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/NotifierTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ParentTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ParentTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ParentTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ParentTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/PluginTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/PluginTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/PluginTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/PluginTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ProfileTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/RelocationTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ReportingTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ResourceTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/ScmTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ScmTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/ScmTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/ScmTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/SerializationTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/SerializationTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/SerializationTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/SerializationTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/SiteTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/SiteTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/SiteTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/SiteTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/merge/MavenMergerTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/merge/MavenMergerTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/merge/MavenMergerTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/merge/MavenMergerTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/v4/MavenModelVersionTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/v4/MavenModelVersionTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/v4/MavenModelVersionTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/v4/MavenModelVersionTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/v4/ModelXmlTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/v4/ModelXmlTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/v4/ModelXmlTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/v4/ModelXmlTest.java diff --git a/maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java similarity index 100% rename from maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java rename to compat/maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java diff --git a/maven-model/src/test/resources/xml/pom.xml b/compat/maven-model/src/test/resources/xml/pom.xml similarity index 98% rename from maven-model/src/test/resources/xml/pom.xml rename to compat/maven-model/src/test/resources/xml/pom.xml index 01b6796875..a594e404dc 100644 --- a/maven-model/src/test/resources/xml/pom.xml +++ b/compat/maven-model/src/test/resources/xml/pom.xml @@ -41,7 +41,7 @@ under the License. org.apache.maven - maven-xml-impl + maven-xml 4.0.0-alpha-1-SNAPSHOT diff --git a/maven-plugin-api/pom.xml b/compat/maven-plugin-api/pom.xml similarity index 94% rename from maven-plugin-api/pom.xml rename to compat/maven-plugin-api/pom.xml index 44cf10bf25..d1cf51990f 100644 --- a/maven-plugin-api/pom.xml +++ b/compat/maven-plugin-api/pom.xml @@ -24,6 +24,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-plugin-api @@ -46,7 +48,7 @@ under the License. org.apache.maven - maven-xml-impl + maven-xml org.apache.maven @@ -96,7 +98,7 @@ under the License. org.codehaus.modello modello-maven-plugin - ${project.basedir}/../src/mdo + ${project.basedir}/../../src/mdo @@ -115,7 +117,7 @@ under the License. packageToolV4=org.apache.maven.plugin.lifecycle.io - ../api/maven-api-plugin/src/main/mdo/lifecycle.mdo + ../../api/maven-api-plugin/src/main/mdo/lifecycle.mdo 2.0.0 @@ -137,7 +139,7 @@ under the License. packageToolV4=org.apache.maven.plugin.descriptor.io - ../api/maven-api-plugin/src/main/mdo/plugin.mdo + ../../api/maven-api-plugin/src/main/mdo/plugin.mdo 2.0.0 diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojoExecutionException.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojoExecutionException.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojoExecutionException.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojoExecutionException.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/ContextEnabled.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/ContextEnabled.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/ContextEnabled.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/ContextEnabled.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoExecutionException.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoFailureException.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoFailureException.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoFailureException.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoFailureException.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/MojoNotFoundException.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateMojoDescriptorException.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateParameterException.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateParameterException.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateParameterException.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/DuplicateParameterException.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidParameterException.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidParameterException.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidParameterException.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidParameterException.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidPluginDescriptorException.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidPluginDescriptorException.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidPluginDescriptorException.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidPluginDescriptorException.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Requirement.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Requirement.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Requirement.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Requirement.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Execution.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Execution.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Execution.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Execution.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Lifecycle.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Lifecycle.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Lifecycle.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Lifecycle.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/LifecycleConfiguration.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/LifecycleConfiguration.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/LifecycleConfiguration.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/LifecycleConfiguration.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Phase.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Phase.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Phase.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Phase.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java b/compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java similarity index 100% rename from maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java rename to compat/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java diff --git a/maven-plugin-api/src/site/apt/index.apt b/compat/maven-plugin-api/src/site/apt/index.apt similarity index 100% rename from maven-plugin-api/src/site/apt/index.apt rename to compat/maven-plugin-api/src/site/apt/index.apt diff --git a/maven-plugin-api/src/site/site.xml b/compat/maven-plugin-api/src/site/site.xml similarity index 100% rename from maven-plugin-api/src/site/site.xml rename to compat/maven-plugin-api/src/site/site.xml diff --git a/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/MojoDescriptorTest.java b/compat/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/MojoDescriptorTest.java similarity index 100% rename from maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/MojoDescriptorTest.java rename to compat/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/MojoDescriptorTest.java diff --git a/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java b/compat/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java similarity index 100% rename from maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java rename to compat/maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilderTest.java diff --git a/maven-plugin-api/src/test/resources/plugin.xml b/compat/maven-plugin-api/src/test/resources/plugin.xml similarity index 100% rename from maven-plugin-api/src/test/resources/plugin.xml rename to compat/maven-plugin-api/src/test/resources/plugin.xml diff --git a/maven-repository-metadata/pom.xml b/compat/maven-repository-metadata/pom.xml similarity index 90% rename from maven-repository-metadata/pom.xml rename to compat/maven-repository-metadata/pom.xml index f68e36dc78..f8ac15d018 100644 --- a/maven-repository-metadata/pom.xml +++ b/compat/maven-repository-metadata/pom.xml @@ -24,6 +24,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-repository-metadata @@ -42,7 +44,7 @@ under the License. org.apache.maven - maven-api-impl + maven-impl org.codehaus.plexus @@ -50,7 +52,7 @@ under the License. org.apache.maven - maven-xml-impl + maven-xml @@ -78,7 +80,7 @@ under the License. 1.2.0 - ../api/maven-api-metadata/src/main/mdo/metadata.mdo + ../../api/maven-api-metadata/src/main/mdo/metadata.mdo forcedIOModelVersion=1.1.0 @@ -86,7 +88,7 @@ under the License. packageModelV4=org.apache.maven.api.metadata packageToolV4=org.apache.maven.artifact.repository.metadata.io - ${project.basedir}/../src/mdo + ${project.basedir}/../../src/mdo @@ -97,7 +99,7 @@ under the License. 1.1.0 - ../api/maven-api-metadata/src/main/mdo/metadata.mdo + ../../api/maven-api-metadata/src/main/mdo/metadata.mdo diff --git a/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/BaseObject.java b/compat/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/BaseObject.java similarity index 100% rename from maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/BaseObject.java rename to compat/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/BaseObject.java diff --git a/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java b/compat/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java similarity index 100% rename from maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java rename to compat/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java diff --git a/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java b/compat/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java similarity index 100% rename from maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java rename to compat/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java diff --git a/maven-repository-metadata/src/site/apt/index.apt b/compat/maven-repository-metadata/src/site/apt/index.apt similarity index 100% rename from maven-repository-metadata/src/site/apt/index.apt rename to compat/maven-repository-metadata/src/site/apt/index.apt diff --git a/maven-jline/src/site/site.xml b/compat/maven-repository-metadata/src/site/site.xml similarity index 100% rename from maven-jline/src/site/site.xml rename to compat/maven-repository-metadata/src/site/site.xml diff --git a/maven-repository-metadata/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTest.java b/compat/maven-repository-metadata/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTest.java similarity index 100% rename from maven-repository-metadata/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTest.java rename to compat/maven-repository-metadata/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTest.java diff --git a/maven-resolver-provider/pom.xml b/compat/maven-resolver-provider/pom.xml similarity index 97% rename from maven-resolver-provider/pom.xml rename to compat/maven-resolver-provider/pom.xml index 250f3ceaab..cf945a32a8 100644 --- a/maven-resolver-provider/pom.xml +++ b/compat/maven-resolver-provider/pom.xml @@ -24,6 +24,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-resolver-provider @@ -54,11 +56,11 @@ under the License. org.apache.maven - maven-api-impl + maven-impl org.apache.maven - maven-xml-impl + maven-xml org.apache.maven diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorUtils.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCacheFactory.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCacheFactory.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCacheFactory.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCacheFactory.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelVersionParser.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionSchemeProvider.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionSchemeProvider.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionSchemeProvider.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionSchemeProvider.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenArtifactRelocationSource.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenArtifactRelocationSource.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenArtifactRelocationSource.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenArtifactRelocationSource.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSupplier.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSupplier.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSupplier.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSupplier.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSessionBuilderSupplier.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenWorkspaceReader.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ModelCacheFactory.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ModelCacheFactory.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ModelCacheFactory.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/ModelCacheFactory.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadata.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadata.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadata.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadata.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGenerator.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataGeneratorFactory.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RelocatedArtifact.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RequestTraceHelper.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RequestTraceHelper.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RequestTraceHelper.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RequestTraceHelper.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/SnapshotMetadataGeneratorFactory.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGenerator.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadataGeneratorFactory.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/FatArtifactTraverser.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/FatArtifactTraverser.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/FatArtifactTraverser.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/FatArtifactTraverser.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/MavenArtifactProperties.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/MavenArtifactProperties.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/MavenArtifactProperties.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/artifact/MavenArtifactProperties.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/package-info.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/DistributionManagementArtifactRelocationSource.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/DistributionManagementArtifactRelocationSource.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/DistributionManagementArtifactRelocationSource.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/DistributionManagementArtifactRelocationSource.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/relocation/UserPropertiesArtifactRelocationSource.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven3ScopeManagerConfiguration.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven3ScopeManagerConfiguration.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven3ScopeManagerConfiguration.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven3ScopeManagerConfiguration.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultType.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultType.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultType.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultType.java diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultTypeProvider.java b/compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultTypeProvider.java similarity index 100% rename from maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultTypeProvider.java rename to compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/type/DefaultTypeProvider.java diff --git a/maven-resolver-provider/src/site/apt/dependency-types.apt b/compat/maven-resolver-provider/src/site/apt/dependency-types.apt similarity index 100% rename from maven-resolver-provider/src/site/apt/dependency-types.apt rename to compat/maven-resolver-provider/src/site/apt/dependency-types.apt diff --git a/maven-resolver-provider/src/site/apt/index.apt b/compat/maven-resolver-provider/src/site/apt/index.apt similarity index 100% rename from maven-resolver-provider/src/site/apt/index.apt rename to compat/maven-resolver-provider/src/site/apt/index.apt diff --git a/maven-logging/src/site/site.xml b/compat/maven-resolver-provider/src/site/site.xml similarity index 100% rename from maven-logging/src/site/site.xml rename to compat/maven-resolver-provider/src/site/site.xml diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java b/compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java similarity index 100% rename from maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java rename to compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractVersionTest.java b/compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractVersionTest.java similarity index 100% rename from maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractVersionTest.java rename to compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/AbstractVersionTest.java diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java b/compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java similarity index 100% rename from maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java rename to compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java b/compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java similarity index 100% rename from maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java rename to compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultModelResolverTest.java diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java b/compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java similarity index 100% rename from maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java rename to compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/ModelVersionParserTest.java b/compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/ModelVersionParserTest.java similarity index 100% rename from maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/ModelVersionParserTest.java rename to compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/ModelVersionParserTest.java diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java b/compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java similarity index 100% rename from maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java rename to compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java b/compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java similarity index 100% rename from maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java rename to compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/VersionRangeTest.java b/compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/VersionRangeTest.java similarity index 100% rename from maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/VersionRangeTest.java rename to compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/VersionRangeTest.java diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/VersionTest.java b/compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/VersionTest.java similarity index 100% rename from maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/VersionTest.java rename to compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/VersionTest.java diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleRepositoryListener.java b/compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleRepositoryListener.java similarity index 100% rename from maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleRepositoryListener.java rename to compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleRepositoryListener.java diff --git a/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java b/compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java similarity index 100% rename from maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java rename to compat/maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java diff --git a/maven-resolver-provider/src/test/resources/META-INF/sisu/javax.inject.Named b/compat/maven-resolver-provider/src/test/resources/META-INF/sisu/javax.inject.Named similarity index 100% rename from maven-resolver-provider/src/test/resources/META-INF/sisu/javax.inject.Named rename to compat/maven-resolver-provider/src/test/resources/META-INF/sisu/javax.inject.Named diff --git a/maven-resolver-provider/src/test/resources/repo/org/apache/maven/its/dep-mng5324/07.20.3-SNAPSHOT/maven-metadata.xml b/compat/maven-resolver-provider/src/test/resources/repo/org/apache/maven/its/dep-mng5324/07.20.3-SNAPSHOT/maven-metadata.xml similarity index 100% rename from maven-resolver-provider/src/test/resources/repo/org/apache/maven/its/dep-mng5324/07.20.3-SNAPSHOT/maven-metadata.xml rename to compat/maven-resolver-provider/src/test/resources/repo/org/apache/maven/its/dep-mng5324/07.20.3-SNAPSHOT/maven-metadata.xml diff --git a/maven-resolver-provider/src/test/resources/repo/org/apache/maven/its/dep-mng5459/0.4.0-SNAPSHOT/maven-metadata.xml b/compat/maven-resolver-provider/src/test/resources/repo/org/apache/maven/its/dep-mng5459/0.4.0-SNAPSHOT/maven-metadata.xml similarity index 100% rename from maven-resolver-provider/src/test/resources/repo/org/apache/maven/its/dep-mng5459/0.4.0-SNAPSHOT/maven-metadata.xml rename to compat/maven-resolver-provider/src/test/resources/repo/org/apache/maven/its/dep-mng5459/0.4.0-SNAPSHOT/maven-metadata.xml diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0-classifier.zip b/compat/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0-classifier.zip similarity index 100% rename from maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0-classifier.zip rename to compat/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0-classifier.zip diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.jar b/compat/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.jar similarity index 100% rename from maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.jar rename to compat/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.jar diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom b/compat/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom similarity index 100% rename from maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom rename to compat/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.zip b/compat/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.zip similarity index 100% rename from maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.zip rename to compat/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.zip diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/maven-metadata.xml b/compat/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/maven-metadata.xml similarity index 100% rename from maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/maven-metadata.xml rename to compat/maven-resolver-provider/src/test/resources/repo/ut/simple/artifact/maven-metadata.xml diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0-sources.jar b/compat/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0-sources.jar similarity index 100% rename from maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0-sources.jar rename to compat/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0-sources.jar diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.jar b/compat/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.jar similarity index 100% rename from maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.jar rename to compat/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.jar diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.pom b/compat/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.pom similarity index 100% rename from maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.pom rename to compat/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.pom diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/maven-metadata.xml b/compat/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/maven-metadata.xml similarity index 100% rename from maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/maven-metadata.xml rename to compat/maven-resolver-provider/src/test/resources/repo/ut/simple/dependency/maven-metadata.xml diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/parent/1.0/parent-1.0.pom b/compat/maven-resolver-provider/src/test/resources/repo/ut/simple/parent/1.0/parent-1.0.pom similarity index 100% rename from maven-resolver-provider/src/test/resources/repo/ut/simple/parent/1.0/parent-1.0.pom rename to compat/maven-resolver-provider/src/test/resources/repo/ut/simple/parent/1.0/parent-1.0.pom diff --git a/maven-resolver-provider/src/test/resources/repo/ut/simple/parent/maven-metadata.xml b/compat/maven-resolver-provider/src/test/resources/repo/ut/simple/parent/maven-metadata.xml similarity index 100% rename from maven-resolver-provider/src/test/resources/repo/ut/simple/parent/maven-metadata.xml rename to compat/maven-resolver-provider/src/test/resources/repo/ut/simple/parent/maven-metadata.xml diff --git a/maven-settings-builder/pom.xml b/compat/maven-settings-builder/pom.xml similarity index 98% rename from maven-settings-builder/pom.xml rename to compat/maven-settings-builder/pom.xml index 366ff4a80f..e774e6b922 100644 --- a/maven-settings-builder/pom.xml +++ b/compat/maven-settings-builder/pom.xml @@ -24,6 +24,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-settings-builder @@ -48,7 +50,7 @@ under the License. org.apache.maven - maven-api-impl + maven-impl org.apache.maven diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactory.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingRequest.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblemCollector.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuilder.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingException.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingRequest.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblemCollector.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/MavenSecDispatcher.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/MavenSecDispatcher.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/MavenSecDispatcher.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/MavenSecDispatcher.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecrypter.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsParseException.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsReader.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsReader.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsReader.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsReader.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsWriter.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsWriter.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsWriter.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/io/SettingsWriter.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java similarity index 100% rename from maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java rename to compat/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/SettingsValidator.java diff --git a/maven-model-builder/src/site/site.xml b/compat/maven-settings-builder/src/site/site.xml similarity index 100% rename from maven-model-builder/src/site/site.xml rename to compat/maven-settings-builder/src/site/site.xml diff --git a/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java b/compat/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java similarity index 100% rename from maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java rename to compat/maven-settings-builder/src/test/java/org/apache/maven/settings/building/DefaultSettingsBuilderFactoryTest.java diff --git a/maven-settings-builder/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java b/compat/maven-settings-builder/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java similarity index 100% rename from maven-settings-builder/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java rename to compat/maven-settings-builder/src/test/java/org/apache/maven/settings/validation/DefaultSettingsValidatorTest.java diff --git a/maven-settings-builder/src/test/resources/settings/factory/simple.xml b/compat/maven-settings-builder/src/test/resources/settings/factory/simple.xml similarity index 100% rename from maven-settings-builder/src/test/resources/settings/factory/simple.xml rename to compat/maven-settings-builder/src/test/resources/settings/factory/simple.xml diff --git a/maven-settings/pom.xml b/compat/maven-settings/pom.xml similarity index 95% rename from maven-settings/pom.xml rename to compat/maven-settings/pom.xml index b57725c381..2fb5d70a64 100644 --- a/maven-settings/pom.xml +++ b/compat/maven-settings/pom.xml @@ -24,6 +24,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-settings @@ -46,7 +48,7 @@ under the License. org.apache.maven - maven-xml-impl + maven-xml org.codehaus.plexus @@ -69,8 +71,8 @@ under the License. modello-maven-plugin 2.0.0 - ${project.basedir}/../api/maven-api-settings - ${project.basedir}/../src/mdo + ${project.basedir}/../../api/maven-api-settings + ${project.basedir}/../../src/mdo src/main/mdo/settings.mdo diff --git a/maven-settings/src/main/java/org/apache/maven/settings/BaseObject.java b/compat/maven-settings/src/main/java/org/apache/maven/settings/BaseObject.java similarity index 100% rename from maven-settings/src/main/java/org/apache/maven/settings/BaseObject.java rename to compat/maven-settings/src/main/java/org/apache/maven/settings/BaseObject.java diff --git a/maven-settings/src/main/java/org/apache/maven/settings/io/xpp3/SettingsXpp3Reader.java b/compat/maven-settings/src/main/java/org/apache/maven/settings/io/xpp3/SettingsXpp3Reader.java similarity index 100% rename from maven-settings/src/main/java/org/apache/maven/settings/io/xpp3/SettingsXpp3Reader.java rename to compat/maven-settings/src/main/java/org/apache/maven/settings/io/xpp3/SettingsXpp3Reader.java diff --git a/maven-settings/src/main/java/org/apache/maven/settings/io/xpp3/SettingsXpp3Writer.java b/compat/maven-settings/src/main/java/org/apache/maven/settings/io/xpp3/SettingsXpp3Writer.java similarity index 100% rename from maven-settings/src/main/java/org/apache/maven/settings/io/xpp3/SettingsXpp3Writer.java rename to compat/maven-settings/src/main/java/org/apache/maven/settings/io/xpp3/SettingsXpp3Writer.java diff --git a/maven-settings/src/site/apt/index.apt b/compat/maven-settings/src/site/apt/index.apt similarity index 100% rename from maven-settings/src/site/apt/index.apt rename to compat/maven-settings/src/site/apt/index.apt diff --git a/maven-model/src/site/site.xml b/compat/maven-settings/src/site/site.xml similarity index 100% rename from maven-model/src/site/site.xml rename to compat/maven-settings/src/site/site.xml diff --git a/maven-toolchain-builder/pom.xml b/compat/maven-toolchain-builder/pom.xml similarity index 98% rename from maven-toolchain-builder/pom.xml rename to compat/maven-toolchain-builder/pom.xml index f29ae292d4..4e73f3ebef 100644 --- a/maven-toolchain-builder/pom.xml +++ b/compat/maven-toolchain-builder/pom.xml @@ -23,6 +23,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-toolchain-builder @@ -41,7 +43,7 @@ under the License. org.apache.maven - maven-api-impl + maven-impl org.apache.maven diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java b/compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java similarity index 100% rename from maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java rename to compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java b/compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java similarity index 100% rename from maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java rename to compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java b/compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java similarity index 100% rename from maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java rename to compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuilder.java b/compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuilder.java similarity index 100% rename from maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuilder.java rename to compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuilder.java diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java b/compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java similarity index 100% rename from maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java rename to compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingRequest.java b/compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingRequest.java similarity index 100% rename from maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingRequest.java rename to compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingRequest.java diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java b/compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java similarity index 100% rename from maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java rename to compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java b/compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java similarity index 100% rename from maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java rename to compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java b/compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java similarity index 100% rename from maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java rename to compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java b/compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java similarity index 100% rename from maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java rename to compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java b/compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java similarity index 100% rename from maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java rename to compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java b/compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java similarity index 100% rename from maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java rename to compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java b/compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java similarity index 100% rename from maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java rename to compat/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java diff --git a/maven-toolchain-builder/src/site/site.xml b/compat/maven-toolchain-builder/src/site/site.xml similarity index 100% rename from maven-toolchain-builder/src/site/site.xml rename to compat/maven-toolchain-builder/src/site/site.xml diff --git a/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java b/compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java similarity index 100% rename from maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java rename to compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java diff --git a/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java b/compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java similarity index 100% rename from maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java rename to compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java diff --git a/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java b/compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java similarity index 100% rename from maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java rename to compat/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java diff --git a/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/global.xml b/compat/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/global.xml similarity index 100% rename from maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/global.xml rename to compat/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/global.xml diff --git a/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks-extend.xml b/compat/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks-extend.xml similarity index 100% rename from maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks-extend.xml rename to compat/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks-extend.xml diff --git a/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks-extra.xml b/compat/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks-extra.xml similarity index 100% rename from maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks-extra.xml rename to compat/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks-extra.xml diff --git a/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks.xml b/compat/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks.xml similarity index 100% rename from maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks.xml rename to compat/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/merge/toolchains-jdks.xml diff --git a/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/user.xml b/compat/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/user.xml similarity index 100% rename from maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/user.xml rename to compat/maven-toolchain-builder/src/test/resources/org/apache/maven/toolchain/user.xml diff --git a/maven-toolchain-model/pom.xml b/compat/maven-toolchain-model/pom.xml similarity index 95% rename from maven-toolchain-model/pom.xml rename to compat/maven-toolchain-model/pom.xml index 4029f7a2ec..ab3923ecf4 100644 --- a/maven-toolchain-model/pom.xml +++ b/compat/maven-toolchain-model/pom.xml @@ -23,6 +23,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-toolchain-model @@ -56,8 +58,8 @@ under the License. modello-maven-plugin 1.1.0 - ${project.basedir}/../api/maven-api-toolchain - ${project.basedir}/../src/mdo + ${project.basedir}/../../api/maven-api-toolchain + ${project.basedir}/../../src/mdo src/main/mdo/toolchains.mdo diff --git a/maven-toolchain-model/src/main/java/org/apache/maven/toolchain/model/BaseObject.java b/compat/maven-toolchain-model/src/main/java/org/apache/maven/toolchain/model/BaseObject.java similarity index 100% rename from maven-toolchain-model/src/main/java/org/apache/maven/toolchain/model/BaseObject.java rename to compat/maven-toolchain-model/src/main/java/org/apache/maven/toolchain/model/BaseObject.java diff --git a/maven-toolchain-model/src/site/apt/index.apt b/compat/maven-toolchain-model/src/site/apt/index.apt similarity index 100% rename from maven-toolchain-model/src/site/apt/index.apt rename to compat/maven-toolchain-model/src/site/apt/index.apt diff --git a/maven-toolchain-model/src/site/site.xml b/compat/maven-toolchain-model/src/site/site.xml similarity index 100% rename from maven-toolchain-model/src/site/site.xml rename to compat/maven-toolchain-model/src/site/site.xml diff --git a/compat/pom.xml b/compat/pom.xml new file mode 100644 index 0000000000..3eaef06fab --- /dev/null +++ b/compat/pom.xml @@ -0,0 +1,48 @@ + + + + 4.0.0 + + org.apache.maven + maven + 4.0.0-beta-6-SNAPSHOT + + + maven-compat-modules + pom + + Maven Compatibility Modules + + + maven-plugin-api + maven-builder-support + maven-model + maven-model-builder + maven-settings + maven-settings-builder + maven-artifact + maven-resolver-provider + maven-repository-metadata + maven-embedder + maven-compat + maven-toolchain-model + maven-toolchain-builder + + diff --git a/maven-cli/pom.xml b/impl/maven-cli/pom.xml similarity index 98% rename from maven-cli/pom.xml rename to impl/maven-cli/pom.xml index 90a3a214fa..a7421242f9 100644 --- a/maven-cli/pom.xml +++ b/impl/maven-cli/pom.xml @@ -24,6 +24,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-cli diff --git a/maven-cli/src/main/java/org/apache/maven/cling/ClingSupport.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/ClingSupport.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/ClingSupport.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/ClingSupport.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/MavenCling.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/MavenCling.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/MavenCling.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/MavenCling.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/MavenEncCling.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/MavenEncCling.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/MavenEncCling.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/MavenEncCling.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/BaseInvokerRequest.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/BaseInvokerRequest.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/BaseInvokerRequest.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/BaseInvokerRequest.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/BaseParser.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/BaseParser.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/BaseParser.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/BaseParser.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/CommonsCliOptions.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CommonsCliOptions.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/CommonsCliOptions.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CommonsCliOptions.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/ContainerCapsule.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/ContainerCapsule.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/ContainerCapsule.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/ContainerCapsule.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/ContainerCapsuleFactory.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/ContainerCapsuleFactory.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/ContainerCapsuleFactory.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/ContainerCapsuleFactory.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/LayeredOptions.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LayeredOptions.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/LayeredOptions.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LayeredOptions.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/PlexusContainerCapsule.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/PlexusContainerCapsule.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/PlexusContainerCapsule.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/PlexusContainerCapsule.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/PlexusContainerCapsuleFactory.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/PlexusContainerCapsuleFactory.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/PlexusContainerCapsuleFactory.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/PlexusContainerCapsuleFactory.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/ProtoLogger.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/ProtoLogger.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/ProtoLogger.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/ProtoLogger.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/ProtoLookup.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/ProtoLookup.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/ProtoLookup.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/ProtoLookup.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/Utils.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/Utils.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/Utils.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/Utils.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/BaseMavenParser.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/BaseMavenParser.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/BaseMavenParser.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/BaseMavenParser.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/CommonsCliMavenOptions.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/CommonsCliMavenOptions.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/CommonsCliMavenOptions.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/CommonsCliMavenOptions.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenInvoker.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenInvoker.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenInvoker.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenInvoker.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenInvokerRequest.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenInvokerRequest.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenInvokerRequest.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenInvokerRequest.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenParser.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenParser.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenParser.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/DefaultMavenParser.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/LayeredMavenOptions.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/LayeredMavenOptions.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/LayeredMavenOptions.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/LayeredMavenOptions.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/ProtoSession.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/ProtoSession.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/ProtoSession.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/ProtoSession.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/RepositorySystemSupplier.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/RepositorySystemSupplier.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/RepositorySystemSupplier.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/RepositorySystemSupplier.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvoker.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvoker.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvoker.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvoker.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvokerRequest.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvokerRequest.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvokerRequest.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvokerRequest.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenParser.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenParser.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenParser.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenParser.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/local/DefaultLocalMavenInvoker.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/local/DefaultLocalMavenInvoker.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/local/DefaultLocalMavenInvoker.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/local/DefaultLocalMavenInvoker.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/resident/DefaultResidentMavenInvoker.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/resident/DefaultResidentMavenInvoker.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/resident/DefaultResidentMavenInvoker.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/resident/DefaultResidentMavenInvoker.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/CommonsCliEncryptOptions.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/CommonsCliEncryptOptions.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/CommonsCliEncryptOptions.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/CommonsCliEncryptOptions.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/ConsolePasswordPrompt.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/ConsolePasswordPrompt.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/ConsolePasswordPrompt.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/ConsolePasswordPrompt.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptInvoker.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptInvoker.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptInvoker.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptInvoker.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptInvokerRequest.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptInvokerRequest.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptInvokerRequest.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptInvokerRequest.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptParser.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptParser.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptParser.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/DefaultEncryptParser.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/Goal.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/Goal.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/Goal.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/Goal.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/ConfiguredGoalSupport.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/ConfiguredGoalSupport.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/ConfiguredGoalSupport.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/ConfiguredGoalSupport.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Decrypt.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Decrypt.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Decrypt.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Decrypt.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Diag.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Diag.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Diag.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Diag.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Encrypt.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Encrypt.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Encrypt.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Encrypt.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/GoalSupport.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/GoalSupport.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/GoalSupport.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/GoalSupport.java diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Init.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Init.java similarity index 100% rename from maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Init.java rename to impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/goals/Init.java diff --git a/maven-cli/src/site/site.xml b/impl/maven-cli/src/site/site.xml similarity index 100% rename from maven-cli/src/site/site.xml rename to impl/maven-cli/src/site/site.xml diff --git a/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MavenInvokerTestSupport.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MavenInvokerTestSupport.java similarity index 100% rename from maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MavenInvokerTestSupport.java rename to impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/MavenInvokerTestSupport.java diff --git a/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvokerTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvokerTest.java similarity index 100% rename from maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvokerTest.java rename to impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/forked/DefaultForkedMavenInvokerTest.java diff --git a/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/local/DefaultLocalMavenInvokerTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/local/DefaultLocalMavenInvokerTest.java similarity index 100% rename from maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/local/DefaultLocalMavenInvokerTest.java rename to impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/local/DefaultLocalMavenInvokerTest.java diff --git a/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/resident/DefaultResidentMavenInvokerTest.java b/impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/resident/DefaultResidentMavenInvokerTest.java similarity index 100% rename from maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/resident/DefaultResidentMavenInvokerTest.java rename to impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvn/resident/DefaultResidentMavenInvokerTest.java diff --git a/maven-core/lifecycle-executor.txt b/impl/maven-core/lifecycle-executor.txt similarity index 100% rename from maven-core/lifecycle-executor.txt rename to impl/maven-core/lifecycle-executor.txt diff --git a/maven-core/plugin-manager.txt b/impl/maven-core/plugin-manager.txt similarity index 100% rename from maven-core/plugin-manager.txt rename to impl/maven-core/plugin-manager.txt diff --git a/maven-core/pom.xml b/impl/maven-core/pom.xml similarity index 99% rename from maven-core/pom.xml rename to impl/maven-core/pom.xml index dacb00f865..97d9ed7bb8 100644 --- a/maven-core/pom.xml +++ b/impl/maven-core/pom.xml @@ -24,6 +24,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-core @@ -85,7 +87,7 @@ under the License. org.apache.maven - maven-api-impl + maven-impl org.apache.maven diff --git a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java b/impl/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java rename to impl/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java diff --git a/maven-core/src/main/java/org/apache/maven/BuildAbort.java b/impl/maven-core/src/main/java/org/apache/maven/BuildAbort.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/BuildAbort.java rename to impl/maven-core/src/main/java/org/apache/maven/BuildAbort.java diff --git a/maven-core/src/main/java/org/apache/maven/BuildFailureException.java b/impl/maven-core/src/main/java/org/apache/maven/BuildFailureException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/BuildFailureException.java rename to impl/maven-core/src/main/java/org/apache/maven/BuildFailureException.java diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/impl/maven-core/src/main/java/org/apache/maven/DefaultMaven.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/DefaultMaven.java rename to impl/maven-core/src/main/java/org/apache/maven/DefaultMaven.java diff --git a/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java b/impl/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java rename to impl/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java diff --git a/maven-core/src/main/java/org/apache/maven/InternalErrorException.java b/impl/maven-core/src/main/java/org/apache/maven/InternalErrorException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/InternalErrorException.java rename to impl/maven-core/src/main/java/org/apache/maven/InternalErrorException.java diff --git a/maven-core/src/main/java/org/apache/maven/Maven.java b/impl/maven-core/src/main/java/org/apache/maven/Maven.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/Maven.java rename to impl/maven-core/src/main/java/org/apache/maven/Maven.java diff --git a/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java b/impl/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/MavenExecutionException.java rename to impl/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java diff --git a/maven-core/src/main/java/org/apache/maven/MissingProfilesException.java b/impl/maven-core/src/main/java/org/apache/maven/MissingProfilesException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/MissingProfilesException.java rename to impl/maven-core/src/main/java/org/apache/maven/MissingProfilesException.java diff --git a/maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java b/impl/maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java rename to impl/maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java diff --git a/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java b/impl/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/ProjectCycleException.java rename to impl/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/impl/maven-core/src/main/java/org/apache/maven/ReactorReader.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/ReactorReader.java rename to impl/maven-core/src/main/java/org/apache/maven/ReactorReader.java diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/impl/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/RepositoryUtils.java rename to impl/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java diff --git a/maven-core/src/main/java/org/apache/maven/SessionScoped.java b/impl/maven-core/src/main/java/org/apache/maven/SessionScoped.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/SessionScoped.java rename to impl/maven-core/src/main/java/org/apache/maven/SessionScoped.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/factory/DefaultArtifactFactory.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/LegacyArtifactHandlerManager.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/LegacyArtifactHandlerManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/handler/manager/LegacyArtifactHandlerManager.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/LegacyArtifactHandlerManager.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AbstractScopeArtifactFilter.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AbstractScopeArtifactFilter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AbstractScopeArtifactFilter.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AbstractScopeArtifactFilter.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilter.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java b/impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java rename to impl/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java diff --git a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java b/impl/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java rename to impl/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java b/impl/maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java rename to impl/maven-core/src/main/java/org/apache/maven/classrealm/ArtifactClassRealmConstituent.java diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java b/impl/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java rename to impl/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmConstituent.java diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java b/impl/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java rename to impl/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java b/impl/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java rename to impl/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java b/impl/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/impl/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java rename to impl/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmRequest.java b/impl/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java b/impl/maven-core/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java rename to impl/maven-core/src/main/java/org/apache/maven/configuration/BasedirBeanConfigurationPathTranslator.java diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java b/impl/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java rename to impl/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationException.java diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java b/impl/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java rename to impl/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationPathTranslator.java diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java b/impl/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java b/impl/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java rename to impl/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurationValuePreprocessor.java diff --git a/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurator.java b/impl/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurator.java rename to impl/maven-core/src/main/java/org/apache/maven/configuration/BeanConfigurator.java diff --git a/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java b/impl/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/configuration/DefaultBeanConfigurationRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java b/impl/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java rename to impl/maven-core/src/main/java/org/apache/maven/configuration/internal/DefaultBeanConfigurator.java diff --git a/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedComponentConfigurator.java b/impl/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedComponentConfigurator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedComponentConfigurator.java rename to impl/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedComponentConfigurator.java diff --git a/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConfigurationConverter.java b/impl/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConfigurationConverter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConfigurationConverter.java rename to impl/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConfigurationConverter.java diff --git a/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConverterLookup.java b/impl/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConverterLookup.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConverterLookup.java rename to impl/maven-core/src/main/java/org/apache/maven/configuration/internal/EnhancedConverterLookup.java diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/AbstractEventSpy.java b/impl/maven-core/src/main/java/org/apache/maven/eventspy/AbstractEventSpy.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/eventspy/AbstractEventSpy.java rename to impl/maven-core/src/main/java/org/apache/maven/eventspy/AbstractEventSpy.java diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java b/impl/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java rename to impl/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java b/impl/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java rename to impl/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyDispatcher.java diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java b/impl/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java rename to impl/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyExecutionListener.java diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java b/impl/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java rename to impl/maven-core/src/main/java/org/apache/maven/eventspy/internal/EventSpyRepositoryListener.java diff --git a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java b/impl/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java rename to impl/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java diff --git a/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java b/impl/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java rename to impl/maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java diff --git a/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java b/impl/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java rename to impl/maven-core/src/main/java/org/apache/maven/exception/ExceptionSummary.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/AbstractExecutionListener.java b/impl/maven-core/src/main/java/org/apache/maven/execution/AbstractExecutionListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/AbstractExecutionListener.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/AbstractExecutionListener.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/ActivationSettings.java b/impl/maven-core/src/main/java/org/apache/maven/execution/ActivationSettings.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/ActivationSettings.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/ActivationSettings.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildFailure.java b/impl/maven-core/src/main/java/org/apache/maven/execution/BuildFailure.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/BuildFailure.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/BuildFailure.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionAnalyzer.java b/impl/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionAnalyzer.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/BuildResumptionAnalyzer.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionAnalyzer.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionData.java b/impl/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionData.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/BuildResumptionData.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionData.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java b/impl/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionDataRepository.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionPersistenceException.java b/impl/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionPersistenceException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/BuildResumptionPersistenceException.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/BuildResumptionPersistenceException.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildSuccess.java b/impl/maven-core/src/main/java/org/apache/maven/execution/BuildSuccess.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/BuildSuccess.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/BuildSuccess.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java b/impl/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/BuildSummary.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java b/impl/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzer.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java b/impl/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/DefaultBuildResumptionDataRepository.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/impl/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java b/impl/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java b/impl/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java b/impl/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/ExecutionEvent.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/ExecutionListener.java b/impl/maven-core/src/main/java/org/apache/maven/execution/ExecutionListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/ExecutionListener.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/ExecutionListener.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/impl/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulationException.java b/impl/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulationException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulationException.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulationException.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java b/impl/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequestPopulator.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java b/impl/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/impl/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/MavenSession.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java b/impl/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionEvent.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java b/impl/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/MojoExecutionListener.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java b/impl/maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java b/impl/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java b/impl/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java b/impl/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionEvent.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java b/impl/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/ProjectExecutionListener.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java b/impl/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java b/impl/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/scope/MojoExecutionScoped.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java b/impl/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/scope/WeakMojoExecutionListener.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java b/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScope.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java b/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeCoreModule.java diff --git a/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java b/impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java rename to impl/maven-core/src/main/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeModule.java diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java b/impl/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java rename to impl/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExports.java diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java b/impl/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java rename to impl/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java diff --git a/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java b/impl/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java rename to impl/maven-core/src/main/java/org/apache/maven/extension/internal/CoreExtensionEntry.java diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java rename to impl/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java b/impl/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java rename to impl/maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java diff --git a/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java b/impl/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java rename to impl/maven-core/src/main/java/org/apache/maven/graph/FilteredProjectDependencyGraph.java diff --git a/maven-core/src/main/java/org/apache/maven/graph/GraphBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/graph/GraphBuilder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/graph/GraphBuilder.java rename to impl/maven-core/src/main/java/org/apache/maven/graph/GraphBuilder.java diff --git a/maven-core/src/main/java/org/apache/maven/graph/ProjectSelector.java b/impl/maven-core/src/main/java/org/apache/maven/graph/ProjectSelector.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/graph/ProjectSelector.java rename to impl/maven-core/src/main/java/org/apache/maven/graph/ProjectSelector.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/CoreRealm.java b/impl/maven-core/src/main/java/org/apache/maven/internal/CoreRealm.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/CoreRealm.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/CoreRealm.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/MultilineMessageHelper.java b/impl/maven-core/src/main/java/org/apache/maven/internal/MultilineMessageHelper.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/MultilineMessageHelper.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/MultilineMessageHelper.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/LegacyRepositorySystemSessionExtender.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/LegacyRepositorySystemSessionExtender.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/aether/LegacyRepositorySystemSessionExtender.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/aether/LegacyRepositorySystemSessionExtender.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/aether/LoggingRepositoryListener.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/MavenDeployer.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/MavenDeployer.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/aether/MavenDeployer.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/aether/MavenDeployer.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/MavenExecutionRequestExtender.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/MavenExecutionRequestExtender.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/aether/MavenExecutionRequestExtender.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/aether/MavenExecutionRequestExtender.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/MavenInstaller.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/MavenInstaller.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/aether/MavenInstaller.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/aether/MavenInstaller.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/PropertyContributorExtender.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/PropertyContributorExtender.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/aether/PropertyContributorExtender.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/aether/PropertyContributorExtender.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/RepositorySystemSessionExtender.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/RepositorySystemSessionExtender.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/aether/RepositorySystemSessionExtender.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/aether/RepositorySystemSessionExtender.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/aether/ResolverLifecycle.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListener.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java b/impl/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultArtifactManager.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultEvent.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultEvent.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultEvent.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultEvent.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLog.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLog.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLog.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLog.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLookup.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLookup.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLookup.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLookup.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMojoExecution.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMojoExecution.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMojoExecution.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMojoExecution.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPackagingRegistry.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPackagingRegistry.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPackagingRegistry.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPackagingRegistry.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPluginXmlFactory.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPluginXmlFactory.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPluginXmlFactory.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPluginXmlFactory.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProject.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectBuilder.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultProjectManager.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPrompter.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPrompter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPrompter.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultPrompter.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSessionFactory.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSessionFactory.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSessionFactory.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSessionFactory.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainManager.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainManager.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainManager.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/EventSpyImpl.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/EventSpyImpl.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/EventSpyImpl.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/EventSpyImpl.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/Graph.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/Graph.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/Graph.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/Graph.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/InternalMavenSession.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/InternalMavenSession.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/InternalMavenSession.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/InternalMavenSession.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/Lifecycles.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/Lifecycles.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/Lifecycles.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/Lifecycles.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/SisuDiBridgeModule.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/SisuDiBridgeModule.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/SisuDiBridgeModule.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/SisuDiBridgeModule.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/internal/DefaultCoreRealm.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/internal/DefaultCoreRealm.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/impl/internal/DefaultCoreRealm.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/impl/internal/DefaultCoreRealm.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/transformation/ConsumerPomArtifactTransformer.java b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/ConsumerPomArtifactTransformer.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/transformation/ConsumerPomArtifactTransformer.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/transformation/ConsumerPomArtifactTransformer.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/transformation/TransformationFailedException.java b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/TransformationFailedException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/transformation/TransformationFailedException.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/transformation/TransformationFailedException.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilder.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilder.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomArtifactTransformer.java b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomArtifactTransformer.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomArtifactTransformer.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomArtifactTransformer.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifact.java b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifact.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifact.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifact.java diff --git a/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifactHandler.java b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifactHandler.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifactHandler.java rename to impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/TransformedArtifactHandler.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifeCyclePluginAnalyzer.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/Lifecycle.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleMappingDelegate.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleNotFoundException.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/LifecyclePhaseNotFoundException.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/MavenExecutionPlan.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/MojoExecutionConfigurator.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/NoGoalSpecifiedException.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildListCalculator.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildThreadFactory.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildThreadFactory.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildThreadFactory.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuildThreadFactory.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CompoundProjectExecutionListener.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEvent.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultExecutionEventCatapult.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleMappingDelegate.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleStarter.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleStarter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleStarter.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleStarter.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultProjectArtifactFactory.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionEventCatapult.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/GoalTask.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculator.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleStarter.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTask.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculator.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseComparator.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseComparator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseComparator.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseComparator.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseExecutionPoint.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseExecutionPoint.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseExecutionPoint.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseExecutionPoint.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseId.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseId.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseId.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseId.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseRecorder.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseRecorder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseRecorder.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseRecorder.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectArtifactFactory.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectBuildList.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectSegment.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorBuildStatus.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ReactorContext.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/SetWithResolutionResult.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/SetWithResolutionResult.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/SetWithResolutionResult.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/SetWithResolutionResult.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/Task.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/Task.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/Task.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/Task.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/TaskSegment.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/Builder.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderCommon.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/BuilderNotFoundException.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/singlethreaded/SingleThreadedBuilder.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlan.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlan.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlan.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlan.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanExecutor.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanLogger.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanLogger.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanLogger.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanLogger.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildStep.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildStep.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildStep.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/BuildStep.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/ConcurrentLifecycleStarter.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/ConcurrentLifecycleStarter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/ConcurrentLifecycleStarter.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/ConcurrentLifecycleStarter.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/MojoExecutor.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/MojoExecutor.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/MojoExecutor.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/MojoExecutor.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/PluginLifecycle.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/PluginLifecycle.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/PluginLifecycle.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/concurrent/PluginLifecycle.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/Lifecycle.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMojo.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/AbstractLifecycleProvider.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/AbstractLifecycleProvider.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/providers/AbstractLifecycleProvider.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/AbstractLifecycleProvider.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/BomLifecycleMappingProvider.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/BomLifecycleMappingProvider.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/BomLifecycleMappingProvider.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/BomLifecycleMappingProvider.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/EarLifecycleMappingProvider.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/EarLifecycleMappingProvider.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/EarLifecycleMappingProvider.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/EarLifecycleMappingProvider.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/EjbLifecycleMappingProvider.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/EjbLifecycleMappingProvider.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/EjbLifecycleMappingProvider.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/EjbLifecycleMappingProvider.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/JarLifecycleMappingProvider.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/JarLifecycleMappingProvider.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/JarLifecycleMappingProvider.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/JarLifecycleMappingProvider.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/MavenPluginLifecycleMappingProvider.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/MavenPluginLifecycleMappingProvider.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/MavenPluginLifecycleMappingProvider.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/MavenPluginLifecycleMappingProvider.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/PomLifecycleMappingProvider.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/PomLifecycleMappingProvider.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/PomLifecycleMappingProvider.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/PomLifecycleMappingProvider.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/RarLifecycleMappingProvider.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/RarLifecycleMappingProvider.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/RarLifecycleMappingProvider.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/RarLifecycleMappingProvider.java diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/WarLifecycleMappingProvider.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/WarLifecycleMappingProvider.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/WarLifecycleMappingProvider.java rename to impl/maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/WarLifecycleMappingProvider.java diff --git a/maven-core/src/main/java/org/apache/maven/logging/BuildEventListener.java b/impl/maven-core/src/main/java/org/apache/maven/logging/BuildEventListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/logging/BuildEventListener.java rename to impl/maven-core/src/main/java/org/apache/maven/logging/BuildEventListener.java diff --git a/maven-core/src/main/java/org/apache/maven/logging/LoggingExecutionListener.java b/impl/maven-core/src/main/java/org/apache/maven/logging/LoggingExecutionListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/logging/LoggingExecutionListener.java rename to impl/maven-core/src/main/java/org/apache/maven/logging/LoggingExecutionListener.java diff --git a/maven-core/src/main/java/org/apache/maven/logging/LoggingOutputStream.java b/impl/maven-core/src/main/java/org/apache/maven/logging/LoggingOutputStream.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/logging/LoggingOutputStream.java rename to impl/maven-core/src/main/java/org/apache/maven/logging/LoggingOutputStream.java diff --git a/maven-core/src/main/java/org/apache/maven/logging/MavenTransferListener.java b/impl/maven-core/src/main/java/org/apache/maven/logging/MavenTransferListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/logging/MavenTransferListener.java rename to impl/maven-core/src/main/java/org/apache/maven/logging/MavenTransferListener.java diff --git a/maven-core/src/main/java/org/apache/maven/logging/ProjectBuildLogAppender.java b/impl/maven-core/src/main/java/org/apache/maven/logging/ProjectBuildLogAppender.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/logging/ProjectBuildLogAppender.java rename to impl/maven-core/src/main/java/org/apache/maven/logging/ProjectBuildLogAppender.java diff --git a/maven-core/src/main/java/org/apache/maven/logging/SimpleBuildEventListener.java b/impl/maven-core/src/main/java/org/apache/maven/logging/SimpleBuildEventListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/logging/SimpleBuildEventListener.java rename to impl/maven-core/src/main/java/org/apache/maven/logging/SimpleBuildEventListener.java diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/impl/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java rename to impl/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java diff --git a/maven-core/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java b/impl/maven-core/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java rename to impl/maven-core/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java diff --git a/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java b/impl/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java rename to impl/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/BuildPluginManager.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/BuildPluginManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/BuildPluginManager.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/BuildPluginManager.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/CacheUtils.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/CompoundMojoExecutionListener.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/CycleDetectedInPluginGraphException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/DebugConfigurationListener.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultExtensionRealmCache.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultMojosExecutionStrategy.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultMojosExecutionStrategy.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/DefaultMojosExecutionStrategy.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultMojosExecutionStrategy.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginArtifactsCache.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginDescriptorCache.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/ExtensionRealmCache.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/LegacySupport.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginManager.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginPrerequisitesChecker.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginPrerequisitesChecker.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/MavenPluginPrerequisitesChecker.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginPrerequisitesChecker.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecutionRunner.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/MojoExecutionRunner.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/MojoExecutionRunner.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/MojoExecutionRunner.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/MojosExecutionStrategy.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/MojosExecutionStrategy.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/MojosExecutionStrategy.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/MojosExecutionStrategy.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginArtifactsCache.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginContainerException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginContainerException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginContainerException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginContainerException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorCache.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorParsingException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorParsingException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorParsingException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorParsingException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginIncompatibleException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginIncompatibleException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginIncompatibleException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginIncompatibleException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginNotFoundException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginRealmCache.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginResolutionException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginResolutionException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginResolutionException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginResolutionException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginValidationManager.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/PluginValidationManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/PluginValidationManager.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/PluginValidationManager.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginDependenciesValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginDependenciesValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginDependenciesValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginDependenciesValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginDescriptorSourcedParametersValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginDescriptorSourcedParametersValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginDescriptorSourcedParametersValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginDescriptorSourcedParametersValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginParametersValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginParametersValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginParametersValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginParametersValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedCoreExpressionValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedCoreExpressionValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedCoreExpressionValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedCoreExpressionValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/Maven2DependenciesValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/Maven2DependenciesValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/Maven2DependenciesValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/Maven2DependenciesValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/Maven3CompatDependenciesValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/Maven3CompatDependenciesValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/Maven3CompatDependenciesValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/Maven3CompatDependenciesValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenMixedDependenciesValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenMixedDependenciesValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/MavenMixedDependenciesValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenMixedDependenciesValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginConfigurationValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginConfigurationValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginConfigurationValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginConfigurationValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginDependenciesValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginDependenciesValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginDependenciesValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginDependenciesValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteChecker.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteChecker.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteChecker.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteChecker.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginMavenPrerequisiteChecker.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginMavenPrerequisiteChecker.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginMavenPrerequisiteChecker.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginMavenPrerequisiteChecker.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenScopeDependenciesValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenScopeDependenciesValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/MavenScopeDependenciesValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MavenScopeDependenciesValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusContainerDefaultDependenciesValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusContainerDefaultDependenciesValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusContainerDefaultDependenciesValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusContainerDefaultDependenciesValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginConfigurationModule.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginConfigurationModule.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/PluginConfigurationModule.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginConfigurationModule.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/ReadOnlyPluginParametersValidator.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/ReadOnlyPluginParametersValidator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/ReadOnlyPluginParametersValidator.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/ReadOnlyPluginParametersValidator.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/internal/ValidatingConfigurationListener.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/DefaultPluginPrefixRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/NoPluginFoundForPrefixException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResolver.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResolver.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/prefix/internal/DefaultPluginPrefixResult.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolver.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResult.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java rename to impl/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResult.java diff --git a/maven-core/src/main/java/org/apache/maven/project/CycleDetectedException.java b/impl/maven-core/src/main/java/org/apache/maven/project/CycleDetectedException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/CycleDetectedException.java rename to impl/maven-core/src/main/java/org/apache/maven/project/CycleDetectedException.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionRequest.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DefaultDependencyResolutionResult.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingResult.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectRealmCache.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionException.java b/impl/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DependencyResolutionException.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionException.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java b/impl/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java b/impl/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DependencyResolutionResult.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java b/impl/maven-core/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java diff --git a/maven-core/src/main/java/org/apache/maven/project/DuplicateProjectException.java b/impl/maven-core/src/main/java/org/apache/maven/project/DuplicateProjectException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DuplicateProjectException.java rename to impl/maven-core/src/main/java/org/apache/maven/project/DuplicateProjectException.java diff --git a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java b/impl/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java rename to impl/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptor.java diff --git a/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java rename to impl/maven-core/src/main/java/org/apache/maven/project/ExtensionDescriptorBuilder.java diff --git a/maven-core/src/main/java/org/apache/maven/project/Graph.java b/impl/maven-core/src/main/java/org/apache/maven/project/Graph.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/Graph.java rename to impl/maven-core/src/main/java/org/apache/maven/project/Graph.java diff --git a/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java b/impl/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java rename to impl/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/MavenProject.java rename to impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java b/impl/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java rename to impl/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java rename to impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuilder.java diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java rename to impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java rename to impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java rename to impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java rename to impl/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingResult.java diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java rename to impl/maven-core/src/main/java/org/apache/maven/project/ProjectDependenciesResolver.java diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java rename to impl/maven-core/src/main/java/org/apache/maven/project/ProjectModelResolver.java diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java rename to impl/maven-core/src/main/java/org/apache/maven/project/ProjectRealmCache.java diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java b/impl/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java rename to impl/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java diff --git a/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java b/impl/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java rename to impl/maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java diff --git a/maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java b/impl/maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java rename to impl/maven-core/src/main/java/org/apache/maven/project/RepositorySessionDecorator.java diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java b/impl/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java rename to impl/maven-core/src/main/java/org/apache/maven/project/artifact/ArtifactWithDependencies.java diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java b/impl/maven-core/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java rename to impl/maven-core/src/main/java/org/apache/maven/project/artifact/AttachedArtifact.java diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java b/impl/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java rename to impl/maven-core/src/main/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCache.java diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java b/impl/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java rename to impl/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java b/impl/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java rename to impl/maven-core/src/main/java/org/apache/maven/project/artifact/PluginArtifact.java diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java b/impl/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java rename to impl/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifact.java diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java b/impl/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java rename to impl/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactsCache.java diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java b/impl/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java rename to impl/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java b/impl/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java rename to impl/maven-core/src/main/java/org/apache/maven/project/collector/MultiModuleCollectionStrategy.java diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java b/impl/maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java rename to impl/maven-core/src/main/java/org/apache/maven/project/collector/PomlessCollectionStrategy.java diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/ProjectCollectionStrategy.java b/impl/maven-core/src/main/java/org/apache/maven/project/collector/ProjectCollectionStrategy.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/collector/ProjectCollectionStrategy.java rename to impl/maven-core/src/main/java/org/apache/maven/project/collector/ProjectCollectionStrategy.java diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/ProjectsSelector.java b/impl/maven-core/src/main/java/org/apache/maven/project/collector/ProjectsSelector.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/collector/ProjectsSelector.java rename to impl/maven-core/src/main/java/org/apache/maven/project/collector/ProjectsSelector.java diff --git a/maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java b/impl/maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java rename to impl/maven-core/src/main/java/org/apache/maven/project/collector/RequestPomCollectionStrategy.java diff --git a/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java b/impl/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java rename to impl/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java diff --git a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java b/impl/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java rename to impl/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java diff --git a/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java b/impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java rename to impl/maven-core/src/main/java/org/apache/maven/resolver/MavenChainedWorkspaceReader.java diff --git a/maven-core/src/main/java/org/apache/maven/resolver/RepositorySystemSessionFactory.java b/impl/maven-core/src/main/java/org/apache/maven/resolver/RepositorySystemSessionFactory.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/resolver/RepositorySystemSessionFactory.java rename to impl/maven-core/src/main/java/org/apache/maven/resolver/RepositorySystemSessionFactory.java diff --git a/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java b/impl/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java rename to impl/maven-core/src/main/java/org/apache/maven/rtinfo/RuntimeInformation.java diff --git a/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java b/impl/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java rename to impl/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java b/impl/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java rename to impl/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScope.java diff --git a/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java b/impl/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java rename to impl/maven-core/src/main/java/org/apache/maven/session/scope/internal/SessionScopeModule.java diff --git a/maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java b/impl/maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java rename to impl/maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java diff --git a/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java b/impl/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java rename to impl/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchain.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java b/impl/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java rename to impl/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java diff --git a/maven-core/src/main/mdo/extension.mdo b/impl/maven-core/src/main/mdo/extension.mdo similarity index 100% rename from maven-core/src/main/mdo/extension.mdo rename to impl/maven-core/src/main/mdo/extension.mdo diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml b/impl/maven-core/src/main/resources/META-INF/maven/extension.xml similarity index 100% rename from maven-core/src/main/resources/META-INF/maven/extension.xml rename to impl/maven-core/src/main/resources/META-INF/maven/extension.xml diff --git a/maven-core/src/main/resources/org/apache/maven/messages/build.properties b/impl/maven-core/src/main/resources/org/apache/maven/messages/build.properties similarity index 100% rename from maven-core/src/main/resources/org/apache/maven/messages/build.properties rename to impl/maven-core/src/main/resources/org/apache/maven/messages/build.properties diff --git a/maven-core/src/main/resources/org/apache/maven/project/standalone.xml b/impl/maven-core/src/main/resources/org/apache/maven/project/standalone.xml similarity index 100% rename from maven-core/src/main/resources/org/apache/maven/project/standalone.xml rename to impl/maven-core/src/main/resources/org/apache/maven/project/standalone.xml diff --git a/maven-core/src/site/apt/artifact-handlers.apt b/impl/maven-core/src/site/apt/artifact-handlers.apt similarity index 100% rename from maven-core/src/site/apt/artifact-handlers.apt rename to impl/maven-core/src/site/apt/artifact-handlers.apt diff --git a/maven-core/src/site/apt/configuration-management.apt b/impl/maven-core/src/site/apt/configuration-management.apt similarity index 100% rename from maven-core/src/site/apt/configuration-management.apt rename to impl/maven-core/src/site/apt/configuration-management.apt diff --git a/maven-core/src/site/apt/core-extensions.apt.vm b/impl/maven-core/src/site/apt/core-extensions.apt.vm similarity index 100% rename from maven-core/src/site/apt/core-extensions.apt.vm rename to impl/maven-core/src/site/apt/core-extensions.apt.vm diff --git a/maven-core/src/site/apt/default-bindings.apt.vm b/impl/maven-core/src/site/apt/default-bindings.apt.vm similarity index 100% rename from maven-core/src/site/apt/default-bindings.apt.vm rename to impl/maven-core/src/site/apt/default-bindings.apt.vm diff --git a/maven-core/src/site/apt/getting-to-container-configured-mojos.apt b/impl/maven-core/src/site/apt/getting-to-container-configured-mojos.apt similarity index 100% rename from maven-core/src/site/apt/getting-to-container-configured-mojos.apt rename to impl/maven-core/src/site/apt/getting-to-container-configured-mojos.apt diff --git a/maven-core/src/site/apt/index.apt b/impl/maven-core/src/site/apt/index.apt similarity index 100% rename from maven-core/src/site/apt/index.apt rename to impl/maven-core/src/site/apt/index.apt diff --git a/maven-core/src/site/apt/inheritance.apt b/impl/maven-core/src/site/apt/inheritance.apt similarity index 100% rename from maven-core/src/site/apt/inheritance.apt rename to impl/maven-core/src/site/apt/inheritance.apt diff --git a/maven-core/src/site/apt/lifecycles.apt.vm b/impl/maven-core/src/site/apt/lifecycles.apt.vm similarity index 100% rename from maven-core/src/site/apt/lifecycles.apt.vm rename to impl/maven-core/src/site/apt/lifecycles.apt.vm diff --git a/maven-core/src/site/apt/offline-mode.apt b/impl/maven-core/src/site/apt/offline-mode.apt similarity index 100% rename from maven-core/src/site/apt/offline-mode.apt rename to impl/maven-core/src/site/apt/offline-mode.apt diff --git a/maven-core/src/site/apt/plugin-execution-isolation.apt b/impl/maven-core/src/site/apt/plugin-execution-isolation.apt similarity index 100% rename from maven-core/src/site/apt/plugin-execution-isolation.apt rename to impl/maven-core/src/site/apt/plugin-execution-isolation.apt diff --git a/maven-core/src/site/resources/design/2.1-lifecycle-refactor-class-diagram.png b/impl/maven-core/src/site/resources/design/2.1-lifecycle-refactor-class-diagram.png similarity index 100% rename from maven-core/src/site/resources/design/2.1-lifecycle-refactor-class-diagram.png rename to impl/maven-core/src/site/resources/design/2.1-lifecycle-refactor-class-diagram.png diff --git a/maven-core/src/site/resources/design/2.1-lifecycle-refactor-sequence-diagram.png b/impl/maven-core/src/site/resources/design/2.1-lifecycle-refactor-sequence-diagram.png similarity index 100% rename from maven-core/src/site/resources/design/2.1-lifecycle-refactor-sequence-diagram.png rename to impl/maven-core/src/site/resources/design/2.1-lifecycle-refactor-sequence-diagram.png diff --git a/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle b/impl/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle similarity index 100% rename from maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle rename to impl/maven-core/src/site/resources/design/2.1-lifecycle-refactor.graffle diff --git a/maven-core/src/site/site.xml b/impl/maven-core/src/site/site.xml similarity index 100% rename from maven-core/src/site/site.xml rename to impl/maven-core/src/site/site.xml diff --git a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java b/impl/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java rename to impl/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java diff --git a/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java b/impl/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java rename to impl/maven-core/src/test/java/org/apache/maven/DefaultMavenTest.java diff --git a/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java b/impl/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java rename to impl/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java diff --git a/maven-core/src/test/java/org/apache/maven/MavenTestHelper.java b/impl/maven-core/src/test/java/org/apache/maven/MavenTestHelper.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/MavenTestHelper.java rename to impl/maven-core/src/test/java/org/apache/maven/MavenTestHelper.java diff --git a/maven-core/src/test/java/org/apache/maven/SimpleLookup.java b/impl/maven-core/src/test/java/org/apache/maven/SimpleLookup.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/SimpleLookup.java rename to impl/maven-core/src/test/java/org/apache/maven/SimpleLookup.java diff --git a/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java b/impl/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java rename to impl/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java diff --git a/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java b/impl/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java rename to impl/maven-core/src/test/java/org/apache/maven/artifact/resolver/filter/ExclusionArtifactFilterTest.java diff --git a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java b/impl/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java rename to impl/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java diff --git a/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorPathTest.java b/impl/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorPathTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorPathTest.java rename to impl/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorPathTest.java diff --git a/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java b/impl/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java rename to impl/maven-core/src/test/java/org/apache/maven/configuration/DefaultBeanConfiguratorTest.java diff --git a/maven-core/src/test/java/org/apache/maven/di/DiTest.java b/impl/maven-core/src/test/java/org/apache/maven/di/DiTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/di/DiTest.java rename to impl/maven-core/src/test/java/org/apache/maven/di/DiTest.java diff --git a/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java b/impl/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java rename to impl/maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java b/impl/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java rename to impl/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionAnalyzerTest.java diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java b/impl/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java rename to impl/maven-core/src/test/java/org/apache/maven/execution/DefaultBuildResumptionDataRepositoryTest.java diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java b/impl/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java rename to impl/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java b/impl/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java rename to impl/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java diff --git a/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java b/impl/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java rename to impl/maven-core/src/test/java/org/apache/maven/execution/scope/internal/MojoExecutionScopeTest.java diff --git a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java rename to impl/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java diff --git a/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java b/impl/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java rename to impl/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java diff --git a/maven-core/src/test/java/org/apache/maven/graph/ProjectSelectorTest.java b/impl/maven-core/src/test/java/org/apache/maven/graph/ProjectSelectorTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/graph/ProjectSelectorTest.java rename to impl/maven-core/src/test/java/org/apache/maven/graph/ProjectSelectorTest.java diff --git a/maven-core/src/test/java/org/apache/maven/internal/MultilineMessageHelperTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/MultilineMessageHelperTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/internal/MultilineMessageHelperTest.java rename to impl/maven-core/src/test/java/org/apache/maven/internal/MultilineMessageHelperTest.java diff --git a/maven-core/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java rename to impl/maven-core/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java diff --git a/maven-core/src/test/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListenerTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListenerTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListenerTest.java rename to impl/maven-core/src/test/java/org/apache/maven/internal/aether/ReverseTreeRepositoryListenerTest.java diff --git a/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmServiceTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmServiceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmServiceTest.java rename to impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmServiceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultProjectManagerTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultProjectManagerTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/internal/impl/DefaultProjectManagerTest.java rename to impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultProjectManagerTest.java diff --git a/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultSessionTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultSessionTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/internal/impl/DefaultSessionTest.java rename to impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultSessionTest.java diff --git a/maven-core/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java rename to impl/maven-core/src/test/java/org/apache/maven/internal/impl/PropertiesAsMapTest.java diff --git a/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java rename to impl/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java diff --git a/maven-core/src/test/java/org/apache/maven/internal/impl/TestArtifactHandler.java b/impl/maven-core/src/test/java/org/apache/maven/internal/impl/TestArtifactHandler.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/internal/impl/TestArtifactHandler.java rename to impl/maven-core/src/test/java/org/apache/maven/internal/impl/TestArtifactHandler.java diff --git a/maven-core/src/test/java/org/apache/maven/internal/transformation/AbstractRepositoryTestCase.java b/impl/maven-core/src/test/java/org/apache/maven/internal/transformation/AbstractRepositoryTestCase.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/internal/transformation/AbstractRepositoryTestCase.java rename to impl/maven-core/src/test/java/org/apache/maven/internal/transformation/AbstractRepositoryTestCase.java diff --git a/maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomArtifactTransformerTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomArtifactTransformerTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomArtifactTransformerTest.java rename to impl/maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomArtifactTransformerTest.java diff --git a/maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilderTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilderTest.java rename to impl/maven-core/src/test/java/org/apache/maven/internal/transformation/impl/ConsumerPomBuilderTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/DefaultLifecyclesTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingMojoExecutionListener.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/DelegatingProjectExecutionListener.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/EmptyLifecyclePluginAnalyzer.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/MavenExecutionPlanTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/MojoExecutionXPathContainer.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/MojoExecutionXPathContainer.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/MojoExecutionXPathContainer.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/MojoExecutionXPathContainer.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/BuildListCalculatorTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrencyDependencyGraphTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolverTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilderTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilderTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilderTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleTaskSegmentCalculatorImplTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseRecorderTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/BuilderCommonTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/BuilderCommonTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/BuilderCommonTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/BuilderCommonTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanCreatorTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanCreatorTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanCreatorTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/concurrent/BuildPlanCreatorTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/BuildPluginManagerStub.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/BuildPluginManagerStub.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/BuildPluginManagerStub.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/BuildPluginManagerStub.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/CompletionServiceStub.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/CompletionServiceStub.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/CompletionServiceStub.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/CompletionServiceStub.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/DefaultLifecyclesStub.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ExecutionEventCatapultStub.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ExecutionEventCatapultStub.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ExecutionEventCatapultStub.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ExecutionEventCatapultStub.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifeCyclePluginAnalyzerStub.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifeCyclePluginAnalyzerStub.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifeCyclePluginAnalyzerStub.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifeCyclePluginAnalyzerStub.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleExecutionPlanCalculatorStub.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LifecycleTaskSegmentCalculatorStub.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/MojoExecutorStub.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/PluginPrefixResolverStub.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/PluginPrefixResolverStub.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/PluginPrefixResolverStub.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/PluginPrefixResolverStub.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/PluginVersionResolverStub.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/PluginVersionResolverStub.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/PluginVersionResolverStub.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/PluginVersionResolverStub.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStub.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStubTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStubTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStubTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependencyGraphStubTest.java diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java b/impl/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java rename to impl/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java diff --git a/maven-core/src/test/java/org/apache/maven/model/ModelBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/model/ModelBuilderTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/model/ModelBuilderTest.java rename to impl/maven-core/src/test/java/org/apache/maven/model/ModelBuilderTest.java diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java rename to impl/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java rename to impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java rename to impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java b/impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java rename to impl/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4Test.java diff --git a/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java b/impl/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java rename to impl/maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java diff --git a/maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteCheckerTest.java b/impl/maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteCheckerTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteCheckerTest.java rename to impl/maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginJavaPrerequisiteCheckerTest.java diff --git a/maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginValidatorTest.java b/impl/maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginValidatorTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginValidatorTest.java rename to impl/maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginValidatorTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/impl/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java rename to impl/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java rename to impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java b/impl/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java rename to impl/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleBindingsInjector.java diff --git a/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java b/impl/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java rename to impl/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java diff --git a/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java b/impl/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java rename to impl/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java diff --git a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java rename to impl/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/GraphTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/GraphTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/GraphTest.java rename to impl/maven-core/src/test/java/org/apache/maven/project/GraphTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java b/impl/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java rename to impl/maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java diff --git a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java rename to impl/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java rename to impl/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java rename to impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithLocationMatcher.java b/impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithLocationMatcher.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithLocationMatcher.java rename to impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithLocationMatcher.java diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithProblemMessageMatcher.java b/impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithProblemMessageMatcher.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithProblemMessageMatcher.java rename to impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithProblemMessageMatcher.java diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java rename to impl/maven-core/src/test/java/org/apache/maven/project/ProjectModelResolverTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java rename to impl/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java rename to impl/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultProjectArtifactsCacheTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java rename to impl/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java b/impl/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java rename to impl/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java b/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java rename to impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java b/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java rename to impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java b/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java rename to impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java b/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java rename to impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java b/impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java rename to impl/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestMavenRepositorySystem.java b/impl/maven-core/src/test/java/org/apache/maven/repository/TestMavenRepositorySystem.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/repository/TestMavenRepositorySystem.java rename to impl/maven-core/src/test/java/org/apache/maven/repository/TestMavenRepositorySystem.java diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java b/impl/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java rename to impl/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnectorFactory.java b/impl/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnectorFactory.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnectorFactory.java rename to impl/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnectorFactory.java diff --git a/maven-core/src/test/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformationTest.java b/impl/maven-core/src/test/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformationTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformationTest.java rename to impl/maven-core/src/test/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformationTest.java diff --git a/maven-core/src/test/java/org/apache/maven/session/scope/SessionScopeProxyTest.java b/impl/maven-core/src/test/java/org/apache/maven/session/scope/SessionScopeProxyTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/session/scope/SessionScopeProxyTest.java rename to impl/maven-core/src/test/java/org/apache/maven/session/scope/SessionScopeProxyTest.java diff --git a/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java b/impl/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java rename to impl/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java diff --git a/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java b/impl/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java rename to impl/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java b/impl/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java rename to impl/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java b/impl/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java rename to impl/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java b/impl/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java rename to impl/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java b/impl/maven-core/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java rename to impl/maven-core/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java diff --git a/maven-core/src/test/projects/default-maven/cyclic-reference/module-a/pom.xml b/impl/maven-core/src/test/projects/default-maven/cyclic-reference/module-a/pom.xml similarity index 100% rename from maven-core/src/test/projects/default-maven/cyclic-reference/module-a/pom.xml rename to impl/maven-core/src/test/projects/default-maven/cyclic-reference/module-a/pom.xml diff --git a/maven-core/src/test/projects/default-maven/cyclic-reference/module-b/pom.xml b/impl/maven-core/src/test/projects/default-maven/cyclic-reference/module-b/pom.xml similarity index 100% rename from maven-core/src/test/projects/default-maven/cyclic-reference/module-b/pom.xml rename to impl/maven-core/src/test/projects/default-maven/cyclic-reference/module-b/pom.xml diff --git a/maven-core/src/test/projects/default-maven/cyclic-reference/pom.xml b/impl/maven-core/src/test/projects/default-maven/cyclic-reference/pom.xml similarity index 100% rename from maven-core/src/test/projects/default-maven/cyclic-reference/pom.xml rename to impl/maven-core/src/test/projects/default-maven/cyclic-reference/pom.xml diff --git a/maven-core/src/test/projects/default-maven/simple/pom.xml b/impl/maven-core/src/test/projects/default-maven/simple/pom.xml similarity index 100% rename from maven-core/src/test/projects/default-maven/simple/pom.xml rename to impl/maven-core/src/test/projects/default-maven/simple/pom.xml diff --git a/maven-core/src/test/projects/lifecycle-dependency-resolver/lib/pom.xml b/impl/maven-core/src/test/projects/lifecycle-dependency-resolver/lib/pom.xml similarity index 100% rename from maven-core/src/test/projects/lifecycle-dependency-resolver/lib/pom.xml rename to impl/maven-core/src/test/projects/lifecycle-dependency-resolver/lib/pom.xml diff --git a/maven-core/src/test/projects/lifecycle-dependency-resolver/pom.xml b/impl/maven-core/src/test/projects/lifecycle-dependency-resolver/pom.xml similarity index 100% rename from maven-core/src/test/projects/lifecycle-dependency-resolver/pom.xml rename to impl/maven-core/src/test/projects/lifecycle-dependency-resolver/pom.xml diff --git a/maven-core/src/test/projects/lifecycle-dependency-resolver/war/pom.xml b/impl/maven-core/src/test/projects/lifecycle-dependency-resolver/war/pom.xml similarity index 100% rename from maven-core/src/test/projects/lifecycle-dependency-resolver/war/pom.xml rename to impl/maven-core/src/test/projects/lifecycle-dependency-resolver/war/pom.xml diff --git a/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml b/impl/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml similarity index 100% rename from maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml rename to impl/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml diff --git a/maven-core/src/test/projects/lifecycle-executor/project-basic/pom.xml b/impl/maven-core/src/test/projects/lifecycle-executor/project-basic/pom.xml similarity index 100% rename from maven-core/src/test/projects/lifecycle-executor/project-basic/pom.xml rename to impl/maven-core/src/test/projects/lifecycle-executor/project-basic/pom.xml diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml b/impl/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml similarity index 100% rename from maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml rename to impl/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java b/impl/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java similarity index 100% rename from maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java rename to impl/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java b/impl/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java similarity index 100% rename from maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java rename to impl/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml b/impl/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml rename to impl/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/pom.xml b/impl/maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/pom.xml similarity index 100% rename from maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/pom.xml rename to impl/maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/pom.xml diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/src/main/mdo/remote-resources.mdo b/impl/maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/src/main/mdo/remote-resources.mdo similarity index 100% rename from maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/src/main/mdo/remote-resources.mdo rename to impl/maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/src/main/mdo/remote-resources.mdo diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/src/main/mdo/supplemental-model.mdo b/impl/maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/src/main/mdo/supplemental-model.mdo similarity index 100% rename from maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/src/main/mdo/supplemental-model.mdo rename to impl/maven-core/src/test/projects/lifecycle-executor/project-with-multiple-executions/src/main/mdo/supplemental-model.mdo diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-plugin-level-configuration-only/pom.xml b/impl/maven-core/src/test/projects/lifecycle-executor/project-with-plugin-level-configuration-only/pom.xml similarity index 100% rename from maven-core/src/test/projects/lifecycle-executor/project-with-plugin-level-configuration-only/pom.xml rename to impl/maven-core/src/test/projects/lifecycle-executor/project-with-plugin-level-configuration-only/pom.xml diff --git a/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml b/impl/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml similarity index 100% rename from maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml rename to impl/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml diff --git a/maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-a/pom.xml b/impl/maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-a/pom.xml similarity index 100% rename from maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-a/pom.xml rename to impl/maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-a/pom.xml diff --git a/maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-b/pom.xml b/impl/maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-b/pom.xml similarity index 100% rename from maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-b/pom.xml rename to impl/maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-b/pom.xml diff --git a/maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/pom.xml b/impl/maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/pom.xml similarity index 100% rename from maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/pom.xml rename to impl/maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/pom.xml diff --git a/maven-core/src/test/projects/plugin-manager/mng-5003-plugin-realm-cache/pom.xml b/impl/maven-core/src/test/projects/plugin-manager/mng-5003-plugin-realm-cache/pom.xml similarity index 100% rename from maven-core/src/test/projects/plugin-manager/mng-5003-plugin-realm-cache/pom.xml rename to impl/maven-core/src/test/projects/plugin-manager/mng-5003-plugin-realm-cache/pom.xml diff --git a/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml b/impl/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml rename to impl/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml diff --git a/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/tools.jar b/impl/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/tools.jar similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/tools.jar rename to impl/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/tools.jar diff --git a/maven-core/src/test/projects/plugin-manager/project-with-build-extensions-plugin/pom.xml b/impl/maven-core/src/test/projects/plugin-manager/project-with-build-extensions-plugin/pom.xml similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-build-extensions-plugin/pom.xml rename to impl/maven-core/src/test/projects/plugin-manager/project-with-build-extensions-plugin/pom.xml diff --git a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml b/impl/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml rename to impl/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.1/a-0.1.jar b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.1/a-0.1.jar similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.1/a-0.1.jar rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.1/a-0.1.jar diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.1/a-0.1.pom b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.1/a-0.1.pom similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.1/a-0.1.pom rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.1/a-0.1.pom diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.2/a-0.2.jar b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.2/a-0.2.jar similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.2/a-0.2.jar rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.2/a-0.2.jar diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.2/a-0.2.pom b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.2/a-0.2.pom similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.2/a-0.2.pom rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/0.2/a-0.2.pom diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/maven-metadata.xml b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/maven-metadata.xml similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/maven-metadata.xml rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/a/maven-metadata.xml diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/0.1/b-0.1.jar b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/0.1/b-0.1.jar similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/0.1/b-0.1.jar rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/0.1/b-0.1.jar diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/0.1/b-0.1.pom b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/0.1/b-0.1.pom similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/0.1/b-0.1.pom rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/0.1/b-0.1.pom diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/maven-metadata.xml b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/maven-metadata.xml similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/maven-metadata.xml rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/b/maven-metadata.xml diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/0.1/c-0.1.jar b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/0.1/c-0.1.jar similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/0.1/c-0.1.jar rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/0.1/c-0.1.jar diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/0.1/c-0.1.pom b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/0.1/c-0.1.pom similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/0.1/c-0.1.pom rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/0.1/c-0.1.pom diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/maven-metadata.xml b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/maven-metadata.xml similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/maven-metadata.xml rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/c/maven-metadata.xml diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/0.1/d-0.1.jar b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/0.1/d-0.1.jar similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/0.1/d-0.1.jar rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/0.1/d-0.1.jar diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/0.1/d-0.1.pom b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/0.1/d-0.1.pom similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/0.1/d-0.1.pom rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/0.1/d-0.1.pom diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/maven-metadata.xml b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/maven-metadata.xml similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/maven-metadata.xml rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/d/maven-metadata.xml diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/0.1/e-0.1.jar b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/0.1/e-0.1.jar similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/0.1/e-0.1.jar rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/0.1/e-0.1.jar diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/0.1/e-0.1.pom b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/0.1/e-0.1.pom similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/0.1/e-0.1.pom rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/0.1/e-0.1.pom diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/maven-metadata.xml b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/maven-metadata.xml similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/maven-metadata.xml rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/repo/org/apache/maven/its/mng3906/e/maven-metadata.xml diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/settings-template.xml b/impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/settings-template.xml similarity index 100% rename from maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/settings-template.xml rename to impl/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/settings-template.xml diff --git a/maven-core/src/test/projects/project-builder/MNG-6716/project/pom.xml b/impl/maven-core/src/test/projects/project-builder/MNG-6716/project/pom.xml similarity index 100% rename from maven-core/src/test/projects/project-builder/MNG-6716/project/pom.xml rename to impl/maven-core/src/test/projects/project-builder/MNG-6716/project/pom.xml diff --git a/maven-core/src/test/projects/project-builder/MNG-6723/.mvn/.gitkeep b/impl/maven-core/src/test/projects/project-builder/MNG-6723/.mvn/.gitkeep similarity index 100% rename from maven-core/src/test/projects/project-builder/MNG-6723/.mvn/.gitkeep rename to impl/maven-core/src/test/projects/project-builder/MNG-6723/.mvn/.gitkeep diff --git a/maven-core/src/test/projects/project-builder/MNG-6723/child/pom.xml b/impl/maven-core/src/test/projects/project-builder/MNG-6723/child/pom.xml similarity index 100% rename from maven-core/src/test/projects/project-builder/MNG-6723/child/pom.xml rename to impl/maven-core/src/test/projects/project-builder/MNG-6723/child/pom.xml diff --git a/maven-core/src/test/projects/project-builder/MNG-6723/pom.xml b/impl/maven-core/src/test/projects/project-builder/MNG-6723/pom.xml similarity index 100% rename from maven-core/src/test/projects/project-builder/MNG-6723/pom.xml rename to impl/maven-core/src/test/projects/project-builder/MNG-6723/pom.xml diff --git a/maven-core/src/test/projects/project-builder/MNG-6983/parent-pom.xml b/impl/maven-core/src/test/projects/project-builder/MNG-6983/parent-pom.xml similarity index 100% rename from maven-core/src/test/projects/project-builder/MNG-6983/parent-pom.xml rename to impl/maven-core/src/test/projects/project-builder/MNG-6983/parent-pom.xml diff --git a/maven-core/src/test/projects/project-builder/MNG-6983/pom.xml b/impl/maven-core/src/test/projects/project-builder/MNG-6983/pom.xml similarity index 100% rename from maven-core/src/test/projects/project-builder/MNG-6983/pom.xml rename to impl/maven-core/src/test/projects/project-builder/MNG-6983/pom.xml diff --git a/maven-core/src/test/projects/project-builder/MNG-7648/pom.xml b/impl/maven-core/src/test/projects/project-builder/MNG-7648/pom.xml similarity index 100% rename from maven-core/src/test/projects/project-builder/MNG-7648/pom.xml rename to impl/maven-core/src/test/projects/project-builder/MNG-7648/pom.xml diff --git a/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt b/impl/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt similarity index 100% rename from maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt rename to impl/maven-core/src/test/projects/project-builder/it0063/jdk/jre/placeholder.txt diff --git a/maven-core/src/test/projects/project-builder/it0063/jdk/lib/tools.jar b/impl/maven-core/src/test/projects/project-builder/it0063/jdk/lib/tools.jar similarity index 100% rename from maven-core/src/test/projects/project-builder/it0063/jdk/lib/tools.jar rename to impl/maven-core/src/test/projects/project-builder/it0063/jdk/lib/tools.jar diff --git a/maven-core/src/test/projects/project-builder/it0063/pom.xml b/impl/maven-core/src/test/projects/project-builder/it0063/pom.xml similarity index 100% rename from maven-core/src/test/projects/project-builder/it0063/pom.xml rename to impl/maven-core/src/test/projects/project-builder/it0063/pom.xml diff --git a/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml b/impl/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml similarity index 100% rename from maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml rename to impl/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml diff --git a/maven-core/src/test/projects/project-builder/mng-3023/dependency/dependency-1.jar b/impl/maven-core/src/test/projects/project-builder/mng-3023/dependency/dependency-1.jar similarity index 100% rename from maven-core/src/test/projects/project-builder/mng-3023/dependency/dependency-1.jar rename to impl/maven-core/src/test/projects/project-builder/mng-3023/dependency/dependency-1.jar diff --git a/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml b/impl/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml similarity index 100% rename from maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml rename to impl/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml diff --git a/maven-core/src/test/projects/project-builder/mng-3023/pom.xml b/impl/maven-core/src/test/projects/project-builder/mng-3023/pom.xml similarity index 100% rename from maven-core/src/test/projects/project-builder/mng-3023/pom.xml rename to impl/maven-core/src/test/projects/project-builder/mng-3023/pom.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/apache/1/apache-1.pom b/impl/maven-core/src/test/remote-repo/org/apache/apache/1/apache-1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/apache/1/apache-1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/apache/1/apache-1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/apache/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/apache/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/apache/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/apache/maven-metadata.xml diff --git a/maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar similarity index 100% rename from maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar diff --git a/maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom similarity index 100% rename from maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom diff --git a/maven-compat/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml similarity index 100% rename from maven-compat/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml diff --git a/maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar similarity index 100% rename from maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar diff --git a/maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom similarity index 100% rename from maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom diff --git a/maven-compat/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml similarity index 100% rename from maven-compat/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/bom/0.1/bom-0.1.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/bom/0.1/bom-0.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/bom/0.1/bom-0.1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/bom/0.1/bom-0.1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/bom/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/bom/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/bom/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/bom/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/parent/0.1/parent-0.1.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/parent/0.1/parent-0.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/parent/0.1/parent-0.1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/parent/0.1/parent-0.1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/parent/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/parent/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/parent/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/parent/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.jar b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.jar similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.jar rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.jar diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/pom.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/pom.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/pom.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/pom.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar b/impl/maven-core/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar rename to impl/maven-core/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/maven/2.0/maven-2.0.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/maven/2.0/maven-2.0.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/maven/2.0/maven-2.0.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/maven/2.0/maven-2.0.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.jar b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.jar similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.jar rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.jar diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.jar b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.jar similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.jar rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.jar diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.jar b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.jar similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.jar rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.jar diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.jar b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.jar similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.jar rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.jar diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.jar b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.jar similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.jar rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.jar diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.jar b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.jar similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.jar rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.jar diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.jar b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.jar similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.jar rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.jar diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.jar b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.jar similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.jar rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.jar diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.pom b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.pom rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml b/impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml rename to impl/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml diff --git a/maven-api-impl/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar b/impl/maven-core/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar rename to impl/maven-core/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar diff --git a/maven-api-impl/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom b/impl/maven-core/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom rename to impl/maven-core/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom diff --git a/maven-core/src/test/resources-project-builder/artifact-id-inheritance/child/pom.xml b/impl/maven-core/src/test/resources-project-builder/artifact-id-inheritance/child/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/artifact-id-inheritance/child/pom.xml rename to impl/maven-core/src/test/resources-project-builder/artifact-id-inheritance/child/pom.xml diff --git a/maven-core/src/test/resources-project-builder/artifact-id-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/artifact-id-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/artifact-id-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/artifact-id-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml b/impl/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml rename to impl/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml b/impl/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml rename to impl/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml diff --git a/maven-core/src/test/resources-project-builder/baseuri-interpolation/pom.xml b/impl/maven-core/src/test/resources-project-builder/baseuri-interpolation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/baseuri-interpolation/pom.xml rename to impl/maven-core/src/test/resources-project-builder/baseuri-interpolation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml b/impl/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml rename to impl/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/complete-model/w-parent/pom.xml b/impl/maven-core/src/test/resources-project-builder/complete-model/w-parent/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/complete-model/w-parent/pom.xml rename to impl/maven-core/src/test/resources-project-builder/complete-model/w-parent/pom.xml diff --git a/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml b/impl/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml rename to impl/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml diff --git a/maven-core/src/test/resources-project-builder/complete-model/wo-parent/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/complete-model/wo-parent/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/complete-model/wo-parent/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/complete-model/wo-parent/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/config-with-plugin-mng/pom.xml b/impl/maven-core/src/test/resources-project-builder/config-with-plugin-mng/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/config-with-plugin-mng/pom.xml rename to impl/maven-core/src/test/resources-project-builder/config-with-plugin-mng/pom.xml diff --git a/maven-core/src/test/resources-project-builder/consecutive_empty_elements/pom.xml b/impl/maven-core/src/test/resources-project-builder/consecutive_empty_elements/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/consecutive_empty_elements/pom.xml rename to impl/maven-core/src/test/resources-project-builder/consecutive_empty_elements/pom.xml diff --git a/maven-core/src/test/resources-project-builder/contributors-inheritance/child-2/pom.xml b/impl/maven-core/src/test/resources-project-builder/contributors-inheritance/child-2/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/contributors-inheritance/child-2/pom.xml rename to impl/maven-core/src/test/resources-project-builder/contributors-inheritance/child-2/pom.xml diff --git a/maven-core/src/test/resources-project-builder/contributors-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/contributors-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/contributors-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/contributors-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml b/impl/maven-core/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml rename to impl/maven-core/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml diff --git a/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml b/impl/maven-core/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml rename to impl/maven-core/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/dependency-scope/pom.xml b/impl/maven-core/src/test/resources-project-builder/dependency-scope/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dependency-scope/pom.xml rename to impl/maven-core/src/test/resources-project-builder/dependency-scope/pom.xml diff --git a/maven-core/src/test/resources-project-builder/dependency-scope/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/dependency-scope/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dependency-scope/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/dependency-scope/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/developers-inheritance/child-2/pom.xml b/impl/maven-core/src/test/resources-project-builder/developers-inheritance/child-2/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/developers-inheritance/child-2/pom.xml rename to impl/maven-core/src/test/resources-project-builder/developers-inheritance/child-2/pom.xml diff --git a/maven-core/src/test/resources-project-builder/developers-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/developers-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/developers-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/developers-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/distribution-management/pom.xml b/impl/maven-core/src/test/resources-project-builder/distribution-management/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/distribution-management/pom.xml rename to impl/maven-core/src/test/resources-project-builder/distribution-management/pom.xml diff --git a/maven-core/src/test/resources-project-builder/dual-execution-ids/pom.xml b/impl/maven-core/src/test/resources-project-builder/dual-execution-ids/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dual-execution-ids/pom.xml rename to impl/maven-core/src/test/resources-project-builder/dual-execution-ids/pom.xml diff --git a/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml b/impl/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml rename to impl/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml diff --git a/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml b/impl/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml rename to impl/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml diff --git a/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/empty-distMng-repo-url/pom.xml b/impl/maven-core/src/test/resources-project-builder/empty-distMng-repo-url/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/empty-distMng-repo-url/pom.xml rename to impl/maven-core/src/test/resources-project-builder/empty-distMng-repo-url/pom.xml diff --git a/maven-core/src/test/resources-project-builder/empty-scm/pom.xml b/impl/maven-core/src/test/resources-project-builder/empty-scm/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/empty-scm/pom.xml rename to impl/maven-core/src/test/resources-project-builder/empty-scm/pom.xml diff --git a/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml b/impl/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml rename to impl/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml diff --git a/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml b/impl/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml rename to impl/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml diff --git a/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml b/impl/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml rename to impl/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml diff --git a/maven-core/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml b/impl/maven-core/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml rename to impl/maven-core/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml diff --git a/maven-core/src/test/resources-project-builder/execution-configuration/pom.xml b/impl/maven-core/src/test/resources-project-builder/execution-configuration/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/execution-configuration/pom.xml rename to impl/maven-core/src/test/resources-project-builder/execution-configuration/pom.xml diff --git a/maven-core/src/test/resources-project-builder/foo/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/foo/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/foo/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/foo/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml b/impl/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/full-interpolation/pom.xml rename to impl/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml b/impl/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml rename to impl/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml diff --git a/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml b/impl/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml rename to impl/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml diff --git a/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml b/impl/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml rename to impl/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml diff --git a/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/interpolation-cli-wins/pom.xml b/impl/maven-core/src/test/resources-project-builder/interpolation-cli-wins/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/interpolation-cli-wins/pom.xml rename to impl/maven-core/src/test/resources-project-builder/interpolation-cli-wins/pom.xml diff --git a/maven-core/src/test/resources-project-builder/jdk-activation/pom.xml b/impl/maven-core/src/test/resources-project-builder/jdk-activation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/jdk-activation/pom.xml rename to impl/maven-core/src/test/resources-project-builder/jdk-activation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/join-different-containers-same-id/pom.xml b/impl/maven-core/src/test/resources-project-builder/join-different-containers-same-id/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/join-different-containers-same-id/pom.xml rename to impl/maven-core/src/test/resources-project-builder/join-different-containers-same-id/pom.xml diff --git a/maven-core/src/test/resources-project-builder/licenses-inheritance/child-2/pom.xml b/impl/maven-core/src/test/resources-project-builder/licenses-inheritance/child-2/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/licenses-inheritance/child-2/pom.xml rename to impl/maven-core/src/test/resources-project-builder/licenses-inheritance/child-2/pom.xml diff --git a/maven-core/src/test/resources-project-builder/licenses-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/licenses-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/licenses-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/licenses-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/limited-inheritance/child/pom.xml b/impl/maven-core/src/test/resources-project-builder/limited-inheritance/child/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/limited-inheritance/child/pom.xml rename to impl/maven-core/src/test/resources-project-builder/limited-inheritance/child/pom.xml diff --git a/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/mailing-lists-inheritance/child-2/pom.xml b/impl/maven-core/src/test/resources-project-builder/mailing-lists-inheritance/child-2/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/mailing-lists-inheritance/child-2/pom.xml rename to impl/maven-core/src/test/resources-project-builder/mailing-lists-inheritance/child-2/pom.xml diff --git a/maven-core/src/test/resources-project-builder/mailing-lists-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/mailing-lists-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/mailing-lists-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/mailing-lists-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml b/impl/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml rename to impl/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml diff --git a/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/micromailer/pom.xml b/impl/maven-core/src/test/resources-project-builder/micromailer/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/micromailer/pom.xml rename to impl/maven-core/src/test/resources-project-builder/micromailer/pom.xml diff --git a/maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom b/impl/maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom similarity index 100% rename from maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom rename to impl/maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom diff --git a/maven-core/src/test/resources-project-builder/multiple-filters/pom.xml b/impl/maven-core/src/test/resources-project-builder/multiple-filters/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/multiple-filters/pom.xml rename to impl/maven-core/src/test/resources-project-builder/multiple-filters/pom.xml diff --git a/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml b/impl/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/multiple-repos/pom.xml rename to impl/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml diff --git a/maven-core/src/test/resources-project-builder/multiple-repos/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/multiple-repos/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/multiple-repos/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/multiple-repos/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml b/impl/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml rename to impl/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml b/impl/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml rename to impl/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml diff --git a/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/parent-inheritance/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/parent-inheritance/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/parent-inheritance/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/parent-inheritance/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml b/impl/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml rename to impl/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/parent-pom-packaging/pom.xml b/impl/maven-core/src/test/resources-project-builder/parent-pom-packaging/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/parent-pom-packaging/pom.xml rename to impl/maven-core/src/test/resources-project-builder/parent-pom-packaging/pom.xml diff --git a/maven-core/src/test/resources-project-builder/parent-pom-packaging/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/parent-pom-packaging/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/parent-pom-packaging/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/parent-pom-packaging/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml b/impl/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml rename to impl/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-config-properties/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-config-properties/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-config-properties/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-config-properties/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-inheritance/w-merge/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-inheritance/w-merge/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-inheritance/w-merge/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-inheritance/w-merge/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-inheritance/wo-merge/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-inheritance/wo-merge/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-inheritance/wo-merge/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-inheritance/wo-merge/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mgmt/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-order-and-default-exec/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-order-and-default-exec/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-order-and-default-exec/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-order-and-default-exec/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-order-with-lifecycle/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-merge-order/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-inheritance-merge-order/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-inheritance-merge-order/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-inheritance-merge-order/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-merge-order/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-inheritance-merge-order/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-inheritance-merge-order/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-inheritance-merge-order/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-inheritance-order/child/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-inheritance-order/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-injection-merge-order/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-injection-merge-order/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-injection-merge-order/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-injection-merge-order/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-interpolation-build/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-interpolation-build/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-interpolation-build/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-interpolation-build/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-interpolation-reporting/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-interpolation-reporting/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-interpolation-reporting/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-interpolation-reporting/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-management-dependencies/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-management-dependencies/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-management-dependencies/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-management-dependencies/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-management-for-implicit-plugin/child/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-management-for-implicit-plugin/child/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-management-for-implicit-plugin/child/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-management-for-implicit-plugin/child/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-management-for-implicit-plugin/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-management-for-implicit-plugin/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-management-for-implicit-plugin/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-management-for-implicit-plugin/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-merge-simple/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-merge-simple/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-merge-simple/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-merge-simple/pom.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-order/nexus-parent.xml b/impl/maven-core/src/test/resources-project-builder/plugin-order/nexus-parent.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-order/nexus-parent.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-order/nexus-parent.xml diff --git a/maven-core/src/test/resources-project-builder/plugin-order/pom.xml b/impl/maven-core/src/test/resources-project-builder/plugin-order/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/plugin-order/pom.xml rename to impl/maven-core/src/test/resources-project-builder/plugin-order/pom.xml diff --git a/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml b/impl/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml rename to impl/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml diff --git a/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml b/impl/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml rename to impl/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml diff --git a/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml b/impl/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml rename to impl/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml diff --git a/maven-core/src/test/resources-project-builder/pom-inheritance/child-1/pom.xml b/impl/maven-core/src/test/resources-project-builder/pom-inheritance/child-1/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/pom-inheritance/child-1/pom.xml rename to impl/maven-core/src/test/resources-project-builder/pom-inheritance/child-1/pom.xml diff --git a/maven-core/src/test/resources-project-builder/pom-inheritance/child-2/pom.xml b/impl/maven-core/src/test/resources-project-builder/pom-inheritance/child-2/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/pom-inheritance/child-2/pom.xml rename to impl/maven-core/src/test/resources-project-builder/pom-inheritance/child-2/pom.xml diff --git a/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml b/impl/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml rename to impl/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml diff --git a/maven-core/src/test/resources-project-builder/prerequisites-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/prerequisites-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/prerequisites-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/prerequisites-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-default-deactivation/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-default-deactivation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-default-deactivation/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-default-deactivation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-module-inheritance/maven-inherit-plugin/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-module-inheritance/maven-inherit-plugin/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-module-inheritance/maven-inherit-plugin/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-module-inheritance/maven-inherit-plugin/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-module-inheritance/maven-pax-plugin/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-module-inheritance/maven-pax-plugin/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-module-inheritance/maven-pax-plugin/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-module-inheritance/maven-pax-plugin/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-module-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-module-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-module-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-module-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-module-inheritance/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-module-inheritance/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-module-inheritance/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-module-inheritance/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-module/module-1/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-module/module-1/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-module/module-1/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-module/module-1/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-module/module-2/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-module/module-2/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-module/module-2/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-module/module-2/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-module/module-3/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-module/module-3/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-module/module-3/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-module/module-3/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-module/module-4/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-module/module-4/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-module/module-4/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-module/module-4/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-module/module-5/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-module/module-5/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-module/module-5/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-module/module-5/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-module/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-module/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-module/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-module/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-plugins/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml diff --git a/maven-core/src/test/resources-project-builder/profile-properties-interpolation/pom.xml b/impl/maven-core/src/test/resources-project-builder/profile-properties-interpolation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/profile-properties-interpolation/pom.xml rename to impl/maven-core/src/test/resources-project-builder/profile-properties-interpolation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/properties-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/properties-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/properties-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/properties-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/properties-inheritance/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/properties-inheritance/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/properties-inheritance/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/properties-inheritance/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml b/impl/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml rename to impl/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml diff --git a/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/reporting-interpolation/pom.xml b/impl/maven-core/src/test/resources-project-builder/reporting-interpolation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/reporting-interpolation/pom.xml rename to impl/maven-core/src/test/resources-project-builder/reporting-interpolation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/reporting-plugin-config/pom.xml b/impl/maven-core/src/test/resources-project-builder/reporting-plugin-config/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/reporting-plugin-config/pom.xml rename to impl/maven-core/src/test/resources-project-builder/reporting-plugin-config/pom.xml diff --git a/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml b/impl/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml rename to impl/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml diff --git a/maven-core/src/test/resources-project-builder/single-configuration-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/single-configuration-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/single-configuration-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/single-configuration-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/system-property-interpolation/pom.xml b/impl/maven-core/src/test/resources-project-builder/system-property-interpolation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/system-property-interpolation/pom.xml rename to impl/maven-core/src/test/resources-project-builder/system-property-interpolation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/unc-path/pom.xml b/impl/maven-core/src/test/resources-project-builder/unc-path/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/unc-path/pom.xml rename to impl/maven-core/src/test/resources-project-builder/unc-path/pom.xml diff --git a/maven-core/src/test/resources-project-builder/unc-path/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/unc-path/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/unc-path/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/unc-path/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt-in-profile/pom.xml b/impl/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt-in-profile/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt-in-profile/pom.xml rename to impl/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt-in-profile/pom.xml diff --git a/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt/pom.xml b/impl/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt/pom.xml rename to impl/maven-core/src/test/resources-project-builder/unique-dependency-key/dep-mgmt/pom.xml diff --git a/maven-core/src/test/resources-project-builder/unique-dependency-key/deps-in-profile/pom.xml b/impl/maven-core/src/test/resources-project-builder/unique-dependency-key/deps-in-profile/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/unique-dependency-key/deps-in-profile/pom.xml rename to impl/maven-core/src/test/resources-project-builder/unique-dependency-key/deps-in-profile/pom.xml diff --git a/maven-core/src/test/resources-project-builder/unique-dependency-key/deps/pom.xml b/impl/maven-core/src/test/resources-project-builder/unique-dependency-key/deps/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/unique-dependency-key/deps/pom.xml rename to impl/maven-core/src/test/resources-project-builder/unique-dependency-key/deps/pom.xml diff --git a/maven-core/src/test/resources-project-builder/unique-repo-id/artifact-repo-in-profile/pom.xml b/impl/maven-core/src/test/resources-project-builder/unique-repo-id/artifact-repo-in-profile/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/unique-repo-id/artifact-repo-in-profile/pom.xml rename to impl/maven-core/src/test/resources-project-builder/unique-repo-id/artifact-repo-in-profile/pom.xml diff --git a/maven-core/src/test/resources-project-builder/unique-repo-id/artifact-repo/pom.xml b/impl/maven-core/src/test/resources-project-builder/unique-repo-id/artifact-repo/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/unique-repo-id/artifact-repo/pom.xml rename to impl/maven-core/src/test/resources-project-builder/unique-repo-id/artifact-repo/pom.xml diff --git a/maven-core/src/test/resources-project-builder/unique-repo-id/plugin-repo-in-profile/pom.xml b/impl/maven-core/src/test/resources-project-builder/unique-repo-id/plugin-repo-in-profile/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/unique-repo-id/plugin-repo-in-profile/pom.xml rename to impl/maven-core/src/test/resources-project-builder/unique-repo-id/plugin-repo-in-profile/pom.xml diff --git a/maven-core/src/test/resources-project-builder/unique-repo-id/plugin-repo/pom.xml b/impl/maven-core/src/test/resources-project-builder/unique-repo-id/plugin-repo/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/unique-repo-id/plugin-repo/pom.xml rename to impl/maven-core/src/test/resources-project-builder/unique-repo-id/plugin-repo/pom.xml diff --git a/maven-core/src/test/resources-project-builder/url-append/child/pom.xml b/impl/maven-core/src/test/resources-project-builder/url-append/child/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/url-append/child/pom.xml rename to impl/maven-core/src/test/resources-project-builder/url-append/child/pom.xml diff --git a/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml b/impl/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/url-append/parent/pom.xml rename to impl/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml diff --git a/maven-core/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml b/impl/maven-core/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml rename to impl/maven-core/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml diff --git a/maven-core/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml b/impl/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/url-inheritance/pom.xml rename to impl/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml diff --git a/maven-core/src/test/resources-project-builder/url-inheritance/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/url-inheritance/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/url-inheritance/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/url-inheritance/sub/pom.xml diff --git a/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml b/impl/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml rename to impl/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml diff --git a/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml b/impl/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml rename to impl/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml diff --git a/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml b/impl/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml rename to impl/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml diff --git a/maven-core/src/test/resources-project-builder/xml-whitespace/pom.xml b/impl/maven-core/src/test/resources-project-builder/xml-whitespace/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/xml-whitespace/pom.xml rename to impl/maven-core/src/test/resources-project-builder/xml-whitespace/pom.xml diff --git a/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml b/impl/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml similarity index 100% rename from maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml rename to impl/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml diff --git a/maven-core/src/test/resources-settings/repositories/pom.xml b/impl/maven-core/src/test/resources-settings/repositories/pom.xml similarity index 100% rename from maven-core/src/test/resources-settings/repositories/pom.xml rename to impl/maven-core/src/test/resources-settings/repositories/pom.xml diff --git a/maven-core/src/test/resources-settings/repositories/settings.xml b/impl/maven-core/src/test/resources-settings/repositories/settings.xml similarity index 100% rename from maven-core/src/test/resources-settings/repositories/settings.xml rename to impl/maven-core/src/test/resources-settings/repositories/settings.xml diff --git a/maven-core/src/test/resources-settings/settings-no-pom/pom.xml b/impl/maven-core/src/test/resources-settings/settings-no-pom/pom.xml similarity index 100% rename from maven-core/src/test/resources-settings/settings-no-pom/pom.xml rename to impl/maven-core/src/test/resources-settings/settings-no-pom/pom.xml diff --git a/maven-core/src/test/resources-settings/settings-no-pom/settings.xml b/impl/maven-core/src/test/resources-settings/settings-no-pom/settings.xml similarity index 100% rename from maven-core/src/test/resources-settings/settings-no-pom/settings.xml rename to impl/maven-core/src/test/resources-settings/settings-no-pom/settings.xml diff --git a/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml b/impl/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml similarity index 100% rename from maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml rename to impl/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/pom.xml diff --git a/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/settings.xml b/impl/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/settings.xml similarity index 100% rename from maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/settings.xml rename to impl/maven-core/src/test/resources-settings/test-pom-and-settings-interpolation/settings.xml diff --git a/maven-core/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject b/impl/maven-core/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject similarity index 100% rename from maven-core/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject rename to impl/maven-core/src/test/resources/META-INF/maven/org.apache.maven.api.di.Inject diff --git a/maven-core/src/test/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties b/impl/maven-core/src/test/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties similarity index 100% rename from maven-core/src/test/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties rename to impl/maven-core/src/test/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties diff --git a/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar b/impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar rename to impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar diff --git a/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom b/impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom rename to impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom diff --git a/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc-resources.jar.lastUpdated b/impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc-resources.jar.lastUpdated similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc-resources.jar.lastUpdated rename to impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc-resources.jar.lastUpdated diff --git a/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar b/impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar rename to impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar diff --git a/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom b/impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom rename to impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom diff --git a/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.jar b/impl/maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.jar rename to impl/maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.jar diff --git a/maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.pom b/impl/maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.pom rename to impl/maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.pom diff --git a/maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/junit/junit/4.13.1/junit-4.13.1.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/apache/3/apache-3.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 diff --git a/maven-core/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar similarity index 100% rename from maven-core/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 diff --git a/maven-core/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.md5 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.md5 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.md5 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.md5 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc-resources.jar.lastUpdated b/impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc-resources.jar.lastUpdated similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc-resources.jar.lastUpdated rename to impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc-resources.jar.lastUpdated diff --git a/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar b/impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar rename to impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar diff --git a/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom b/impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom rename to impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom diff --git a/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom.sha1 b/impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom.sha1 rename to impl/maven-core/src/test/resources/apiv4-repo/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom.sha1 diff --git a/maven-core/src/test/resources/canonical-pom.xml b/impl/maven-core/src/test/resources/canonical-pom.xml similarity index 100% rename from maven-core/src/test/resources/canonical-pom.xml rename to impl/maven-core/src/test/resources/canonical-pom.xml diff --git a/maven-core/src/test/resources/consumer/simple/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/pom.xml similarity index 100% rename from maven-core/src/test/resources/consumer/simple/pom.xml rename to impl/maven-core/src/test/resources/consumer/simple/pom.xml diff --git a/maven-core/src/test/resources/consumer/simple/simple-parent/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/pom.xml similarity index 100% rename from maven-core/src/test/resources/consumer/simple/simple-parent/pom.xml rename to impl/maven-core/src/test/resources/consumer/simple/simple-parent/pom.xml diff --git a/maven-core/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml similarity index 100% rename from maven-core/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml rename to impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-testutils/pom.xml diff --git a/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml similarity index 100% rename from maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml rename to impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-weather/pom.xml diff --git a/maven-core/src/test/resources/consumer/simple/simple-parent/simple-webapp/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-webapp/pom.xml similarity index 100% rename from maven-core/src/test/resources/consumer/simple/simple-parent/simple-webapp/pom.xml rename to impl/maven-core/src/test/resources/consumer/simple/simple-parent/simple-webapp/pom.xml diff --git a/maven-core/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml b/impl/maven-core/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml similarity index 100% rename from maven-core/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml rename to impl/maven-core/src/test/resources/consumer/simple/simple-parent/utils-parent/pom.xml diff --git a/maven-core/src/test/resources/consumer/trivial/child/pom.xml b/impl/maven-core/src/test/resources/consumer/trivial/child/pom.xml similarity index 100% rename from maven-core/src/test/resources/consumer/trivial/child/pom.xml rename to impl/maven-core/src/test/resources/consumer/trivial/child/pom.xml diff --git a/maven-core/src/test/resources/consumer/trivial/pom.xml b/impl/maven-core/src/test/resources/consumer/trivial/pom.xml similarity index 100% rename from maven-core/src/test/resources/consumer/trivial/pom.xml rename to impl/maven-core/src/test/resources/consumer/trivial/pom.xml diff --git a/maven-core/src/test/resources/dependencyManagement-pom.xml b/impl/maven-core/src/test/resources/dependencyManagement-pom.xml similarity index 100% rename from maven-core/src/test/resources/dependencyManagement-pom.xml rename to impl/maven-core/src/test/resources/dependencyManagement-pom.xml diff --git a/maven-core/src/test/resources/distributionManagement-pom.xml b/impl/maven-core/src/test/resources/distributionManagement-pom.xml similarity index 100% rename from maven-core/src/test/resources/distributionManagement-pom.xml rename to impl/maven-core/src/test/resources/distributionManagement-pom.xml diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom b/impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom rename to impl/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom diff --git a/maven-core/src/test/resources/imports-repo/t01/p0/p1/pom.xml b/impl/maven-core/src/test/resources/imports-repo/t01/p0/p1/pom.xml similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/p0/p1/pom.xml rename to impl/maven-core/src/test/resources/imports-repo/t01/p0/p1/pom.xml diff --git a/maven-core/src/test/resources/imports-repo/t01/p0/p2/pom.xml b/impl/maven-core/src/test/resources/imports-repo/t01/p0/p2/pom.xml similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/p0/p2/pom.xml rename to impl/maven-core/src/test/resources/imports-repo/t01/p0/p2/pom.xml diff --git a/maven-core/src/test/resources/imports-repo/t01/p0/p3/pom.xml b/impl/maven-core/src/test/resources/imports-repo/t01/p0/p3/pom.xml similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/p0/p3/pom.xml rename to impl/maven-core/src/test/resources/imports-repo/t01/p0/p3/pom.xml diff --git a/maven-core/src/test/resources/imports-repo/t01/p0/p4/pom.xml b/impl/maven-core/src/test/resources/imports-repo/t01/p0/p4/pom.xml similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/p0/p4/pom.xml rename to impl/maven-core/src/test/resources/imports-repo/t01/p0/p4/pom.xml diff --git a/maven-core/src/test/resources/imports-repo/t01/p0/pom.xml b/impl/maven-core/src/test/resources/imports-repo/t01/p0/pom.xml similarity index 100% rename from maven-core/src/test/resources/imports-repo/t01/p0/pom.xml rename to impl/maven-core/src/test/resources/imports-repo/t01/p0/pom.xml diff --git a/maven-core/src/test/resources/local-repo/marker.txt b/impl/maven-core/src/test/resources/local-repo/marker.txt similarity index 100% rename from maven-core/src/test/resources/local-repo/marker.txt rename to impl/maven-core/src/test/resources/local-repo/marker.txt diff --git a/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar b/impl/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar similarity index 100% rename from maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar rename to impl/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar diff --git a/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar b/impl/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar similarity index 100% rename from maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar rename to impl/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar diff --git a/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar b/impl/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar similarity index 100% rename from maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar rename to impl/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar diff --git a/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar b/impl/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar similarity index 100% rename from maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar rename to impl/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar diff --git a/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom b/impl/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom similarity index 100% rename from maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom rename to impl/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom diff --git a/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom b/impl/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom similarity index 100% rename from maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom rename to impl/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom diff --git a/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom b/impl/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom similarity index 100% rename from maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom rename to impl/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom diff --git a/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom b/impl/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom similarity index 100% rename from maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom rename to impl/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom diff --git a/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom b/impl/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom similarity index 100% rename from maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom rename to impl/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar b/impl/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar similarity index 100% rename from maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar rename to impl/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version b/impl/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version similarity index 100% rename from maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version rename to impl/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar b/impl/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar similarity index 100% rename from maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar rename to impl/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version b/impl/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version similarity index 100% rename from maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version rename to impl/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar b/impl/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar similarity index 100% rename from maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar rename to impl/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version b/impl/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version similarity index 100% rename from maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version rename to impl/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom b/impl/maven-core/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom similarity index 100% rename from maven-core/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom rename to impl/maven-core/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom diff --git a/maven-core/src/test/resources/org/apache/maven/MavenLifecycleParticipantTest.xml b/impl/maven-core/src/test/resources/org/apache/maven/MavenLifecycleParticipantTest.xml similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/MavenLifecycleParticipantTest.xml rename to impl/maven-core/src/test/resources/org/apache/maven/MavenLifecycleParticipantTest.xml diff --git a/maven-core/src/test/resources/org/apache/maven/execution/resume.properties b/impl/maven-core/src/test/resources/org/apache/maven/execution/resume.properties similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/execution/resume.properties rename to impl/maven-core/src/test/resources/org/apache/maven/execution/resume.properties diff --git a/maven-core/src/test/resources/org/apache/maven/execution/test-extension-1.jar b/impl/maven-core/src/test/resources/org/apache/maven/execution/test-extension-1.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/execution/test-extension-1.jar rename to impl/maven-core/src/test/resources/org/apache/maven/execution/test-extension-1.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/apache/3/apache-3.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.jar.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.jar b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.jar rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.jar b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.jar rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/4/maven-parent-4.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.jar.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.jar.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-active-collections/1.0-beta-1/plexus-active-collections-1.0-beta-1.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.jar.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.jar.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.jar.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-component-api/1.0-alpha-32/plexus-component-api-1.0-alpha-32.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.jar.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-16/plexus-container-default-1.0-alpha-16.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.jar.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-containers/1.0-alpha-32/plexus-containers-1.0-alpha-32.pom.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 diff --git a/maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom similarity index 100% rename from maven-core/src/test/resources/apiv4-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.jar.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.md5 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.md5 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.md5 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.md5 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/repo-marker.txt b/impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/repo-marker.txt similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/repo-marker.txt rename to impl/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/repo-marker.txt diff --git a/maven-core/src/test/resources/org/apache/maven/lifecycle/LifecycleExecutorTest.xml b/impl/maven-core/src/test/resources/org/apache/maven/lifecycle/LifecycleExecutorTest.xml similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/lifecycle/LifecycleExecutorTest.xml rename to impl/maven-core/src/test/resources/org/apache/maven/lifecycle/LifecycleExecutorTest.xml diff --git a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml b/impl/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml rename to impl/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml diff --git a/maven-core/src/test/resources/org/apache/maven/plugin/PluginManagerTest.xml b/impl/maven-core/src/test/resources/org/apache/maven/plugin/PluginManagerTest.xml similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/plugin/PluginManagerTest.xml rename to impl/maven-core/src/test/resources/org/apache/maven/plugin/PluginManagerTest.xml diff --git a/maven-core/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml b/impl/maven-core/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml rename to impl/maven-core/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml diff --git a/maven-core/src/test/resources/org/apache/maven/project/PomConstructionTest.xml b/impl/maven-core/src/test/resources/org/apache/maven/project/PomConstructionTest.xml similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/project/PomConstructionTest.xml rename to impl/maven-core/src/test/resources/org/apache/maven/project/PomConstructionTest.xml diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml b/impl/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml rename to impl/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom b/impl/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom rename to impl/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/maven-metadata-local.xml b/impl/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/maven-metadata-local.xml similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/maven-metadata-local.xml rename to impl/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/maven-metadata-local.xml diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml b/impl/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml rename to impl/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml b/impl/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml rename to impl/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml b/impl/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml rename to impl/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml b/impl/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml rename to impl/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml diff --git a/maven-core/src/test/resources/org/apache/maven/settings/PomConstructionWithSettingsTest.xml b/impl/maven-core/src/test/resources/org/apache/maven/settings/PomConstructionWithSettingsTest.xml similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/settings/PomConstructionWithSettingsTest.xml rename to impl/maven-core/src/test/resources/org/apache/maven/settings/PomConstructionWithSettingsTest.xml diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar b/impl/maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar rename to impl/maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar diff --git a/maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 b/impl/maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 similarity index 100% rename from maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 rename to impl/maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar.sha1 diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom b/impl/maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom similarity index 100% rename from maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom rename to impl/maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom diff --git a/maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 b/impl/maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 similarity index 100% rename from maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 rename to impl/maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 diff --git a/maven-core/src/test/resources/pom.xml b/impl/maven-core/src/test/resources/pom.xml similarity index 100% rename from maven-core/src/test/resources/pom.xml rename to impl/maven-core/src/test/resources/pom.xml diff --git a/maven-core/src/test/resources/project-dynamism/plugin-level-dep.pom.xml b/impl/maven-core/src/test/resources/project-dynamism/plugin-level-dep.pom.xml similarity index 100% rename from maven-core/src/test/resources/project-dynamism/plugin-level-dep.pom.xml rename to impl/maven-core/src/test/resources/project-dynamism/plugin-level-dep.pom.xml diff --git a/maven-core/src/test/resources/project-dynamism/pom-interp.xml b/impl/maven-core/src/test/resources/project-dynamism/pom-interp.xml similarity index 100% rename from maven-core/src/test/resources/project-dynamism/pom-interp.xml rename to impl/maven-core/src/test/resources/project-dynamism/pom-interp.xml diff --git a/maven-core/src/test/resources/project-dynamism/pom-relative.xml b/impl/maven-core/src/test/resources/project-dynamism/pom-relative.xml similarity index 100% rename from maven-core/src/test/resources/project-dynamism/pom-relative.xml rename to impl/maven-core/src/test/resources/project-dynamism/pom-relative.xml diff --git a/maven-core/src/test/resources/project-dynamism/pom.xml b/impl/maven-core/src/test/resources/project-dynamism/pom.xml similarity index 100% rename from maven-core/src/test/resources/project-dynamism/pom.xml rename to impl/maven-core/src/test/resources/project-dynamism/pom.xml diff --git a/maven-core/src/test/resources/projects/artifactMissingVersion/pom.xml b/impl/maven-core/src/test/resources/projects/artifactMissingVersion/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/artifactMissingVersion/pom.xml rename to impl/maven-core/src/test/resources/projects/artifactMissingVersion/pom.xml diff --git a/maven-core/src/test/resources/projects/bad-dependency.xml b/impl/maven-core/src/test/resources/projects/bad-dependency.xml similarity index 100% rename from maven-core/src/test/resources/projects/bad-dependency.xml rename to impl/maven-core/src/test/resources/projects/bad-dependency.xml diff --git a/maven-core/src/test/resources/projects/bad-project.xml b/impl/maven-core/src/test/resources/projects/bad-project.xml similarity index 100% rename from maven-core/src/test/resources/projects/bad-project.xml rename to impl/maven-core/src/test/resources/projects/bad-project.xml diff --git a/maven-core/src/test/resources/projects/badPom.xml b/impl/maven-core/src/test/resources/projects/badPom.xml similarity index 100% rename from maven-core/src/test/resources/projects/badPom.xml rename to impl/maven-core/src/test/resources/projects/badPom.xml diff --git a/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml b/impl/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml similarity index 100% rename from maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml rename to impl/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml diff --git a/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml b/impl/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml similarity index 100% rename from maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml rename to impl/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml diff --git a/maven-core/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml b/impl/maven-core/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml similarity index 100% rename from maven-core/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml rename to impl/maven-core/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml diff --git a/maven-core/src/test/resources/projects/basic-resolveDependencies.xml b/impl/maven-core/src/test/resources/projects/basic-resolveDependencies.xml similarity index 100% rename from maven-core/src/test/resources/projects/basic-resolveDependencies.xml rename to impl/maven-core/src/test/resources/projects/basic-resolveDependencies.xml diff --git a/maven-core/src/test/resources/projects/build-path-expression-pom.xml b/impl/maven-core/src/test/resources/projects/build-path-expression-pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/build-path-expression-pom.xml rename to impl/maven-core/src/test/resources/projects/build-path-expression-pom.xml diff --git a/maven-core/src/test/resources/projects/build.properties b/impl/maven-core/src/test/resources/projects/build.properties similarity index 100% rename from maven-core/src/test/resources/projects/build.properties rename to impl/maven-core/src/test/resources/projects/build.properties diff --git a/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml b/impl/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml similarity index 100% rename from maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml rename to impl/maven-core/src/test/resources/projects/child-which-inherits-from-super-model.xml diff --git a/maven-core/src/test/resources/projects/child-with-bogus-parent.xml b/impl/maven-core/src/test/resources/projects/child-with-bogus-parent.xml similarity index 100% rename from maven-core/src/test/resources/projects/child-with-bogus-parent.xml rename to impl/maven-core/src/test/resources/projects/child-with-bogus-parent.xml diff --git a/maven-core/src/test/resources/projects/child.xml b/impl/maven-core/src/test/resources/projects/child.xml similarity index 100% rename from maven-core/src/test/resources/projects/child.xml rename to impl/maven-core/src/test/resources/projects/child.xml diff --git a/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml b/impl/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml rename to impl/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml diff --git a/maven-core/src/test/resources/projects/fully-populated-child.xml b/impl/maven-core/src/test/resources/projects/fully-populated-child.xml similarity index 100% rename from maven-core/src/test/resources/projects/fully-populated-child.xml rename to impl/maven-core/src/test/resources/projects/fully-populated-child.xml diff --git a/maven-core/src/test/resources/projects/future-model-version-pom.xml b/impl/maven-core/src/test/resources/projects/future-model-version-pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/future-model-version-pom.xml rename to impl/maven-core/src/test/resources/projects/future-model-version-pom.xml diff --git a/maven-core/src/test/resources/projects/future-schema-model-version-pom.xml b/impl/maven-core/src/test/resources/projects/future-schema-model-version-pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/future-schema-model-version-pom.xml rename to impl/maven-core/src/test/resources/projects/future-schema-model-version-pom.xml diff --git a/maven-core/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml b/impl/maven-core/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml rename to impl/maven-core/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml diff --git a/maven-core/src/test/resources/projects/grandchild-check/child/pom.xml b/impl/maven-core/src/test/resources/projects/grandchild-check/child/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/grandchild-check/child/pom.xml rename to impl/maven-core/src/test/resources/projects/grandchild-check/child/pom.xml diff --git a/maven-core/src/test/resources/projects/grandchild-check/pom.xml b/impl/maven-core/src/test/resources/projects/grandchild-check/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/grandchild-check/pom.xml rename to impl/maven-core/src/test/resources/projects/grandchild-check/pom.xml diff --git a/maven-core/src/test/resources/projects/modelsource/module01/pom.xml b/impl/maven-core/src/test/resources/projects/modelsource/module01/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/modelsource/module01/pom.xml rename to impl/maven-core/src/test/resources/projects/modelsource/module01/pom.xml diff --git a/maven-core/src/test/resources/projects/modelsource/pom.xml b/impl/maven-core/src/test/resources/projects/modelsource/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/modelsource/pom.xml rename to impl/maven-core/src/test/resources/projects/modelsource/pom.xml diff --git a/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml b/impl/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml rename to impl/maven-core/src/test/resources/projects/modelsourcebasedir/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-external-child-pom-parent-version-expression/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-external-child-pom-parent-version-expression/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-external-child-pom-parent-version-expression/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-external-child-pom-parent-version-expression/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-external-child-pom-version-expression/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-external-child-pom-version-expression/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-external-child-pom-version-expression/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-external-child-pom-version-expression/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-external-child-project-parent-version-expression/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-external-child-project-parent-version-expression/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-external-child-project-parent-version-expression/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-external-child-project-parent-version-expression/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-external-child-project-version-expression/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-external-child-project-version-expression/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-external-child-project-version-expression/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-external-child-project-version-expression/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-external-child-revision-expression/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-external-child-revision-expression/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-external-child-revision-expression/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-external-child-revision-expression/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-external-child-without-version/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-external-child-without-version/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-external-child-without-version/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-external-child-without-version/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-external-valid/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-external-valid/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-external-valid/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-external-valid/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-local-child-project-parent-version-expression/child/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-local-child-project-parent-version-expression/child/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-local-child-project-parent-version-expression/child/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-local-child-project-parent-version-expression/child/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-local-child-project-parent-version-expression/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-local-child-project-parent-version-expression/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-local-child-project-parent-version-expression/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-local-child-project-parent-version-expression/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-local-child-project-version-expression/child/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-local-child-project-version-expression/child/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-local-child-project-version-expression/child/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-local-child-project-version-expression/child/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-local-child-project-version-expression/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-local-child-project-version-expression/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-local-child-project-version-expression/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-local-child-project-version-expression/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-local-child-revision-expression/child/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-local-child-revision-expression/child/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-local-child-revision-expression/child/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-local-child-revision-expression/child/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-local-child-revision-expression/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-local-child-revision-expression/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-local-child-revision-expression/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-local-child-revision-expression/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-local-child-without-version/child/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-local-child-without-version/child/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-local-child-without-version/child/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-local-child-without-version/child/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-local-child-without-version/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-local-child-without-version/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-local-child-without-version/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-local-child-without-version/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-local-valid/child/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-local-valid/child/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-local-valid/child/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-local-valid/child/pom.xml diff --git a/maven-core/src/test/resources/projects/parent-version-range-local-valid/pom.xml b/impl/maven-core/src/test/resources/projects/parent-version-range-local-valid/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/parent-version-range-local-valid/pom.xml rename to impl/maven-core/src/test/resources/projects/parent-version-range-local-valid/pom.xml diff --git a/maven-core/src/test/resources/projects/past-model-version-pom.xml b/impl/maven-core/src/test/resources/projects/past-model-version-pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/past-model-version-pom.xml rename to impl/maven-core/src/test/resources/projects/past-model-version-pom.xml diff --git a/maven-core/src/test/resources/projects/project.xml b/impl/maven-core/src/test/resources/projects/project.xml similarity index 100% rename from maven-core/src/test/resources/projects/project.xml rename to impl/maven-core/src/test/resources/projects/project.xml diff --git a/maven-core/src/test/resources/projects/reread/pom1.xml b/impl/maven-core/src/test/resources/projects/reread/pom1.xml similarity index 100% rename from maven-core/src/test/resources/projects/reread/pom1.xml rename to impl/maven-core/src/test/resources/projects/reread/pom1.xml diff --git a/maven-core/src/test/resources/projects/reread/pom2.xml b/impl/maven-core/src/test/resources/projects/reread/pom2.xml similarity index 100% rename from maven-core/src/test/resources/projects/reread/pom2.xml rename to impl/maven-core/src/test/resources/projects/reread/pom2.xml diff --git a/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml b/impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml rename to impl/maven-core/src/test/resources/projects/subprojects-discover/child/pom.xml diff --git a/maven-core/src/test/resources/projects/subprojects-discover/pom.xml b/impl/maven-core/src/test/resources/projects/subprojects-discover/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/subprojects-discover/pom.xml rename to impl/maven-core/src/test/resources/projects/subprojects-discover/pom.xml diff --git a/maven-core/src/test/resources/projects/transform/after.pom b/impl/maven-core/src/test/resources/projects/transform/after.pom similarity index 100% rename from maven-core/src/test/resources/projects/transform/after.pom rename to impl/maven-core/src/test/resources/projects/transform/after.pom diff --git a/maven-core/src/test/resources/projects/transform/before.pom b/impl/maven-core/src/test/resources/projects/transform/before.pom similarity index 100% rename from maven-core/src/test/resources/projects/transform/before.pom rename to impl/maven-core/src/test/resources/projects/transform/before.pom diff --git a/maven-core/src/test/resources/projects/transform/jar/after.pom b/impl/maven-core/src/test/resources/projects/transform/jar/after.pom similarity index 100% rename from maven-core/src/test/resources/projects/transform/jar/after.pom rename to impl/maven-core/src/test/resources/projects/transform/jar/after.pom diff --git a/maven-core/src/test/resources/projects/transform/jar/before.pom b/impl/maven-core/src/test/resources/projects/transform/jar/before.pom similarity index 100% rename from maven-core/src/test/resources/projects/transform/jar/before.pom rename to impl/maven-core/src/test/resources/projects/transform/jar/before.pom diff --git a/maven-core/src/test/resources/projects/tree/consumer/pom.xml b/impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/tree/consumer/pom.xml rename to impl/maven-core/src/test/resources/projects/tree/consumer/pom.xml diff --git a/maven-core/src/test/resources/projects/tree/dep/pom.xml b/impl/maven-core/src/test/resources/projects/tree/dep/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/tree/dep/pom.xml rename to impl/maven-core/src/test/resources/projects/tree/dep/pom.xml diff --git a/maven-core/src/test/resources/projects/tree/pom.xml b/impl/maven-core/src/test/resources/projects/tree/pom.xml similarity index 100% rename from maven-core/src/test/resources/projects/tree/pom.xml rename to impl/maven-core/src/test/resources/projects/tree/pom.xml diff --git a/maven-core/src/test/resources/projects/versionless-managed-dependency.xml b/impl/maven-core/src/test/resources/projects/versionless-managed-dependency.xml similarity index 100% rename from maven-core/src/test/resources/projects/versionless-managed-dependency.xml rename to impl/maven-core/src/test/resources/projects/versionless-managed-dependency.xml diff --git a/maven-core/src/test/resources/remote-repo-1/maven-test/jars/maven-test-b-1.0.jar b/impl/maven-core/src/test/resources/remote-repo-1/maven-test/jars/maven-test-b-1.0.jar similarity index 100% rename from maven-core/src/test/resources/remote-repo-1/maven-test/jars/maven-test-b-1.0.jar rename to impl/maven-core/src/test/resources/remote-repo-1/maven-test/jars/maven-test-b-1.0.jar diff --git a/maven-core/src/test/resources/remote-repo-1/maven-test/jars/maven-test-b-1.0.jar.md5 b/impl/maven-core/src/test/resources/remote-repo-1/maven-test/jars/maven-test-b-1.0.jar.md5 similarity index 100% rename from maven-core/src/test/resources/remote-repo-1/maven-test/jars/maven-test-b-1.0.jar.md5 rename to impl/maven-core/src/test/resources/remote-repo-1/maven-test/jars/maven-test-b-1.0.jar.md5 diff --git a/maven-core/src/test/resources/remote-repo-1/maven-test/poms/maven-test-b-1.0.pom b/impl/maven-core/src/test/resources/remote-repo-1/maven-test/poms/maven-test-b-1.0.pom similarity index 100% rename from maven-core/src/test/resources/remote-repo-1/maven-test/poms/maven-test-b-1.0.pom rename to impl/maven-core/src/test/resources/remote-repo-1/maven-test/poms/maven-test-b-1.0.pom diff --git a/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar b/impl/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar similarity index 100% rename from maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar rename to impl/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar diff --git a/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version b/impl/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version similarity index 100% rename from maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version rename to impl/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version diff --git a/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar b/impl/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar similarity index 100% rename from maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar rename to impl/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar diff --git a/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version b/impl/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version similarity index 100% rename from maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version rename to impl/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version diff --git a/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar b/impl/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar similarity index 100% rename from maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar rename to impl/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar diff --git a/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar.snapshot-version b/impl/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar.snapshot-version similarity index 100% rename from maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar.snapshot-version rename to impl/maven-core/src/test/resources/remote-repo-1/snapshot-test/jars/maven-snapshot-c-1.0-SNAPSHOT.jar.snapshot-version diff --git a/maven-core/src/test/resources/remote-repo-2/maven-test/jars/maven-test-z-1.0.jar b/impl/maven-core/src/test/resources/remote-repo-2/maven-test/jars/maven-test-z-1.0.jar similarity index 100% rename from maven-core/src/test/resources/remote-repo-2/maven-test/jars/maven-test-z-1.0.jar rename to impl/maven-core/src/test/resources/remote-repo-2/maven-test/jars/maven-test-z-1.0.jar diff --git a/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml b/impl/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml similarity index 100% rename from maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml rename to impl/maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml diff --git a/maven-di/pom.xml b/impl/maven-di/pom.xml similarity index 97% rename from maven-di/pom.xml rename to impl/maven-di/pom.xml index 5c4aae9aff..fcb2fae715 100644 --- a/maven-di/pom.xml +++ b/impl/maven-di/pom.xml @@ -23,6 +23,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-di diff --git a/maven-di/src/main/java/org/apache/maven/di/Injector.java b/impl/maven-di/src/main/java/org/apache/maven/di/Injector.java similarity index 100% rename from maven-di/src/main/java/org/apache/maven/di/Injector.java rename to impl/maven-di/src/main/java/org/apache/maven/di/Injector.java diff --git a/maven-di/src/main/java/org/apache/maven/di/Key.java b/impl/maven-di/src/main/java/org/apache/maven/di/Key.java similarity index 100% rename from maven-di/src/main/java/org/apache/maven/di/Key.java rename to impl/maven-di/src/main/java/org/apache/maven/di/Key.java diff --git a/maven-di/src/main/java/org/apache/maven/di/Scope.java b/impl/maven-di/src/main/java/org/apache/maven/di/Scope.java similarity index 100% rename from maven-di/src/main/java/org/apache/maven/di/Scope.java rename to impl/maven-di/src/main/java/org/apache/maven/di/Scope.java diff --git a/maven-di/src/main/java/org/apache/maven/di/impl/Binding.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/Binding.java similarity index 100% rename from maven-di/src/main/java/org/apache/maven/di/impl/Binding.java rename to impl/maven-di/src/main/java/org/apache/maven/di/impl/Binding.java diff --git a/maven-di/src/main/java/org/apache/maven/di/impl/BindingInitializer.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/BindingInitializer.java similarity index 100% rename from maven-di/src/main/java/org/apache/maven/di/impl/BindingInitializer.java rename to impl/maven-di/src/main/java/org/apache/maven/di/impl/BindingInitializer.java diff --git a/maven-di/src/main/java/org/apache/maven/di/impl/DIException.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/DIException.java similarity index 100% rename from maven-di/src/main/java/org/apache/maven/di/impl/DIException.java rename to impl/maven-di/src/main/java/org/apache/maven/di/impl/DIException.java diff --git a/maven-di/src/main/java/org/apache/maven/di/impl/Dependency.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/Dependency.java similarity index 100% rename from maven-di/src/main/java/org/apache/maven/di/impl/Dependency.java rename to impl/maven-di/src/main/java/org/apache/maven/di/impl/Dependency.java diff --git a/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java similarity index 100% rename from maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java rename to impl/maven-di/src/main/java/org/apache/maven/di/impl/InjectorImpl.java diff --git a/maven-di/src/main/java/org/apache/maven/di/impl/ReflectionUtils.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/ReflectionUtils.java similarity index 100% rename from maven-di/src/main/java/org/apache/maven/di/impl/ReflectionUtils.java rename to impl/maven-di/src/main/java/org/apache/maven/di/impl/ReflectionUtils.java diff --git a/maven-di/src/main/java/org/apache/maven/di/impl/Types.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/Types.java similarity index 100% rename from maven-di/src/main/java/org/apache/maven/di/impl/Types.java rename to impl/maven-di/src/main/java/org/apache/maven/di/impl/Types.java diff --git a/maven-di/src/main/java/org/apache/maven/di/impl/Utils.java b/impl/maven-di/src/main/java/org/apache/maven/di/impl/Utils.java similarity index 100% rename from maven-di/src/main/java/org/apache/maven/di/impl/Utils.java rename to impl/maven-di/src/main/java/org/apache/maven/di/impl/Utils.java diff --git a/maven-repository-metadata/src/site/site.xml b/impl/maven-di/src/site/site.xml similarity index 100% rename from maven-repository-metadata/src/site/site.xml rename to impl/maven-di/src/site/site.xml diff --git a/maven-di/src/test/java/org/apache/maven/di/impl/InjectorImplTest.java b/impl/maven-di/src/test/java/org/apache/maven/di/impl/InjectorImplTest.java similarity index 100% rename from maven-di/src/test/java/org/apache/maven/di/impl/InjectorImplTest.java rename to impl/maven-di/src/test/java/org/apache/maven/di/impl/InjectorImplTest.java diff --git a/maven-di/src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java b/impl/maven-di/src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java similarity index 100% rename from maven-di/src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java rename to impl/maven-di/src/test/java/org/apache/maven/di/impl/TypeUtilsTest.java diff --git a/maven-api-impl/pom.xml b/impl/maven-impl/pom.xml similarity index 92% rename from maven-api-impl/pom.xml rename to impl/maven-impl/pom.xml index f75877860e..7e3b3f9849 100644 --- a/maven-api-impl/pom.xml +++ b/impl/maven-impl/pom.xml @@ -23,9 +23,11 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ - maven-api-impl + maven-impl Maven API Implementation Provides the implementation classes for the Maven API @@ -89,7 +91,7 @@ under the License. org.apache.maven - maven-xml-impl + maven-xml com.fasterxml.woodstox @@ -169,8 +171,8 @@ under the License. generate-sources 2.0.0 - ${project.basedir}/../api/maven-api-settings - ${project.basedir}/../src/mdo + ${project.basedir}/../../api/maven-api-settings + ${project.basedir}/../../src/mdo src/main/mdo/settings.mdo @@ -198,8 +200,8 @@ under the License. generate-sources 1.2.0 - ${project.basedir}/../api/maven-api-toolchain - ${project.basedir}/../src/mdo + ${project.basedir}/../../api/maven-api-toolchain + ${project.basedir}/../../src/mdo src/main/mdo/toolchains.mdo @@ -226,8 +228,8 @@ under the License. generate-sources 1.1.0 - ${project.basedir}/../api/maven-api-metadata - ${project.basedir}/../src/mdo + ${project.basedir}/../../api/maven-api-metadata + ${project.basedir}/../../src/mdo src/main/mdo/metadata.mdo @@ -249,8 +251,8 @@ under the License. generate-sources 4.1.0 - ${project.basedir}/../api/maven-api-model - ${project.basedir}/../src/mdo + ${project.basedir}/../../api/maven-api-model + ${project.basedir}/../../src/mdo src/main/mdo/maven.mdo diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/DependencyManagementImporter.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/DependencyManagementImporter.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/DependencyManagementImporter.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/DependencyManagementImporter.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/DependencyManagementInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/DependencyManagementInjector.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/DependencyManagementInjector.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/DependencyManagementInjector.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/InheritanceAssembler.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/InheritanceAssembler.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/InheritanceAssembler.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/InheritanceAssembler.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/LifecycleBindingsInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/LifecycleBindingsInjector.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/LifecycleBindingsInjector.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/LifecycleBindingsInjector.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelCache.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelCache.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelCache.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelCache.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelCacheFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelCacheFactory.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelCacheFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelCacheFactory.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelInterpolator.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelInterpolator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelInterpolator.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelInterpolator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelNormalizer.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelNormalizer.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelNormalizer.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelNormalizer.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelPathTranslator.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelPathTranslator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelPathTranslator.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelPathTranslator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelProcessor.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelProcessor.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelProcessor.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelProcessor.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelResolver.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelResolver.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelResolverException.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelResolverException.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelResolverException.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelResolverException.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelUrlNormalizer.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelUrlNormalizer.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelUrlNormalizer.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelUrlNormalizer.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelValidator.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelValidator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelValidator.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelValidator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelVersionParser.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelVersionParser.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ModelVersionParser.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ModelVersionParser.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/PathTranslator.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/PathTranslator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/PathTranslator.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/PathTranslator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/PluginConfigurationExpander.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/PluginConfigurationExpander.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/PluginConfigurationExpander.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/PluginConfigurationExpander.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/PluginManagementInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/PluginManagementInjector.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/PluginManagementInjector.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/PluginManagementInjector.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ProfileActivationContext.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ProfileActivationContext.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ProfileActivationContext.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ProfileActivationContext.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ProfileActivator.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ProfileActivator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ProfileActivator.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ProfileActivator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ProfileInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ProfileInjector.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ProfileInjector.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ProfileInjector.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/ProfileSelector.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ProfileSelector.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/ProfileSelector.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/ProfileSelector.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/RootDetector.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/RootDetector.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/RootDetector.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/RootDetector.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/RootLocator.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/RootLocator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/RootLocator.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/RootLocator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/api/services/model/UrlNormalizer.java b/impl/maven-impl/src/main/java/org/apache/maven/api/services/model/UrlNormalizer.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/api/services/model/UrlNormalizer.java rename to impl/maven-impl/src/main/java/org/apache/maven/api/services/model/UrlNormalizer.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/AbstractNode.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractNode.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/AbstractNode.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractNode.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AbstractSession.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/AetherDependencyWrapper.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AetherDependencyWrapper.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/AetherDependencyWrapper.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/AetherDependencyWrapper.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinates.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinates.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinates.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinates.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinatesFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinatesFactory.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinatesFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinatesFactory.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactFactory.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactFactory.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultBuilderProblem.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultBuilderProblem.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultBuilderProblem.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultBuilderProblem.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmService.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmService.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmService.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmService.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinates.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinates.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinates.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinates.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinatesFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinatesFactory.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinatesFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinatesFactory.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolverResult.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolverResult.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolverResult.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolverResult.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDownloadedArtifact.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDownloadedArtifact.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDownloadedArtifact.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultDownloadedArtifact.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilder.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilder.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilder.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelUrlNormalizer.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelUrlNormalizer.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelUrlNormalizer.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelUrlNormalizer.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelVersionParser.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultNode.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultNode.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultNode.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultNode.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultPluginConfigurationExpander.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultPluginConfigurationExpander.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultPluginConfigurationExpander.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultPluginConfigurationExpander.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultProducedArtifact.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultProducedArtifact.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultProducedArtifact.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultProducedArtifact.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsValidator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsValidator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsValidator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsValidator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultSuperPomProvider.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSuperPomProvider.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultSuperPomProvider.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultSuperPomProvider.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultUrlNormalizer.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultUrlNormalizer.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultUrlNormalizer.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultUrlNormalizer.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionParser.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionParser.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionParser.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionParser.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionRangeResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionRangeResolver.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionRangeResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionRangeResolver.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionResolver.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/DefaultVersionResolver.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/ExtensibleEnumRegistries.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/ExtensibleEnumRegistries.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/ExtensibleEnumRegistries.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/ExtensibleEnumRegistries.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/InternalSession.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/InternalSession.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/InternalSession.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/InternalSession.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/MappedCollection.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/MappedCollection.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/MappedCollection.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/MappedCollection.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/MappedList.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/MappedList.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/MappedList.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/MappedList.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/PathModularization.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PathModularization.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/PathModularization.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PathModularization.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/PathModularizationCache.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PathModularizationCache.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/PathModularizationCache.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PathModularizationCache.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/PropertiesAsMap.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PropertiesAsMap.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/PropertiesAsMap.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/PropertiesAsMap.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/SettingsUtilsV4.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/SettingsUtilsV4.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/SettingsUtilsV4.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/SettingsUtilsV4.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/StaxLocation.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/StaxLocation.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/StaxLocation.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/StaxLocation.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/Utils.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/Utils.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/Utils.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/Utils.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/WrapperNode.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/WrapperNode.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/WrapperNode.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/WrapperNode.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/di/MojoExecutionScope.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/MojoExecutionScope.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/di/MojoExecutionScope.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/MojoExecutionScope.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/di/OutOfScopeException.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/OutOfScopeException.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/di/OutOfScopeException.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/OutOfScopeException.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/di/SessionScope.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/SessionScope.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/di/SessionScope.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/di/SessionScope.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporter.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporter.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporter.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporter.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementInjector.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementInjector.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementInjector.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInheritanceAssembler.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInheritanceAssembler.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInheritanceAssembler.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInheritanceAssembler.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInterpolator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInterpolator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInterpolator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultInterpolator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultLifecycleBindingsInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultLifecycleBindingsInjector.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultLifecycleBindingsInjector.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultLifecycleBindingsInjector.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilderResult.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilderResult.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilderResult.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilderResult.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCache.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCache.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCache.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCache.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCacheFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCacheFactory.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCacheFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelCacheFactory.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelInterpolator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelInterpolator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelInterpolator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelInterpolator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelNormalizer.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelNormalizer.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelNormalizer.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelNormalizer.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelPathTranslator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelPathTranslator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelPathTranslator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelPathTranslator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProblem.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProblem.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProblem.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProblem.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProcessor.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProcessor.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProcessor.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelProcessor.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPathTranslator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPathTranslator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPathTranslator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPathTranslator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPluginManagementInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPluginManagementInjector.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPluginManagementInjector.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultPluginManagementInjector.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileActivationContext.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileActivationContext.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileActivationContext.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileActivationContext.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileInjector.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileInjector.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileInjector.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileInjector.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileSelector.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileSelector.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileSelector.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultProfileSelector.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/FileToRawModelMerger.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/FileToRawModelMerger.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/FileToRawModelMerger.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/FileToRawModelMerger.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/Graph.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/Graph.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/Graph.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/Graph.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/MavenBuildTimestamp.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/MavenBuildTimestamp.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/MavenBuildTimestamp.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/MavenBuildTimestamp.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/MavenModelMerger.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/MavenModelMerger.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/MavenModelMerger.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/MavenModelMerger.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/ModelData.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/ModelData.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/ModelData.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/ModelData.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/ModelProblemUtils.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/ModelProblemUtils.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/ModelProblemUtils.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/ModelProblemUtils.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/ProfileActivationFilePathInterpolator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/ProfileActivationFilePathInterpolator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/ProfileActivationFilePathInterpolator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/ProfileActivationFilePathInterpolator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/Result.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/Result.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/Result.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/Result.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/FileProfileActivator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/FileProfileActivator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/FileProfileActivator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/FileProfileActivator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/JdkVersionProfileActivator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/JdkVersionProfileActivator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/JdkVersionProfileActivator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/JdkVersionProfileActivator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/OperatingSystemProfileActivator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/OperatingSystemProfileActivator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/OperatingSystemProfileActivator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/OperatingSystemProfileActivator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/Os.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/Os.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/Os.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/Os.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PackagingProfileActivator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PackagingProfileActivator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PackagingProfileActivator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PackagingProfileActivator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PropertyProfileActivator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PropertyProfileActivator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PropertyProfileActivator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/profile/PropertyProfileActivator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ClassMap.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ClassMap.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ClassMap.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ClassMap.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/IntrospectionException.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/IntrospectionException.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/IntrospectionException.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/IntrospectionException.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/MethodMap.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/MethodMap.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/MethodMap.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/MethodMap.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractor.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractor.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractor.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractor.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DefaultRootLocator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DefaultRootLocator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DefaultRootLocator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DefaultRootLocator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DotMvnRootDetector.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DotMvnRootDetector.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DotMvnRootDetector.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DotMvnRootDetector.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/PomXmlRootDetector.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/PomXmlRootDetector.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/PomXmlRootDetector.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/PomXmlRootDetector.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorReaderDelegate.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorReaderDelegate.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorReaderDelegate.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorReaderDelegate.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorUtils.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorUtils.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorUtils.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/ArtifactDescriptorUtils.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionRangeResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionRangeResolver.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionRangeResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionRangeResolver.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionResolver.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionResolver.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionResolver.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultVersionResolver.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadata.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadata.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadata.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadata.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadataGenerator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadataGenerator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadataGenerator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/LocalSnapshotMetadataGenerator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenArtifactRelocationSource.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenArtifactRelocationSource.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenArtifactRelocationSource.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenArtifactRelocationSource.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenMetadata.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenMetadata.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenMetadata.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenMetadata.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSessionBuilderSupplier.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSnapshotMetadata.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSnapshotMetadata.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSnapshotMetadata.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenSnapshotMetadata.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenVersionScheme.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenVersionScheme.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenVersionScheme.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenVersionScheme.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenWorkspaceReader.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenWorkspaceReader.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenWorkspaceReader.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/MavenWorkspaceReader.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadata.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadata.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadata.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadata.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGenerator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGenerator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGenerator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGenerator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGeneratorFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGeneratorFactory.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGeneratorFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/PluginsMetadataGeneratorFactory.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RelocatedArtifact.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadata.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadata.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadata.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadata.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadataGenerator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadataGenerator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadataGenerator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RemoteSnapshotMetadataGenerator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RequestTraceHelper.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RequestTraceHelper.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/RequestTraceHelper.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/RequestTraceHelper.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/SnapshotMetadataGeneratorFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/SnapshotMetadataGeneratorFactory.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/SnapshotMetadataGeneratorFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/SnapshotMetadataGeneratorFactory.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadata.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadata.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadata.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadata.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGenerator.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGenerator.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGenerator.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGenerator.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGeneratorFactory.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGeneratorFactory.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGeneratorFactory.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/VersionsMetadataGeneratorFactory.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/FatArtifactTraverser.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/FatArtifactTraverser.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/FatArtifactTraverser.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/FatArtifactTraverser.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/MavenArtifactProperties.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/MavenArtifactProperties.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/MavenArtifactProperties.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/artifact/MavenArtifactProperties.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/package-info.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/package-info.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/package-info.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/package-info.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/DistributionManagementArtifactRelocationSource.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/relocation/UserPropertiesArtifactRelocationSource.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven3ScopeManagerConfiguration.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/scopes/Maven4ScopeManagerConfiguration.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultType.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultType.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultType.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultType.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultTypeProvider.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultTypeProvider.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultTypeProvider.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/resolver/type/DefaultTypeProvider.java diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/util/PhasingExecutor.java b/impl/maven-impl/src/main/java/org/apache/maven/internal/impl/util/PhasingExecutor.java similarity index 100% rename from maven-api-impl/src/main/java/org/apache/maven/internal/impl/util/PhasingExecutor.java rename to impl/maven-impl/src/main/java/org/apache/maven/internal/impl/util/PhasingExecutor.java diff --git a/maven-api-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootDetector b/impl/maven-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootDetector similarity index 100% rename from maven-api-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootDetector rename to impl/maven-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootDetector diff --git a/maven-api-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootLocator b/impl/maven-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootLocator similarity index 100% rename from maven-api-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootLocator rename to impl/maven-impl/src/main/resources/META-INF/services/org.apache.maven.api.services.model.RootLocator diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.0.0.xml similarity index 100% rename from maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml rename to impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.0.0.xml diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.1.0.xml b/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.1.0.xml similarity index 100% rename from maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.1.0.xml rename to impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.1.0.xml diff --git a/maven-resolver-provider/src/site/site.xml b/impl/maven-impl/src/site/site.xml similarity index 100% rename from maven-resolver-provider/src/site/site.xml rename to impl/maven-impl/src/site/site.xml diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/DefaultModelVersionParserTest.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultModelVersionParserTest.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/DefaultModelVersionParserTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultModelVersionParserTest.java diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsBuilderFactoryTest.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsBuilderFactoryTest.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsBuilderFactoryTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsBuilderFactoryTest.java diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsValidatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsValidatorTest.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsValidatorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsValidatorTest.java diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/model/ComplexActivationTest.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/ComplexActivationTest.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/model/ComplexActivationTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/ComplexActivationTest.java diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporterTest.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporterTest.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporterTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultDependencyManagementImporterTest.java diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultInterpolatorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultInterpolatorTest.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultInterpolatorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/DefaultInterpolatorTest.java diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/model/MavenModelMergerTest.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/MavenModelMergerTest.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/model/MavenModelMergerTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/MavenModelMergerTest.java diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractorTest.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/model/reflection/ReflectionValueExtractorTest.java diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/resolver/DefaultModelResolverTest.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/resolver/DefaultModelResolverTest.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/resolver/DefaultModelResolverTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/resolver/DefaultModelResolverTest.java diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/ApiRunner.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/ApiRunner.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/ApiRunner.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/ApiRunner.java diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/DiTest.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/DiTest.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/DiTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/DiTest.java diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/RepositorySystemSupplier.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/RepositorySystemSupplier.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/RepositorySystemSupplier.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/RepositorySystemSupplier.java diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/TestApiStandalone.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/TestApiStandalone.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/TestApiStandalone.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/standalone/TestApiStandalone.java diff --git a/maven-api-impl/src/test/java/org/apache/maven/internal/impl/util/PhasingExecutorTest.java b/impl/maven-impl/src/test/java/org/apache/maven/internal/impl/util/PhasingExecutorTest.java similarity index 100% rename from maven-api-impl/src/test/java/org/apache/maven/internal/impl/util/PhasingExecutorTest.java rename to impl/maven-impl/src/test/java/org/apache/maven/internal/impl/util/PhasingExecutorTest.java diff --git a/maven-core/src/test/remote-repo/org/apache/apache/1/apache-1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/apache/1/apache-1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/apache/1/apache-1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/apache/1/apache-1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/apache/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/apache/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/apache/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/apache/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/bom/0.1/bom-0.1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/bom/0.1/bom-0.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/bom/0.1/bom-0.1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/bom/0.1/bom-0.1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/bom/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/bom/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/bom/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/bom/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/parent/0.1/parent-0.1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/parent/0.1/parent-0.1.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/parent/0.1/parent-0.1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/parent/0.1/parent-0.1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/parent/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/parent/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/parent/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/parent/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.jar b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.jar similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.jar rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.jar diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/maven-it-plugin-0.1.pom diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/pom.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/pom.xml similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/pom.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/0.1/pom.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-it-plugin/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/its/plugins/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/its/plugins/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar b/impl/maven-impl/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar diff --git a/maven-core/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/maven/2.0/maven-2.0.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/maven/2.0/maven-2.0.pom similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/maven/2.0/maven-2.0.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/maven/2.0/maven-2.0.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.jar b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.jar similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.jar rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.jar diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/0.1/maven-clean-plugin-0.1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-clean-plugin/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.jar b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.jar similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.jar rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.jar diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/0.1/maven-compiler-plugin-0.1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-compiler-plugin/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.jar b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.jar similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.jar rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.jar diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/0.1/maven-deploy-plugin-0.1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-deploy-plugin/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.jar b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.jar similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.jar rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.jar diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/0.1/maven-install-plugin-0.1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-install-plugin/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.jar b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.jar similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.jar rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.jar diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/0.1/maven-jar-plugin-0.1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-jar-plugin/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.jar b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.jar similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.jar rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.jar diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/0.1/maven-plugin-plugin-0.1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-plugin-plugin/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.jar b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.jar similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.jar rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.jar diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/0.1/maven-resources-plugin-0.1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-resources-plugin/maven-metadata.xml diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.jar b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.jar similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.jar rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.jar diff --git a/maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.pom b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.pom similarity index 100% rename from maven-api-impl/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.pom rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/0.1/maven-surefire-plugin-0.1.pom diff --git a/maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml b/impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml similarity index 100% rename from maven-core/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml rename to impl/maven-impl/src/test/remote-repo/org/apache/maven/plugins/maven-surefire-plugin/maven-metadata.xml diff --git a/maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar b/impl/maven-impl/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar similarity index 100% rename from maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar rename to impl/maven-impl/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar diff --git a/maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom b/impl/maven-impl/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom similarity index 100% rename from maven-core/src/test/resources/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom rename to impl/maven-impl/src/test/remote-repo/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom diff --git a/maven-api-impl/src/test/resources/poms/factory/complex.xml b/impl/maven-impl/src/test/resources/poms/factory/complex.xml similarity index 100% rename from maven-api-impl/src/test/resources/poms/factory/complex.xml rename to impl/maven-impl/src/test/resources/poms/factory/complex.xml diff --git a/maven-api-impl/src/test/resources/poms/factory/complexExistsAndMissing.xml b/impl/maven-impl/src/test/resources/poms/factory/complexExistsAndMissing.xml similarity index 100% rename from maven-api-impl/src/test/resources/poms/factory/complexExistsAndMissing.xml rename to impl/maven-impl/src/test/resources/poms/factory/complexExistsAndMissing.xml diff --git a/maven-api-impl/src/test/resources/settings-simple.xml b/impl/maven-impl/src/test/resources/settings-simple.xml similarity index 100% rename from maven-api-impl/src/test/resources/settings-simple.xml rename to impl/maven-impl/src/test/resources/settings-simple.xml diff --git a/maven-jline/pom.xml b/impl/maven-jline/pom.xml similarity index 98% rename from maven-jline/pom.xml rename to impl/maven-jline/pom.xml index c3a4bdbf40..79bf69e8ce 100644 --- a/maven-jline/pom.xml +++ b/impl/maven-jline/pom.xml @@ -23,6 +23,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-jline diff --git a/maven-jline/src/main/java/org/apache/maven/jline/FastTerminal.java b/impl/maven-jline/src/main/java/org/apache/maven/jline/FastTerminal.java similarity index 100% rename from maven-jline/src/main/java/org/apache/maven/jline/FastTerminal.java rename to impl/maven-jline/src/main/java/org/apache/maven/jline/FastTerminal.java diff --git a/maven-jline/src/main/java/org/apache/maven/jline/JLineMessageBuilderFactory.java b/impl/maven-jline/src/main/java/org/apache/maven/jline/JLineMessageBuilderFactory.java similarity index 100% rename from maven-jline/src/main/java/org/apache/maven/jline/JLineMessageBuilderFactory.java rename to impl/maven-jline/src/main/java/org/apache/maven/jline/JLineMessageBuilderFactory.java diff --git a/maven-jline/src/main/java/org/apache/maven/jline/MessageUtils.java b/impl/maven-jline/src/main/java/org/apache/maven/jline/MessageUtils.java similarity index 100% rename from maven-jline/src/main/java/org/apache/maven/jline/MessageUtils.java rename to impl/maven-jline/src/main/java/org/apache/maven/jline/MessageUtils.java diff --git a/maven-settings-builder/src/site/site.xml b/impl/maven-jline/src/site/site.xml similarity index 100% rename from maven-settings-builder/src/site/site.xml rename to impl/maven-jline/src/site/site.xml diff --git a/maven-logging/pom.xml b/impl/maven-logging/pom.xml similarity index 98% rename from maven-logging/pom.xml rename to impl/maven-logging/pom.xml index 09c2105ebc..ef9b1965bf 100644 --- a/maven-logging/pom.xml +++ b/impl/maven-logging/pom.xml @@ -23,6 +23,8 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ maven-logging diff --git a/maven-logging/src/main/java/org/apache/maven/logging/api/LogLevelRecorder.java b/impl/maven-logging/src/main/java/org/apache/maven/logging/api/LogLevelRecorder.java similarity index 100% rename from maven-logging/src/main/java/org/apache/maven/logging/api/LogLevelRecorder.java rename to impl/maven-logging/src/main/java/org/apache/maven/logging/api/LogLevelRecorder.java diff --git a/maven-logging/src/main/java/org/apache/maven/slf4j/DefaultLogLevelRecorder.java b/impl/maven-logging/src/main/java/org/apache/maven/slf4j/DefaultLogLevelRecorder.java similarity index 100% rename from maven-logging/src/main/java/org/apache/maven/slf4j/DefaultLogLevelRecorder.java rename to impl/maven-logging/src/main/java/org/apache/maven/slf4j/DefaultLogLevelRecorder.java diff --git a/maven-logging/src/main/java/org/apache/maven/slf4j/MavenBaseLogger.java b/impl/maven-logging/src/main/java/org/apache/maven/slf4j/MavenBaseLogger.java similarity index 100% rename from maven-logging/src/main/java/org/apache/maven/slf4j/MavenBaseLogger.java rename to impl/maven-logging/src/main/java/org/apache/maven/slf4j/MavenBaseLogger.java diff --git a/maven-logging/src/main/java/org/apache/maven/slf4j/MavenFailOnSeverityLogger.java b/impl/maven-logging/src/main/java/org/apache/maven/slf4j/MavenFailOnSeverityLogger.java similarity index 100% rename from maven-logging/src/main/java/org/apache/maven/slf4j/MavenFailOnSeverityLogger.java rename to impl/maven-logging/src/main/java/org/apache/maven/slf4j/MavenFailOnSeverityLogger.java diff --git a/maven-logging/src/main/java/org/apache/maven/slf4j/MavenLoggerFactory.java b/impl/maven-logging/src/main/java/org/apache/maven/slf4j/MavenLoggerFactory.java similarity index 100% rename from maven-logging/src/main/java/org/apache/maven/slf4j/MavenLoggerFactory.java rename to impl/maven-logging/src/main/java/org/apache/maven/slf4j/MavenLoggerFactory.java diff --git a/maven-logging/src/main/java/org/apache/maven/slf4j/MavenServiceProvider.java b/impl/maven-logging/src/main/java/org/apache/maven/slf4j/MavenServiceProvider.java similarity index 100% rename from maven-logging/src/main/java/org/apache/maven/slf4j/MavenServiceProvider.java rename to impl/maven-logging/src/main/java/org/apache/maven/slf4j/MavenServiceProvider.java diff --git a/maven-logging/src/main/java/org/apache/maven/slf4j/MavenSimpleLogger.java b/impl/maven-logging/src/main/java/org/apache/maven/slf4j/MavenSimpleLogger.java similarity index 100% rename from maven-logging/src/main/java/org/apache/maven/slf4j/MavenSimpleLogger.java rename to impl/maven-logging/src/main/java/org/apache/maven/slf4j/MavenSimpleLogger.java diff --git a/maven-logging/src/main/java/org/apache/maven/slf4j/OutputChoice.java b/impl/maven-logging/src/main/java/org/apache/maven/slf4j/OutputChoice.java similarity index 100% rename from maven-logging/src/main/java/org/apache/maven/slf4j/OutputChoice.java rename to impl/maven-logging/src/main/java/org/apache/maven/slf4j/OutputChoice.java diff --git a/maven-logging/src/main/java/org/apache/maven/slf4j/SimpleLoggerConfiguration.java b/impl/maven-logging/src/main/java/org/apache/maven/slf4j/SimpleLoggerConfiguration.java similarity index 100% rename from maven-logging/src/main/java/org/apache/maven/slf4j/SimpleLoggerConfiguration.java rename to impl/maven-logging/src/main/java/org/apache/maven/slf4j/SimpleLoggerConfiguration.java diff --git a/maven-logging/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/impl/maven-logging/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider similarity index 100% rename from maven-logging/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider rename to impl/maven-logging/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider diff --git a/maven-logging/src/site/apt/index.apt b/impl/maven-logging/src/site/apt/index.apt similarity index 100% rename from maven-logging/src/site/apt/index.apt rename to impl/maven-logging/src/site/apt/index.apt diff --git a/maven-settings/src/site/site.xml b/impl/maven-logging/src/site/site.xml similarity index 100% rename from maven-settings/src/site/site.xml rename to impl/maven-logging/src/site/site.xml diff --git a/maven-logging/src/test/java/org/apache/maven/slf4j/LogLevelRecorderTest.java b/impl/maven-logging/src/test/java/org/apache/maven/slf4j/LogLevelRecorderTest.java similarity index 100% rename from maven-logging/src/test/java/org/apache/maven/slf4j/LogLevelRecorderTest.java rename to impl/maven-logging/src/test/java/org/apache/maven/slf4j/LogLevelRecorderTest.java diff --git a/maven-logging/src/test/java/org/apache/maven/slf4j/MavenLoggerFactoryTest.java b/impl/maven-logging/src/test/java/org/apache/maven/slf4j/MavenLoggerFactoryTest.java similarity index 100% rename from maven-logging/src/test/java/org/apache/maven/slf4j/MavenLoggerFactoryTest.java rename to impl/maven-logging/src/test/java/org/apache/maven/slf4j/MavenLoggerFactoryTest.java diff --git a/maven-logging/src/test/java/org/apache/maven/slf4j/MavenSimpleLoggerTest.java b/impl/maven-logging/src/test/java/org/apache/maven/slf4j/MavenSimpleLoggerTest.java similarity index 100% rename from maven-logging/src/test/java/org/apache/maven/slf4j/MavenSimpleLoggerTest.java rename to impl/maven-logging/src/test/java/org/apache/maven/slf4j/MavenSimpleLoggerTest.java diff --git a/maven-xml-impl/pom.xml b/impl/maven-xml/pom.xml similarity index 95% rename from maven-xml-impl/pom.xml rename to impl/maven-xml/pom.xml index 9d11fdb822..fe5b253e21 100644 --- a/maven-xml-impl/pom.xml +++ b/impl/maven-xml/pom.xml @@ -23,9 +23,11 @@ under the License. org.apache.maven maven 4.0.0-beta-6-SNAPSHOT + + ../../ - maven-xml-impl + maven-xml Maven XML API Implementation Provides the implementation classes for the Maven API XML @@ -62,7 +64,7 @@ under the License. org.apache.maven - maven-xml-impl + maven-xml diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/ImmutableCollections.java b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/ImmutableCollections.java similarity index 100% rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/ImmutableCollections.java rename to impl/maven-xml/src/main/java/org/apache/maven/internal/xml/ImmutableCollections.java diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeBuilder.java b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlNodeBuilder.java similarity index 100% rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeBuilder.java rename to impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlNodeBuilder.java diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java similarity index 100% rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java rename to impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlNodeImpl.java diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeStaxBuilder.java b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlNodeStaxBuilder.java similarity index 100% rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeStaxBuilder.java rename to impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlNodeStaxBuilder.java diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeWriter.java b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlNodeWriter.java similarity index 100% rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlNodeWriter.java rename to impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlNodeWriter.java diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlPlexusConfiguration.java b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlPlexusConfiguration.java similarity index 100% rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/XmlPlexusConfiguration.java rename to impl/maven-xml/src/main/java/org/apache/maven/internal/xml/XmlPlexusConfiguration.java diff --git a/maven-xml-impl/src/main/java/org/apache/maven/internal/xml/package-info.java b/impl/maven-xml/src/main/java/org/apache/maven/internal/xml/package-info.java similarity index 100% rename from maven-xml-impl/src/main/java/org/apache/maven/internal/xml/package-info.java rename to impl/maven-xml/src/main/java/org/apache/maven/internal/xml/package-info.java diff --git a/maven-xml-impl/src/site/markdown/index.md b/impl/maven-xml/src/site/markdown/index.md similarity index 100% rename from maven-xml-impl/src/site/markdown/index.md rename to impl/maven-xml/src/site/markdown/index.md diff --git a/maven-xml-impl/src/site/site.xml b/impl/maven-xml/src/site/site.xml similarity index 100% rename from maven-xml-impl/src/site/site.xml rename to impl/maven-xml/src/site/site.xml diff --git a/maven-xml-impl/src/test/java/org/apache/maven/internal/xml/XmlNodeBuilderTest.java b/impl/maven-xml/src/test/java/org/apache/maven/internal/xml/XmlNodeBuilderTest.java similarity index 100% rename from maven-xml-impl/src/test/java/org/apache/maven/internal/xml/XmlNodeBuilderTest.java rename to impl/maven-xml/src/test/java/org/apache/maven/internal/xml/XmlNodeBuilderTest.java diff --git a/maven-xml-impl/src/test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java b/impl/maven-xml/src/test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java similarity index 100% rename from maven-xml-impl/src/test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java rename to impl/maven-xml/src/test/java/org/apache/maven/internal/xml/XmlNodeImplTest.java diff --git a/impl/pom.xml b/impl/pom.xml new file mode 100644 index 0000000000..294c9029b5 --- /dev/null +++ b/impl/pom.xml @@ -0,0 +1,42 @@ + + + + 4.0.0 + + org.apache.maven + maven + 4.0.0-beta-6-SNAPSHOT + + + maven-impl-modules + pom + + Maven Implementation Modules + + + maven-impl + maven-di + maven-xml + maven-jline + maven-logging + maven-core + maven-cli + + diff --git a/maven-docgen/pom.xml b/maven-docgen/pom.xml index cf04acfe4d..edb3a5e148 100644 --- a/maven-docgen/pom.xml +++ b/maven-docgen/pom.xml @@ -37,7 +37,7 @@ org.apache.maven - maven-api-impl + maven-impl org.apache.maven diff --git a/pom.xml b/pom.xml index 6c6197ff44..8c65724c28 100644 --- a/pom.xml +++ b/pom.xml @@ -100,28 +100,10 @@ under the License. api - maven-api-impl - maven-plugin-api - maven-builder-support - maven-model - maven-model-builder - maven-di - maven-xml-impl - maven-jline - maven-logging - maven-core - maven-settings - maven-settings-builder - maven-artifact - maven-resolver-provider - maven-repository-metadata - maven-embedder - maven-cli - maven-compat - apache-maven - maven-toolchain-model - maven-toolchain-builder + impl + compat maven-docgen + apache-maven @@ -224,7 +206,7 @@ under the License. org.apache.maven - maven-api-impl + maven-impl ${project.version} @@ -344,7 +326,7 @@ under the License. org.apache.maven - maven-xml-impl + maven-xml ${project.version}