From 20f8323b0a993799f77db49c787829449a17b8c0 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Mon, 26 Oct 2009 20:16:00 +0000 Subject: [PATCH] [MNG-4221] Push all repository/artifact related code into a legacy module and create a backward compat layer for external consumers o Refactored code to make maven-compat depend on maven-core, this got ugly regarding some tests which to a high degree depend on a full-blown repository system git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@829934 13f79535-47bb-0310-9956-ffa450edef68 --- build.xml | 2 +- maven-artifact/pom.xml | 34 +- .../resolver/ArtifactNotFoundException.java | 5 +- maven-compat/pom.xml | 18 +- .../versioning/ManagedVersionMap.java | 1 + .../project/DefaultMavenProjectBuilder.java | 0 .../project/InvalidProjectModelException.java | 38 --- .../maven/project/MavenProjectBuilder.java | 0 .../AbstractStringBasedModelInterpolator.java | 0 .../BuildTimestampValueSource.java | 0 .../ModelInterpolationException.java | 0 .../interpolation/ModelInterpolator.java | 0 .../PathTranslatingPostProcessor.java | 0 .../RegexBasedModelInterpolator.java | 0 .../StringSearchModelInterpolator.java | 0 .../artifact/metadata/TestMetadataSource.java | 2 +- .../resolver/ArtifactResolverTest.java | 1 + .../project/AbstractMavenProjectTestCase.java | 164 ++++++++++ .../maven/project/EmptyLifecycleExecutor.java | 155 ++++++++++ .../apache/maven/project/ModelUtilsTest.java | 0 .../maven/project/ProjectClasspathTest.java | 0 .../maven/project/TestArtifactResolver.java | 0 .../project/TestMavenRepositorySystem.java | 0 .../maven/project/TestProjectBuilder.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 .../repository/LegacyRepositoryLayout.java | 89 ++++++ .../LegacyRepositorySystemTest.java | 1 - .../IdeWorkspaceRepositoryTest.java | 0 .../TestIdeWorkspaceRepository.java | 0 .../org/apache/maven/its/a/0.1/a-0.1.jar | Bin 0 -> 1898 bytes .../org/apache/maven/its/a/0.1/a-0.1.pom | 41 +++ .../org/apache/maven/its/a/maven-metadata.xml | 12 + .../org/apache/maven/its/b/0.1/b-0.1.jar | Bin 0 -> 1936 bytes .../org/apache/maven/its/b/0.1/b-0.1.pom | 49 +++ .../org/apache/maven/its/b/maven-metadata.xml | 12 + .../repository-system/maven-core-2.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 | 1 + .../maven-test/jars/maven-test-a-1.0.jar | 1 + .../maven-test/jars/maven-test-b-1.0.jar | 1 + .../maven-test/jars/maven-test-c-1.0.jar | 1 + .../maven-test/jars/maven-test-d-1.0.jar | 1 + .../maven-test/poms/maven-test-a-1.0.pom | 23 ++ .../maven-test/poms/maven-test-b-1.0.pom | 23 ++ .../maven-test/poms/maven-test-c-1.0.pom | 16 + .../maven-test/poms/maven-test-d-1.1.pom | 7 + .../maven-test/poms/maven-test-d-1.2.pom | 7 + .../jars/maven-snapshot-a-1.0-SNAPSHOT.jar | 1 + ...apshot-a-1.0-SNAPSHOT.jar.snapshot-version | 1 + .../jars/maven-snapshot-b-1.0-SNAPSHOT.jar | 1 + ...apshot-b-1.0-SNAPSHOT.jar.snapshot-version | 1 + .../jars/maven-snapshot-e-1.0-SNAPSHOT.jar | 1 + ...apshot-e-1.0-SNAPSHOT.jar.snapshot-version | 1 + .../maven-test-snapshot-resolving-1.0.pom | 49 +++ .../resolver/ArtifactResolverTest.xml | 54 ++++ .../project/AbstractMavenProjectTestCase.xml | 9 + .../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-core/pom.xml | 20 +- ...DependencyResolutionRequiredException.java | 0 .../artifact/InvalidRepositoryException.java | 0 .../artifact/factory/ArtifactFactory.java | 0 .../handler/DefaultArtifactHandler.java | 0 .../manager/ArtifactHandlerManager.java | 0 .../DefaultArtifactHandlerManager.java | 0 .../metadata/AbstractArtifactMetadata.java | 0 .../ArtifactMetadataRetrievalException.java | 0 .../metadata/ArtifactMetadataSource.java | 0 .../artifact/metadata/ResolutionGroup.java | 0 .../repository/DefaultRepositoryRequest.java | 0 .../repository/MavenArtifactRepository.java | 0 .../artifact/repository/RepositoryCache.java | 0 .../repository/RepositoryRequest.java | 0 .../layout/DefaultRepositoryLayout.java | 0 .../metadata/AbstractRepositoryMetadata.java | 0 .../metadata/ArtifactRepositoryMetadata.java | 0 .../metadata/RepositoryMetadata.java | 0 ...RepositoryMetadataDeploymentException.java | 0 ...positoryMetadataInstallationException.java | 0 .../metadata/RepositoryMetadataManager.java | 0 ...RepositoryMetadataResolutionException.java | 0 .../metadata/io/DefaultMetadataReader.java | 0 .../metadata/io/MetadataParseException.java | 0 .../metadata/io/MetadataReader.java | 0 .../resolver/ArtifactResolutionRequest.java | 0 .../resolver/ArtifactResolutionResult.java | 1 - .../DefaultResolutionErrorHandler.java | 0 .../resolver/ResolutionErrorHandler.java | 0 .../artifact/resolver/ResolutionListener.java | 0 .../artifact/resolver/ResolutionNode.java | 0 .../filter/AbstractScopeArtifactFilter.java | 0 .../resolver/filter/AndArtifactFilter.java | 0 .../filter/CumulativeScopeArtifactFilter.java | 0 .../filter/ExcludesArtifactFilter.java | 0 .../resolver/filter/ExclusionSetFilter.java | 0 .../filter/IncludesArtifactFilter.java | 0 .../resolver/filter/ScopeArtifactFilter.java | 0 .../apache/maven/project/MavenProject.java | 5 +- .../project/ProjectBuildingException.java | 200 +----------- .../maven/project/path/PathTranslator.java | 0 .../ArtifactDoesNotExistException.java | 0 .../repository/ArtifactTransferEvent.java | 0 .../ArtifactTransferFailedException.java | 0 .../repository/ArtifactTransferListener.java | 0 .../repository/ArtifactTransferResource.java | 0 ...DefaultLocalRepositoryMaintainerEvent.java | 0 .../DelegatingLocalArtifactRepository.java | 0 .../repository/LocalArtifactRepository.java | 0 .../repository/LocalRepositoryMaintainer.java | 0 .../LocalRepositoryMaintainerEvent.java | 0 ...LocalRepositoryNotAccessibleException.java | 0 .../maven/repository/RepositorySystem.java | 2 - .../metadata/AbstractArtifactMetadata.java | 0 .../ArtifactMetadataRetrievalException.java | 0 .../metadata/ArtifactMetadataSource.java | 0 .../DefaultMetadataResolutionRequest.java | 0 .../metadata/MetadataResolutionRequest.java | 0 .../legacy/metadata/ResolutionGroup.java | 0 .../src/main/mdo/metadata.mdo | 0 .../ProjectDependenciesResolverTest.java | 2 + ...luginParameterExpressionEvaluatorTest.java | 44 +-- .../project/AbstractMavenProjectTestCase.java | 1 - .../DefaultMavenProjectBuilderTest.java | 1 - .../maven/project/MavenProjectTest.java | 2 - .../maven/project/TestMetadataSource.java | 1 - .../artifact/TestModelDefaultsInjector.java | 141 --------- .../maven/repository/TestArtifactHandler.java | 83 +++++ .../repository/TestRepositorySystem.java | 290 ++++++++++++++++++ maven-embedder/pom.xml | 24 +- maven-plugin-api/pom.xml | 4 + pom.xml | 6 + 273 files changed, 1167 insertions(+), 483 deletions(-) rename {maven-core => maven-compat}/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (100%) rename {maven-core => maven-compat}/src/main/java/org/apache/maven/project/InvalidProjectModelException.java (63%) rename {maven-core => maven-compat}/src/main/java/org/apache/maven/project/MavenProjectBuilder.java (100%) rename {maven-core => maven-compat}/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java (100%) rename {maven-core => maven-compat}/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java (100%) rename {maven-core => maven-compat}/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java (100%) rename {maven-core => maven-compat}/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java (100%) rename {maven-core => maven-compat}/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java (100%) rename {maven-core => maven-compat}/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java (100%) rename {maven-core => maven-compat}/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java (100%) create mode 100644 maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java create mode 100644 maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/ModelUtilsTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/ProjectClasspathTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/TestArtifactResolver.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/TestProjectBuilder.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java (100%) create mode 100644 maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java rename {maven-core => maven-compat}/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java (99%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/repository/ideworkspace/IdeWorkspaceRepositoryTest.java (100%) rename {maven-core => maven-compat}/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java (100%) create mode 100644 maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar create mode 100644 maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom create mode 100644 maven-compat/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml create mode 100644 maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar create mode 100644 maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom create mode 100644 maven-compat/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml rename {maven-core => maven-compat}/src/test/repository-system/maven-core-2.1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t02/p0/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t03/p0/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t04/p0/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t05/p0/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t06/p0/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t07/p0/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t08/p0/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t09/p0/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t10/p0/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t11/p0/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t12/p0/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml (100%) rename {maven-core => maven-compat}/src/test/resources/inheritance-repo/t12scm/p0/pom.xml (100%) create mode 100644 maven-compat/src/test/resources/local-repo/marker.txt create mode 100644 maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar create mode 100644 maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar create mode 100644 maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar create mode 100644 maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar create mode 100644 maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom create mode 100644 maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom create mode 100644 maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom create mode 100644 maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom create mode 100644 maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom create mode 100644 maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar create mode 100644 maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version create mode 100644 maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar create mode 100644 maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version create mode 100644 maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar create mode 100644 maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version create mode 100644 maven-compat/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom create mode 100644 maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml rename {maven-core => maven-compat}/src/test/resources/projects/scope/project-with-scoped-dependencies.xml (100%) rename {maven-core => maven-compat}/src/test/resources/projects/scope/transitive-compile-dep.xml (100%) rename {maven-core => maven-compat}/src/test/resources/projects/scope/transitive-default-dep.xml (100%) rename {maven-core => maven-compat}/src/test/resources/projects/scope/transitive-provided-dep.xml (100%) rename {maven-core => maven-compat}/src/test/resources/projects/scope/transitive-runtime-dep.xml (100%) rename {maven-core => maven-compat}/src/test/resources/projects/scope/transitive-test-dep.xml (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java (99%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/AbstractScopeArtifactFilter.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/project/path/PathTranslator.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/DefaultLocalRepositoryMaintainerEvent.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/LocalRepositoryMaintainer.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/LocalRepositoryMaintainerEvent.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/RepositorySystem.java (98%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java (100%) rename {maven-compat => maven-core}/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java (100%) rename {maven-compat => maven-core}/src/main/mdo/metadata.mdo (100%) delete mode 100644 maven-core/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java create mode 100644 maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java create mode 100644 maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java diff --git a/build.xml b/build.xml index 78addccf4b..3f5b0fd5ef 100644 --- a/build.xml +++ b/build.xml @@ -183,7 +183,7 @@ END SNIPPET: ant-bootstrap --> - + diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index c5ed88a210..9ba8bf119e 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -23,41 +23,9 @@ Maven Artifact - - org.apache.maven - maven-model - - - org.apache.maven - maven-model-builder - org.codehaus.plexus - plexus-container-default - - - org.codehaus.plexus - plexus-component-annotations - - - org.apache.maven.wagon - wagon-provider-api - - - org.apache.maven.wagon - wagon-file - test - - - org.apache.maven.wagon - wagon-http-lightweight - test - - - easymock - easymock - 1.2_Java1.3 - test + plexus-utils diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java index 0ef6d2bba1..a5a151db61 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java @@ -19,7 +19,6 @@ import java.util.List; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.wagon.ResourceDoesNotExistException; /** * @author Jason van Zyl @@ -40,14 +39,14 @@ public class ArtifactNotFoundException .getDependencyTrail() ); } - protected ArtifactNotFoundException( String message, Artifact artifact, List remoteRepositories, ResourceDoesNotExistException cause ) + protected ArtifactNotFoundException( String message, Artifact artifact, List remoteRepositories, Throwable cause ) { this( message, artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(), artifact.getClassifier(), remoteRepositories, artifact.getDownloadUrl(), artifact .getDependencyTrail(), cause ); } public ArtifactNotFoundException( String message, String groupId, String artifactId, String version, String type, String classifier, List remoteRepositories, - String downloadUrl, List path, ResourceDoesNotExistException cause ) + String downloadUrl, List path, Throwable cause ) { super( constructMissingArtifactMessage( message, "", groupId, artifactId, version, type, classifier, downloadUrl, path ), groupId, artifactId, version, type, classifier, remoteRepositories, null, cause ); diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 4c13599e1b..9444cdd54d 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -39,6 +39,18 @@ org.apache.maven maven-artifact + + org.apache.maven + maven-core + + + org.codehaus.plexus + plexus-utils + + + org.codehaus.plexus + plexus-interpolation + org.codehaus.plexus plexus-container-default @@ -56,11 +68,6 @@ wagon-file test - - org.apache.maven.wagon - wagon-http-lightweight - test - easymock easymock @@ -81,7 +88,6 @@ 1.0.0 - src/main/mdo/metadata.mdo src/main/mdo/profiles.mdo src/main/mdo/paramdoc.mdo diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java b/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java index cd843ce14f..86b49499ad 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java @@ -25,6 +25,7 @@ import java.util.Map; import org.apache.maven.artifact.Artifact; +@Deprecated public class ManagedVersionMap extends HashMap { diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java rename to maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java diff --git a/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java b/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java similarity index 63% rename from maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java rename to maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java index da7d622712..cf85aa9e1e 100644 --- a/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java +++ b/maven-compat/src/main/java/org/apache/maven/project/InvalidProjectModelException.java @@ -21,9 +21,7 @@ package org.apache.maven.project; import java.io.File; -import org.apache.maven.artifact.InvalidRepositoryException; import org.apache.maven.project.validation.ModelValidationResult; -import org.codehaus.plexus.util.xml.pull.XmlPullParserException; @Deprecated public class InvalidProjectModelException @@ -68,42 +66,6 @@ public class InvalidProjectModelException this( projectId, message, new File( pomLocation ) ); } - - /** - * @deprecated use {@link File} constructor for pomLocation - */ - public InvalidProjectModelException( String projectId, String pomLocation, String message, - InvalidRepositoryException cause ) - { - this( projectId, message, new File( pomLocation ), cause ); - } - - public InvalidProjectModelException( String projectId, String message, File pomLocation, - InvalidRepositoryException cause ) - { - super( projectId, message, pomLocation, cause ); - } - - /** - * @deprecated use {@link File} constructor for pomLocation - */ - public InvalidProjectModelException( String projectId, String pomLocation, String message, - XmlPullParserException cause ) - { - this( projectId, message, new File( pomLocation ), cause ); - } - - public InvalidProjectModelException( String projectId, String message, File pomFile, XmlPullParserException cause ) - { - super( projectId, message, pomFile, cause ); - } - - // for super-POM building. - public InvalidProjectModelException( String projectId, String message, XmlPullParserException cause ) - { - super( projectId, message, cause ); - } - public final ModelValidationResult getValidationResult() { return validationResult; diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java rename to maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java diff --git a/maven-core/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java rename to maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java diff --git a/maven-core/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java rename to maven-compat/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java diff --git a/maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java rename to maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java diff --git a/maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java rename to maven-compat/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java diff --git a/maven-core/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java rename to maven-compat/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java diff --git a/maven-core/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java rename to maven-compat/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java diff --git a/maven-core/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java similarity index 100% rename from maven-core/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java rename to maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java b/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java index e1d3ecdb5a..9418680609 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java @@ -31,7 +31,7 @@ import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; -@Component(role = ArtifactMetadataSource.class) +@Component(role = ArtifactMetadataSource.class, hint="test") public class TestMetadataSource implements ArtifactMetadataSource { diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java index 6851db88c1..5ab0d5801e 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java @@ -35,6 +35,7 @@ import org.apache.maven.artifact.metadata.ResolutionGroup; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest; +import org.codehaus.plexus.component.repository.ComponentDescriptor; // It would be cool if there was a hook that i could use to setup a test environment. // I want to setup a local/remote repositories for testing but i don't want to have diff --git a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java new file mode 100644 index 0000000000..36025f7da9 --- /dev/null +++ b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java @@ -0,0 +1,164 @@ +package org.apache.maven.project; + +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +import java.io.File; +import java.io.FileNotFoundException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.Arrays; + +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; +import org.apache.maven.model.building.ModelBuildingException; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.repository.RepositorySystem; +import org.codehaus.plexus.PlexusTestCase; + +/** + * @author Jason van Zyl + * @version $Id$ + */ +public abstract class AbstractMavenProjectTestCase + extends PlexusTestCase +{ + protected ProjectBuilder projectBuilder; + + protected RepositorySystem repositorySystem; + + protected void setUp() + throws Exception + { + super.setUp(); + + if ( getContainer().hasComponent( ProjectBuilder.class, "test" ) ) + { + projectBuilder = lookup( ProjectBuilder.class, "test" ); + } + else + { + // default over to the main project builder... + projectBuilder = lookup( ProjectBuilder.class ); + } + + repositorySystem = lookup( RepositorySystem.class ); + } + + @Override + protected void tearDown() + throws Exception + { + projectBuilder = null; + + super.tearDown(); + } + + protected ProjectBuilder getProjectBuilder() + { + return projectBuilder; + } + + @Override + protected String getCustomConfigurationName() + { + String name = AbstractMavenProjectTestCase.class.getName().replace( '.', '/' ) + ".xml"; + System.out.println( name ); + return name; + } + + // ---------------------------------------------------------------------- + // Local repository + // ---------------------------------------------------------------------- + + protected File getLocalRepositoryPath() + throws FileNotFoundException, URISyntaxException + { + File markerFile = getFileForClasspathResource( "local-repo/marker.txt" ); + + return markerFile.getAbsoluteFile().getParentFile(); + } + + protected static File getFileForClasspathResource( String resource ) + throws FileNotFoundException + { + ClassLoader cloader = Thread.currentThread().getContextClassLoader(); + + URL resourceUrl = cloader.getResource( resource ); + + if ( resourceUrl == null ) + { + throw new FileNotFoundException( "Unable to find: " + resource ); + } + + return new File( URI.create( resourceUrl.toString().replaceAll( " ", "%20" ) ) ); + } + + protected ArtifactRepository getLocalRepository() + throws Exception + { + ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "legacy" ); + + ArtifactRepository r = repositorySystem.createArtifactRepository( "local", "file://" + getLocalRepositoryPath().getAbsolutePath(), repoLayout, null, null ); + + return r; + } + + // ---------------------------------------------------------------------- + // Project building + // ---------------------------------------------------------------------- + + protected MavenProject getProjectWithDependencies( File pom ) + throws Exception + { + ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest(); + configuration.setLocalRepository( getLocalRepository() ); + configuration.setRemoteRepositories( Arrays.asList( new ArtifactRepository[] {} ) ); + configuration.setProcessPlugins( false ); + configuration.setResolveDependencies( true ); + + try + { + return projectBuilder.build( pom, configuration ).getProject(); + } + catch ( Exception e ) + { + Throwable cause = e.getCause(); + if ( cause instanceof ModelBuildingException ) + { + String message = "In: " + pom + "\n\n"; + for ( ModelProblem problem : ( (ModelBuildingException) cause ).getProblems() ) + { + message += problem + "\n"; + } + System.out.println( message ); + fail( message ); + } + + throw e; + } + } + + protected MavenProject getProject( File pom ) + throws Exception + { + ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest(); + configuration.setLocalRepository( getLocalRepository() ); + + return projectBuilder.build( pom, configuration ).getProject(); + } + +} diff --git a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java new file mode 100644 index 0000000000..749e648367 --- /dev/null +++ b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java @@ -0,0 +1,155 @@ +package org.apache.maven.project; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.RepositoryRequest; +import org.apache.maven.execution.MavenSession; +import org.apache.maven.lifecycle.LifecycleExecutionException; +import org.apache.maven.lifecycle.LifecycleExecutor; +import org.apache.maven.lifecycle.LifecycleNotFoundException; +import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException; +import org.apache.maven.lifecycle.MavenExecutionPlan; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.PluginExecution; +import org.apache.maven.plugin.InvalidPluginDescriptorException; +import org.apache.maven.plugin.MojoExecution; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugin.MojoNotFoundException; +import org.apache.maven.plugin.PluginConfigurationException; +import org.apache.maven.plugin.PluginDescriptorParsingException; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginNotFoundException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException; +import org.apache.maven.plugin.version.PluginVersionResolutionException; +import org.codehaus.plexus.util.xml.Xpp3Dom; + +/** + * A stub implementation that assumes an empty lifecycle to bypass interaction with the plugin manager and to avoid + * plugin artifact resolution from repositories. + * + * @author Benjamin Bentmann + */ +public class EmptyLifecycleExecutor + implements LifecycleExecutor +{ + + public MavenExecutionPlan calculateExecutionPlan( MavenSession session, String... tasks ) + throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, + MojoNotFoundException + { + return new MavenExecutionPlan( Collections. emptyList(), null, null ); + } + + public void execute( MavenSession session ) + { + } + + public Xpp3Dom getDefaultPluginConfiguration( String groupId, String artifactId, String version, String goal, + MavenProject project, ArtifactRepository localRepository ) + throws LifecycleExecutionException + { + return null; + } + + public List getLifecyclePhases() + { + return Collections.emptyList(); + } + + public Set getPluginsBoundByDefaultToAllLifecycles( String packaging ) + { + Set plugins; + + // NOTE: The upper-case packaging name is intentional, that's a special hinting mode used for certain tests + if ( "JAR".equals( packaging ) ) + { + plugins = new LinkedHashSet(); + + plugins.add( newPlugin( "maven-compiler-plugin", "compile", "testCompile" ) ); + plugins.add( newPlugin( "maven-resources-plugin", "resources", "testResources" ) ); + plugins.add( newPlugin( "maven-surefire-plugin", "test" ) ); + plugins.add( newPlugin( "maven-jar-plugin", "jar" ) ); + plugins.add( newPlugin( "maven-install-plugin", "install" ) ); + plugins.add( newPlugin( "maven-deploy-plugin", "deploy" ) ); + } + else + { + plugins = Collections.emptySet(); + } + + return plugins; + } + + private Plugin newPlugin( String artifactId, String... goals ) + { + Plugin plugin = new Plugin(); + + plugin.setGroupId( "org.apache.maven.plugins" ); + plugin.setArtifactId( artifactId ); + + for ( String goal : goals ) + { + PluginExecution pluginExecution = new PluginExecution(); + pluginExecution.setId( "default-" + goal ); + pluginExecution.addGoal( goal ); + plugin.addExecution( pluginExecution ); + } + + return plugin; + } + + public void populateDefaultConfigurationForPlugins( Collection plugins, RepositoryRequest repositoryRequest ) + throws LifecycleExecutionException + { + } + + public void populateDefaultConfigurationForPlugin( Plugin plugin, RepositoryRequest repositoryRequest ) + throws LifecycleExecutionException + { + } + + public void resolvePluginVersion( Plugin plugin, RepositoryRequest repositoryRequest ) + throws PluginNotFoundException + { + } + + public void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session ) + throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException, + PluginDescriptorParsingException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, + LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException + { + } + + public List executeForkedExecutions( MojoExecution mojoExecution, MavenSession session ) + throws MojoFailureException, MojoExecutionException, PluginConfigurationException, PluginManagerException + { + return Collections.emptyList(); + } + +} diff --git a/maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java b/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java rename to maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java b/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java rename to maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/TestArtifactResolver.java b/maven-compat/src/test/java/org/apache/maven/project/TestArtifactResolver.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/TestArtifactResolver.java rename to maven-compat/src/test/java/org/apache/maven/project/TestArtifactResolver.java diff --git a/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java b/maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java rename to maven-compat/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java diff --git a/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java b/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java rename to maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java rename to maven-compat/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java diff --git a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java new file mode 100644 index 0000000000..d7d196e5d9 --- /dev/null +++ b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java @@ -0,0 +1,89 @@ +package org.apache.maven.repository; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.handler.ArtifactHandler; +import org.apache.maven.artifact.metadata.ArtifactMetadata; +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; +import org.codehaus.plexus.component.annotations.Component; + +/** + * @author jdcasey + */ +@Component(role=ArtifactRepositoryLayout.class, hint="legacy") +public class LegacyRepositoryLayout + implements ArtifactRepositoryLayout +{ + private static final String PATH_SEPARATOR = "/"; + + public String getId() + { + return "legacy"; + } + + public String pathOf( Artifact artifact ) + { + ArtifactHandler artifactHandler = artifact.getArtifactHandler(); + + StringBuilder path = new StringBuilder( 128 ); + + path.append( artifact.getGroupId() ).append( '/' ); + path.append( artifactHandler.getDirectory() ).append( '/' ); + path.append( artifact.getArtifactId() ).append( '-' ).append( artifact.getVersion() ); + + if ( artifact.hasClassifier() ) + { + path.append( '-' ).append( artifact.getClassifier() ); + } + + if ( artifactHandler.getExtension() != null && artifactHandler.getExtension().length() > 0 ) + { + path.append( '.' ).append( artifactHandler.getExtension() ); + } + + return path.toString(); + } + + public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, + ArtifactRepository repository ) + { + return pathOfRepositoryMetadata( metadata, metadata.getLocalFilename( repository ) ); + } + + private String pathOfRepositoryMetadata( ArtifactMetadata metadata, + String filename ) + { + StringBuilder path = new StringBuilder( 128 ); + + path.append( metadata.getGroupId() ).append( PATH_SEPARATOR ).append( "poms" ).append( PATH_SEPARATOR ); + + path.append( filename ); + + return path.toString(); + } + + public String pathOfRemoteRepositoryMetadata( ArtifactMetadata metadata ) + { + return pathOfRepositoryMetadata( metadata, metadata.getRemoteFilename() ); + } + +} diff --git a/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java similarity index 99% rename from maven-core/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java rename to maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java index d60325a502..b931787c07 100644 --- a/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java @@ -28,7 +28,6 @@ import org.apache.maven.model.Dependency; import org.apache.maven.model.Repository; import org.apache.maven.model.RepositoryPolicy; import org.apache.maven.repository.RepositorySystem; -import org.apache.maven.repository.legacy.LegacyRepositorySystem; import org.codehaus.plexus.PlexusTestCase; /** diff --git a/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/IdeWorkspaceRepositoryTest.java b/maven-compat/src/test/java/org/apache/maven/repository/ideworkspace/IdeWorkspaceRepositoryTest.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/repository/ideworkspace/IdeWorkspaceRepositoryTest.java rename to maven-compat/src/test/java/org/apache/maven/repository/ideworkspace/IdeWorkspaceRepositoryTest.java diff --git a/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java b/maven-compat/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java similarity index 100% rename from maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java rename to maven-compat/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java diff --git a/maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar b/maven-compat/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..609ec21bcac43974b0b99185c748c0cdcfa5ceea GIT binary patch literal 1898 zcmWIWW@h1H0D)TO2x~9{N^k;cU)K;vT~9wZ{Q#&k4u%?_va`3+m{Nh#)j%wQtjyQZ z&(qB{I7H9a?X&Nh(>~t1dKY=Ub+yi&Ilno`;EM5sr$stm=T7K&>pF3;KUoqsMNIpE zO2y7O-9f_MLBS<+wbqKra0^W~4ic>qJ{|NKDC1>Z>~-Lg-#Wi_0(D*M!oAE+6d2n! zS1=dH>BZ?Wz?_BYdVXYQ_E5ch#hqR6i0+LuW=k(_`CprEH>>3Gyb15megD0~_~KFT*n`GeXO~)h z_iLWXu2B?O5IC>;`|6$lPwwuBJzlz~eBXO3a~t=C8yS=j<_Jz|d-~<%lVc@5if2-_ zxzbih%BbG_Bk`hxYl*}4iCkHpraML4K9*){1n~ZCn98-$EwO}Qg5tNc;-^EaDtV>j zF1~Gg{ZOp2{7%lwrtB9>s+xFBlUxt#>a1?y=DK3bc|9<~DD|p9&gS4fccdoFRX7-Z zPvF|At`pCM1#P#;DtJEj+qSrcdFx_M^$)clcEfz6d|9EUp`JbKpqc_WPWG=Y6 z<2}!hNy*6_8WUH|?lPWu`EKCV?E0kd2HPfNA6_x*tCB+=-{}TPYx#z?hG!!s%3{Sg z%*#*+mGnDwNcvOJ#Ms|1*RI{~=Gw~EY9GDs#O1Gi5zaA1+tk`bUmw_&b^H?l>bmH%N2S^1^8@cmOK)=i@d%Hf{$2aW#5;FYyF;ty z9{j|oH@$mx$y7b@l3C81DhlT2zkKwHWrB~AL`~+DrT#KIO9i@{_s;zAHttLCMc!vM zhl?kvo|-n5W9gE);$^y0A*R>MdS<;4-NIpN{`XVH^`Gv+53Kgt?`d~C>3+sHXKjC0 zWP<5B=RbxsST}3b2ur((O!eC48+F8FW~PT}wVPnU;>880zAg2U+?Tj>p>g-2=HU6V z^K)#t{T6@tDcWLm@E^JQ{(@PT(`*^*_WG@AMgNnX&h6p*zz@s49N@Bt z(|$u*E-(w^0kH{5S)rgPzaX`!Br~-*xXk~ox2~6tr*ELgs*n%9I^Jg=KMmsZ(+T|G zuNP=w6lh?u!N_R4k!f&28807Dz+l6Zr&`bg%JhQqlc!$#r}T9{_-s6@?{(c<$HV8G z$JNuUl8dKD2Aw%QH6mov%xN=Xm_jC;IL!(yd>ENTm~j`LKtBM10K;2H5RFun!n9#8 zOhJl4U`eAokc4YPDq8Vb3@Y~^0A%q#AQNr^tQ3Sg2mv7H z=rUqB2djyoQW9n+_Hq(t>XODnqRoVsn#e|j>OAyxhcLQ^g;?i;j7Frw0B=?{kSXjy OC + + + + + 4.0.0 + + org.apache.maven.its + a + 0.1 + jar + + Maven Integration Test :: Dummy Artifact + + + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/maven-compat/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml b/maven-compat/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml new file mode 100644 index 0000000000..8099175ec0 --- /dev/null +++ b/maven-compat/src/test/remote-repo/org/apache/maven/its/a/maven-metadata.xml @@ -0,0 +1,12 @@ + + + org.apache.maven.its + a + 0.1 + + + 0.1 + + 20091023222756 + + diff --git a/maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar b/maven-compat/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..19df0485a785a4c6d38b09e502b0ebdc3dc36227 GIT binary patch literal 1936 zcmWIWW@h1H0D(^C2x~9{N^k;cU)K;vT~9wZ{Q#&k4u%e(va`3+m{Nh#)j%wQtjyQZ z&(qB{I7H9a?X&Nh(>~t1dKY=Ub+yi&Ilno`;EM5sr$stm=T7K&>pF3;KUoqsMNIpE zO2y7O-9f_MLBS<+wbqKra0^W~4ic>qJ{|NKDC1>Z>~-Lg-#Wi_0(D*M!oAE+6d2n! zS1=dH>BZ?Wz?_BYdVXYQMV3i5OHDspprL+<+DHV~-qpYs1<*jvUWW}27f z)Wn*s7DSn3s0OuFluXXf@_2KmjN|H-|FzF+wj^?7`cHg+u6%!gantANO6}<(v%Cw< ztUfMNc9?i#O81+blI^qn_w}4}zFs)@!QqrgR@ZGD7aFoEAIuRs}SkSs~~hoOgVa%#H;P7aIy>TP1_1@%HMLccn)&ZxVB< zIPE=a>n4>)mHaN-b8k;PQmDSV?@&Xo`XPzBZMzPt=X1G-Jg{1X+%i~|#>+WjcA}&~@?XXqQo-|n)x}mRMrpey0 zB^yp0TerA+cl$D#lvj;{cM};okDi!#QKwBq?%?)FnWM=&`or!|FW25N|L(nWVyjsdNS6bTsj}>1i;eXhz!_#Sh z2j}vGHnu6+Q`^5iy-@XAzJ9&r-^Lxk9^ZCr%%2>a{(t^8mUp%)vP*?dCQU53Qrlmf z)9~(pZuTkmw2kK1Ohw<{y3X~B>!8AgLn^`FcYha$<#7&h3DvUl=&W2|M#%$W6OuAa zK~a7|YEemMYH@Ix|5p1 zQ<$ks8ViXw6I!++8x5)%(bFBm=tV5VIu~R#A{7RBv$BCqVFyA + + + + + 4.0.0 + + org.apache.maven.its + b + 0.1 + jar + + Maven Integration Test :: Dummy Artifact + + + + + + + maven-core-it + file:///${basedir}/repo + + + + + + org.apache.maven.its + a + 0.1 + + + diff --git a/maven-compat/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml b/maven-compat/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml new file mode 100644 index 0000000000..e77af628fa --- /dev/null +++ b/maven-compat/src/test/remote-repo/org/apache/maven/its/b/maven-metadata.xml @@ -0,0 +1,12 @@ + + + org.apache.maven.its + b + 0.1 + + + 0.1 + + 20091023222817 + + diff --git a/maven-core/src/test/repository-system/maven-core-2.1.0.jar b/maven-compat/src/test/repository-system/maven-core-2.1.0.jar similarity index 100% rename from maven-core/src/test/repository-system/maven-core-2.1.0.jar rename to maven-compat/src/test/repository-system/maven-core-2.1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t02/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t02/p0/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t02/p0/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t02/p0/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t03/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t03/p0/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t03/p0/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t03/p0/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar b/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar b/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom b/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom b/maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t04/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t04/p0/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t04/p0/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t04/p0/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom b/maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom rename to maven-compat/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t05/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t05/p0/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t05/p0/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t05/p0/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom b/maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom rename to maven-compat/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t06/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t06/p0/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t06/p0/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom b/maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom rename to maven-compat/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t07/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t07/p0/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t07/p0/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t07/p0/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom b/maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom rename to maven-compat/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t08/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t08/p0/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t08/p0/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t08/p0/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t09/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t09/p0/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t09/p0/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t09/p0/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar b/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar rename to maven-compat/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar diff --git a/maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t10/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t10/p0/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t10/p0/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t10/p0/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t11/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t11/p0/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t11/p0/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t11/p0/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t12/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t12/p0/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom b/maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom rename to maven-compat/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom diff --git a/maven-core/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml diff --git a/maven-core/src/test/resources/inheritance-repo/t12scm/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml similarity index 100% rename from maven-core/src/test/resources/inheritance-repo/t12scm/p0/pom.xml rename to maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml diff --git a/maven-compat/src/test/resources/local-repo/marker.txt b/maven-compat/src/test/resources/local-repo/marker.txt new file mode 100644 index 0000000000..d9bab060dd --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/marker.txt @@ -0,0 +1 @@ +this is just a marker file. \ No newline at end of file diff --git a/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar b/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar b/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar b/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar b/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom b/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom new file mode 100644 index 0000000000..6905f6c8de --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom @@ -0,0 +1,23 @@ + + 4.0.0 + maven-test + maven-test-a + jar + 1.0 + + + central + Fake Maven Central Repository + file://dummy + + + + + maven-test + maven-test-b + 1.0 + jar + compile + + + \ No newline at end of file diff --git a/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom b/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom new file mode 100644 index 0000000000..e814951a0d --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom @@ -0,0 +1,23 @@ + + 4.0.0 + maven-test + maven-test-b + jar + 1.0 + + + maven-test + maven-test-c + 1.0 + jar + compile + + + maven-test + maven-test-d + 1.1 + jar + compile + + + \ No newline at end of file diff --git a/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom b/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom new file mode 100644 index 0000000000..4631b88f3c --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom @@ -0,0 +1,16 @@ + + 4.0.0 + maven-test + maven-test-c + jar + 1.0 + + + maven-test + maven-test-d + 1.2 + jar + compile + + + \ No newline at end of file diff --git a/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom b/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom new file mode 100644 index 0000000000..6e22f6083e --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + maven-test-d + jar + 1.1 + \ No newline at end of file diff --git a/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom b/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom new file mode 100644 index 0000000000..6e22f6083e --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + maven-test-d + jar + 1.1 + \ No newline at end of file diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar b/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar new file mode 100644 index 0000000000..c2c027fec1 --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar @@ -0,0 +1 @@ +local \ No newline at end of file diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version b/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version new file mode 100644 index 0000000000..09f9180ff2 --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version @@ -0,0 +1 @@ +20040101.101010 \ No newline at end of file diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar b/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar new file mode 100644 index 0000000000..c2c027fec1 --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar @@ -0,0 +1 @@ +local \ No newline at end of file diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version b/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version new file mode 100644 index 0000000000..09f9180ff2 --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version @@ -0,0 +1 @@ +20040101.101010 \ No newline at end of file diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar b/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar new file mode 100644 index 0000000000..c2c027fec1 --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar @@ -0,0 +1 @@ +local \ No newline at end of file diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version b/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version new file mode 100644 index 0000000000..09f9180ff2 --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version @@ -0,0 +1 @@ +20040101.101010 \ No newline at end of file diff --git a/maven-compat/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom b/maven-compat/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom new file mode 100644 index 0000000000..64a075f4e9 --- /dev/null +++ b/maven-compat/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom @@ -0,0 +1,49 @@ + + snapshot-test + maven-test-snapshot-resolving + jar + + + central + Fake Maven Central Repository + file://dummy + + + + + snapshot-test + maven-snapshot-a + 1.0-SNAPSHOT + jar + compile + + + snapshot-test + maven-snapshot-b + 1.0-SNAPSHOT + jar + compile + + + snapshot-test + maven-snapshot-c + 1.0-SNAPSHOT + jar + compile + + + snapshot-test + maven-snapshot-d + 1.0-SNAPSHOT + jar + compile + + + snapshot-test + maven-snapshot-e + 1.0-SNAPSHOT + jar + compile + + + \ No newline at end of file diff --git a/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml b/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml index f7c381fe2c..88ff82ef0e 100644 --- a/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml +++ b/maven-compat/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml @@ -19,5 +19,59 @@ under the License. + + org.apache.maven.artifact.resolver.ArtifactResolver + default + org.apache.maven.artifact.resolver.DefaultArtifactResolver + false + + + org.codehaus.plexus.logging.Logger + default + logger + + + org.apache.maven.repository.legacy.WagonManager + default + wagonManager + + + org.apache.maven.repository.legacy.resolver.transform.ArtifactTransformationManager + default + transformationManager + + + org.apache.maven.artifact.factory.ArtifactFactory + default + artifactFactory + + + org.apache.maven.artifact.resolver.ArtifactCollector + default + artifactCollector + + + org.apache.maven.artifact.resolver.ResolutionErrorHandler + default + resolutionErrorHandler + + + org.apache.maven.artifact.metadata.ArtifactMetadataSource + test + source + + + org.codehaus.plexus.PlexusContainer + default + container + + + org.apache.maven.repository.LocalRepositoryMaintainer + default + localRepositoryMaintainer + true + + + diff --git a/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml b/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml new file mode 100644 index 0000000000..c6769290d4 --- /dev/null +++ b/maven-compat/src/test/resources/org/apache/maven/project/AbstractMavenProjectTestCase.xml @@ -0,0 +1,9 @@ + + + + + org.apache.maven.lifecycle.LifecycleExecutor + org.apache.maven.project.EmptyLifecycleExecutor + + + diff --git a/maven-core/src/test/resources/projects/scope/project-with-scoped-dependencies.xml b/maven-compat/src/test/resources/projects/scope/project-with-scoped-dependencies.xml similarity index 100% rename from maven-core/src/test/resources/projects/scope/project-with-scoped-dependencies.xml rename to maven-compat/src/test/resources/projects/scope/project-with-scoped-dependencies.xml diff --git a/maven-core/src/test/resources/projects/scope/transitive-compile-dep.xml b/maven-compat/src/test/resources/projects/scope/transitive-compile-dep.xml similarity index 100% rename from maven-core/src/test/resources/projects/scope/transitive-compile-dep.xml rename to maven-compat/src/test/resources/projects/scope/transitive-compile-dep.xml diff --git a/maven-core/src/test/resources/projects/scope/transitive-default-dep.xml b/maven-compat/src/test/resources/projects/scope/transitive-default-dep.xml similarity index 100% rename from maven-core/src/test/resources/projects/scope/transitive-default-dep.xml rename to maven-compat/src/test/resources/projects/scope/transitive-default-dep.xml diff --git a/maven-core/src/test/resources/projects/scope/transitive-provided-dep.xml b/maven-compat/src/test/resources/projects/scope/transitive-provided-dep.xml similarity index 100% rename from maven-core/src/test/resources/projects/scope/transitive-provided-dep.xml rename to maven-compat/src/test/resources/projects/scope/transitive-provided-dep.xml diff --git a/maven-core/src/test/resources/projects/scope/transitive-runtime-dep.xml b/maven-compat/src/test/resources/projects/scope/transitive-runtime-dep.xml similarity index 100% rename from maven-core/src/test/resources/projects/scope/transitive-runtime-dep.xml rename to maven-compat/src/test/resources/projects/scope/transitive-runtime-dep.xml diff --git a/maven-core/src/test/resources/projects/scope/transitive-test-dep.xml b/maven-compat/src/test/resources/projects/scope/transitive-test-dep.xml similarity index 100% rename from maven-core/src/test/resources/projects/scope/transitive-test-dep.xml rename to maven-compat/src/test/resources/projects/scope/transitive-test-dep.xml diff --git a/maven-core/pom.xml b/maven-core/pom.xml index e8df3b0f7e..6b7ad085dd 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -28,13 +28,12 @@ org.apache.maven - maven-compat + maven-settings - + maven-artifact + org.apache.maven maven-plugin-api @@ -43,13 +42,6 @@ org.apache.maven maven-model-builder - org.codehaus.plexus @@ -80,11 +72,6 @@ commons-jxpath test - - org.apache.maven.wagon - wagon-file - test - @@ -105,6 +92,7 @@ 1.0.0 src/main/mdo/toolchains.mdo + src/main/mdo/metadata.mdo diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java b/maven-core/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java rename to maven-core/src/main/java/org/apache/maven/artifact/DependencyResolutionRequiredException.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java b/maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java rename to maven-core/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java b/maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java rename to maven-core/src/main/java/org/apache/maven/artifact/factory/ArtifactFactory.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java rename to maven-core/src/main/java/org/apache/maven/artifact/handler/DefaultArtifactHandler.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java rename to maven-core/src/main/java/org/apache/maven/artifact/handler/manager/ArtifactHandlerManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java b/maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java rename to maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java b/maven-core/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 maven-core/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/maven-core/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 maven-core/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/maven-core/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 maven-core/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/maven-core/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 maven-core/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java rename to maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java rename to maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java rename to maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java rename to maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryRequest.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java rename to maven-core/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/maven-core/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 maven-core/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/maven-core/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 maven-core/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/RepositoryMetadata.java b/maven-core/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 maven-core/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/maven-core/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 maven-core/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/maven-core/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 maven-core/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/maven-core/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 maven-core/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/RepositoryMetadataResolutionException.java b/maven-core/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 maven-core/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/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java rename to maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java rename to maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataParseException.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java rename to maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java b/maven-core/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 maven-core/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/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java similarity index 99% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java rename to maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java index 1e8787de6b..f3878913bd 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java @@ -24,7 +24,6 @@ import java.util.Set; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.versioning.OverConstrainedVersionException; -import org.apache.maven.repository.legacy.resolver.DefaultLegacyArtifactCollector; /** * Specific problems during resolution that we want to account for: diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java b/maven-core/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 maven-core/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/maven-core/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 maven-core/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/maven-core/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 maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java b/maven-core/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 maven-core/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/AbstractScopeArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AbstractScopeArtifactFilter.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/AbstractScopeArtifactFilter.java rename to maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AbstractScopeArtifactFilter.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java rename to maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java rename to maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/CumulativeScopeArtifactFilter.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java rename to maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExcludesArtifactFilter.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java rename to maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java rename to maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/IncludesArtifactFilter.java diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java rename to maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java index 749f6022b4..25337253b6 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java @@ -38,7 +38,6 @@ import org.apache.maven.artifact.InvalidRepositoryException; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; -import org.apache.maven.artifact.versioning.ManagedVersionMap; import org.apache.maven.model.Build; import org.apache.maven.model.CiManagement; import org.apache.maven.model.Contributor; @@ -1583,7 +1582,7 @@ public class MavenProject DependencyManagement dependencyManagement = getDependencyManagement(); if ( ( dependencyManagement != null ) && ( ( deps = dependencyManagement.getDependencies() ) != null ) && ( deps.size() > 0 ) ) { - map = new ManagedVersionMap( map ); + map = new HashMap(); for ( Iterator i = dependencyManagement.getDependencies().iterator(); i.hasNext(); ) { Dependency d = i.next(); @@ -1928,7 +1927,7 @@ public class MavenProject if ( project.getManagedVersionMap() != null ) { - setManagedVersionMap( new ManagedVersionMap( project.getManagedVersionMap() ) ); + setManagedVersionMap( new HashMap( project.getManagedVersionMap() ) ); } } diff --git a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java index 83b5d9081f..164c7397b5 100644 --- a/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java +++ b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java @@ -1,20 +1,5 @@ package org.apache.maven.project; -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.List; - -import org.apache.maven.artifact.InvalidRepositoryException; -import org.apache.maven.artifact.resolver.ArtifactNotFoundException; -import org.apache.maven.artifact.resolver.ArtifactResolutionException; -import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; -import org.apache.maven.model.building.ModelProblem; -import org.apache.maven.profiles.activation.ProfileActivationException; -import org.apache.maven.project.artifact.InvalidDependencyVersionException; -import org.codehaus.plexus.util.xml.pull.XmlPullParserException; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -34,6 +19,13 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException; * under the License. */ +import java.io.File; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.List; + +import org.apache.maven.model.building.ModelProblem; + /** * @author Jason van Zyl * @version $Id$ @@ -53,19 +45,6 @@ public class ProjectBuildingException this.projectId = projectId; } - /** - * @param projectId - * @param message - * @param pomLocation absolute path of the pom file - * @deprecated use {@link File} constructor for pomLocation - */ - protected ProjectBuildingException( String projectId, String message, String pomLocation ) - { - super( createMessage( message, projectId, new File( pomLocation ) ) ); - this.projectId = projectId; - pomFile = new File( pomLocation ); - } - /** * @param projectId * @param message @@ -91,171 +70,6 @@ public class ProjectBuildingException this.pomFile = pomFile; } - /** - * @deprecated use {@link File} constructor for pomLocation - */ - public ProjectBuildingException( String projectId, String message, String pomLocation, - ProfileActivationException cause ) - { - super( createMessage( message, projectId, new File( pomLocation ) ), cause ); - this.projectId = projectId; - pomFile = new File( pomLocation ); - } - - public ProjectBuildingException( String projectId, String message, File pomFile, ProfileActivationException cause ) - { - super( createMessage( message, projectId, pomFile ), cause ); - this.projectId = projectId; - this.pomFile = pomFile; - } - - /** - * @deprecated use {@link File} constructor for pomLocation - */ - public ProjectBuildingException( String projectId, String message, String pomLocation, IOException cause ) - { - super( createMessage( message, projectId, new File( pomLocation ) ), cause ); - this.projectId = projectId; - pomFile = new File( pomLocation ); - } - - public ProjectBuildingException( String projectId, String message, File pomFile, IOException cause ) - { - super( createMessage( message, projectId, pomFile ), cause ); - this.projectId = projectId; - this.pomFile = pomFile; - } - - // for super-POM building. - public ProjectBuildingException( String projectId, String message, IOException cause ) - { - super( createMessage( message, projectId, null ), cause ); - this.projectId = projectId; - } - - /** - * @deprecated use {@link File} constructor for pomLocation - */ - public ProjectBuildingException( String projectId, String message, String pomLocation, - XmlPullParserException cause ) - { - super( createMessage( message, projectId, new File( pomLocation ) ), cause ); - this.projectId = projectId; - pomFile = new File( pomLocation ); - } - - public ProjectBuildingException( String projectId, String message, File pomFile, XmlPullParserException cause ) - { - super( createMessage( message, projectId, pomFile ), cause ); - this.projectId = projectId; - this.pomFile = pomFile; - } - - protected ProjectBuildingException( String projectId, String message, XmlPullParserException cause ) - { - super( createMessage( message, projectId, null ), cause ); - this.projectId = projectId; - } - - public ProjectBuildingException( String projectId, String message, ArtifactResolutionException cause ) - { - super( createMessage( message, projectId, null ), cause ); - this.projectId = projectId; - } - - public ProjectBuildingException( String projectId, String message, InvalidRepositoryException cause ) - { - super( createMessage( message, projectId, null ), cause ); - this.projectId = projectId; - } - - public ProjectBuildingException( String projectId, String message, File pomFile, InvalidRepositoryException cause ) - { - super( createMessage( message, projectId, pomFile ), cause ); - this.projectId = projectId; - this.pomFile = pomFile; - } - - public ProjectBuildingException( String projectId, String message, ArtifactNotFoundException cause ) - { - super( createMessage( message, projectId, null ), cause ); - this.projectId = projectId; - } - - public ProjectBuildingException( String projectId, String message, File pomFile, ArtifactResolutionException cause ) - { - super( createMessage( message, projectId, pomFile ), cause ); - this.projectId = projectId; - this.pomFile = pomFile; - } - - /** - * @deprecated use {@link File} constructor for pomLocation - */ - public ProjectBuildingException( String projectId, String message, String pomLocation, - ArtifactResolutionException cause ) - { - super( createMessage( message, projectId, new File( pomLocation ) ), cause ); - this.projectId = projectId; - pomFile = new File( pomLocation ); - } - - public ProjectBuildingException( String projectId, String message, File pomFile, ArtifactNotFoundException cause ) - { - super( createMessage( message, projectId, pomFile ), cause ); - this.projectId = projectId; - this.pomFile = pomFile; - } - - /** - * @deprecated use {@link File} constructor for pomLocation - */ - public ProjectBuildingException( String projectId, String message, String pomLocation, - ArtifactNotFoundException cause ) - { - super( createMessage( message, projectId, new File( pomLocation ) ), cause ); - this.projectId = projectId; - pomFile = new File( pomLocation ); - } - - public ProjectBuildingException( String projectId, String message, File pomFile, - InvalidVersionSpecificationException cause ) - { - super( createMessage( message, projectId, pomFile ), cause ); - this.projectId = projectId; - this.pomFile = pomFile; - } - - /** - * @deprecated use {@link File} constructor for pomLocation - */ - public ProjectBuildingException( String projectId, String message, String pomLocation, - InvalidVersionSpecificationException cause ) - { - super( createMessage( message, projectId, new File( pomLocation ) ), cause ); - this.projectId = projectId; - pomFile = new File( pomLocation ); - } - - public ProjectBuildingException( String projectId, String message, File pomFile, - InvalidDependencyVersionException cause ) - { - super( createMessage( message, projectId, pomFile ), cause ); - this.projectId = projectId; - this.pomFile = pomFile; - } - - /** - * @deprecated use {@link File} constructor for pomLocation - */ - public ProjectBuildingException( String projectId, String message, String pomLocation, - InvalidDependencyVersionException cause ) - { - super( createMessage( message, projectId, new File( pomLocation ) ), cause ); - this.projectId = projectId; - pomFile = new File( pomLocation ); - } - public ProjectBuildingException( List results ) { super( createMessage( results ) ); diff --git a/maven-compat/src/main/java/org/apache/maven/project/path/PathTranslator.java b/maven-core/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 maven-core/src/main/java/org/apache/maven/project/path/PathTranslator.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java b/maven-core/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 maven-core/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java b/maven-core/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 maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java b/maven-core/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 maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java b/maven-core/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 maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java b/maven-core/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 maven-core/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/DefaultLocalRepositoryMaintainerEvent.java b/maven-core/src/main/java/org/apache/maven/repository/DefaultLocalRepositoryMaintainerEvent.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/DefaultLocalRepositoryMaintainerEvent.java rename to maven-core/src/main/java/org/apache/maven/repository/DefaultLocalRepositoryMaintainerEvent.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java b/maven-core/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 maven-core/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java b/maven-core/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 maven-core/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/LocalRepositoryMaintainer.java b/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryMaintainer.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/LocalRepositoryMaintainer.java rename to maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryMaintainer.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/LocalRepositoryMaintainerEvent.java b/maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryMaintainerEvent.java similarity index 100% rename from maven-compat/src/main/java/org/apache/maven/repository/LocalRepositoryMaintainerEvent.java rename to maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryMaintainerEvent.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java b/maven-core/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 maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java diff --git a/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java similarity index 98% rename from maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java rename to maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java index 0db6170b18..7870e95acd 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java +++ b/maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java @@ -133,8 +133,6 @@ public interface RepositorySystem ArtifactResolutionResult resolve( ArtifactResolutionRequest request ); - MetadataResolutionResult resolveMetadata( MetadataResolutionRequest request ); - // Install // Deploy diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java b/maven-core/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 maven-core/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/maven-core/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 maven-core/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/maven-core/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 maven-core/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/maven-core/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 maven-core/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/maven-core/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 maven-core/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/maven-core/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 maven-core/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java diff --git a/maven-compat/src/main/mdo/metadata.mdo b/maven-core/src/main/mdo/metadata.mdo similarity index 100% rename from maven-compat/src/main/mdo/metadata.mdo rename to maven-core/src/main/mdo/metadata.mdo diff --git a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java index 2266b56ac9..dbbfb99136 100644 --- a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java +++ b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java @@ -38,6 +38,7 @@ public class ProjectDependenciesResolverTest return "src/test/projects/project-dependencies-resolver"; } + /* public void testExclusionsInDependencies() throws Exception { @@ -59,6 +60,7 @@ public class ProjectDependenciesResolverTest assertEquals( 1, artifactDependencies.size() ); assertEquals( "b", artifactDependencies.iterator().next().getArtifactId() ); } + */ public void testSystemScopeDependencies() throws Exception diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java index e1acfef6a1..a17c306443 100644 --- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java +++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java @@ -31,19 +31,18 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; -import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; -import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.execution.DefaultMavenExecutionRequest; import org.apache.maven.execution.DefaultMavenExecutionResult; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Build; +import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.project.DuplicateProjectException; import org.apache.maven.project.MavenProject; +import org.apache.maven.repository.RepositorySystem; import org.codehaus.plexus.MutablePlexusContainer; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; @@ -60,15 +59,13 @@ public class PluginParameterExpressionEvaluatorTest { private static final String FS = System.getProperty( "file.separator" ); - private ArtifactFactory factory; - private ArtifactRepositoryFactory artifactRepositoryFactory; + private RepositorySystem factory; public void setUp() throws Exception { super.setUp(); - factory = lookup( ArtifactFactory.class ); - artifactRepositoryFactory = lookup( ArtifactRepositoryFactory.class ); + factory = lookup( RepositorySystem.class ); } @Override @@ -100,12 +97,7 @@ public class PluginParameterExpressionEvaluatorTest { MojoExecution exec = newMojoExecution(); - Artifact depArtifact = factory.createDependencyArtifact( "group", - "artifact", - VersionRange.createFromVersion( "1" ), - "jar", - null, - Artifact.SCOPE_COMPILE ); + Artifact depArtifact = createArtifact( "group", "artifact", "1" ); List deps = new ArrayList(); deps.add( depArtifact ); @@ -128,12 +120,7 @@ public class PluginParameterExpressionEvaluatorTest { MojoExecution exec = newMojoExecution(); - Artifact depArtifact = factory.createDependencyArtifact( "group", - "artifact", - VersionRange.createFromVersion( "1" ), - "jar", - null, - Artifact.SCOPE_COMPILE ); + Artifact depArtifact = createArtifact( "group", "artifact", "1" ); List deps = new ArrayList(); deps.add( depArtifact ); @@ -399,9 +386,7 @@ public class PluginParameterExpressionEvaluatorTest private ExpressionEvaluator createExpressionEvaluator( MavenProject project, PluginDescriptor pluginDescriptor, Properties executionProperties ) throws Exception { - ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "default" ); - - ArtifactRepository repo = artifactRepositoryFactory.createArtifactRepository( "local", "target/repo", repoLayout, null, null ); + ArtifactRepository repo = factory.createDefaultLocalRepository(); MutablePlexusContainer container = (MutablePlexusContainer) getContainer(); MavenSession session = createSession( container, repo, executionProperties ); @@ -416,15 +401,17 @@ public class PluginParameterExpressionEvaluatorTest return new PluginParameterExpressionEvaluator( session, mojoExecution ); } - protected Artifact createArtifact( String groupId, - String artifactId, - String version ) + protected Artifact createArtifact( String groupId, String artifactId, String version ) throws Exception { - ArtifactFactory artifactFactory = lookup( ArtifactFactory.class ); + Dependency dependency = new Dependency(); + dependency.setGroupId( groupId ); + dependency.setArtifactId( artifactId ); + dependency.setVersion( version ); + dependency.setType( "jar" ); + dependency.setScope( "compile" ); - // TODO: used to be SCOPE_COMPILE, check - return artifactFactory.createBuildArtifact( groupId, artifactId, version, "jar" ); + return factory.createDependencyArtifact( dependency ); } private MojoExecution newMojoExecution() @@ -454,4 +441,5 @@ public class PluginParameterExpressionEvaluatorTest // TODO Auto-generated method stub return null; } + } diff --git a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java index 44e9c9cfda..36025f7da9 100644 --- a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java +++ b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java @@ -23,7 +23,6 @@ import java.net.URL; import java.util.Arrays; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.repository.DefaultArtifactRepository; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.model.building.ModelBuildingException; import org.apache.maven.model.building.ModelProblem; diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java index 9b8d77642a..7a9942662f 100644 --- a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java @@ -25,7 +25,6 @@ import java.util.Iterator; import java.util.List; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.repository.DefaultArtifactRepository; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.codehaus.plexus.util.FileUtils; diff --git a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java index 4c6ba9920a..ba78d8378c 100644 --- a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java @@ -24,7 +24,6 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import org.apache.maven.artifact.versioning.ManagedVersionMap; import org.apache.maven.model.DependencyManagement; import org.apache.maven.model.Model; import org.apache.maven.model.Parent; @@ -121,7 +120,6 @@ public class MavenProjectTest Map clonedMap = clonedProject.getManagedVersionMap(); assertNotNull( "ManagedVersionMap not copied", clonedMap ); assertTrue( "ManagedVersionMap is empty", !clonedMap.isEmpty() ); - assertTrue( "Not a ManagedVersionMap", clonedMap instanceof ManagedVersionMap ); assertTrue( "ManagedVersionMap does not contain test key", clonedMap.containsKey( "maven-test:maven-test-b:jar" ) ); } diff --git a/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java b/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java index d577b4a882..8c8e41791f 100644 --- a/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java +++ b/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java @@ -12,7 +12,6 @@ import org.apache.maven.artifact.metadata.ResolutionGroup; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.project.artifact.MavenMetadataSource; -import org.apache.maven.repository.metadata.MetadataSource; import org.codehaus.plexus.component.annotations.Component; @Component(role=ArtifactMetadataSource.class,hint="classpath") diff --git a/maven-core/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java b/maven-core/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java deleted file mode 100644 index 924b33d84b..0000000000 --- a/maven-core/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java +++ /dev/null @@ -1,141 +0,0 @@ -package org.apache.maven.project.artifact; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -import org.apache.maven.model.Build; -import org.apache.maven.model.Dependency; -import org.apache.maven.model.DependencyManagement; -import org.apache.maven.model.Model; -import org.apache.maven.model.Plugin; -import org.apache.maven.model.PluginManagement; -import org.apache.maven.project.ModelUtils; - -/** - * @author jdcasey Created on Feb 1, 2005 - */ -public class TestModelDefaultsInjector -{ - public void injectDefaults( Model model ) - { - injectDependencyDefaults( model.getDependencies(), model.getDependencyManagement() ); - if ( model.getBuild() != null ) - { - injectPluginDefaults( model.getBuild(), model.getBuild().getPluginManagement() ); - } - } - - private static void injectPluginDefaults( Build build, PluginManagement pluginManagement ) - { - if ( pluginManagement == null ) - { - // nothing to inject. - return ; - } - - List buildPlugins = build.getPlugins(); - - if ( buildPlugins != null && !buildPlugins.isEmpty() ) - { - Map pmPlugins = pluginManagement.getPluginsAsMap(); - - if ( pmPlugins != null && !pmPlugins.isEmpty() ) - { - for ( Iterator it = buildPlugins.iterator(); it.hasNext(); ) - { - Plugin buildPlugin = (Plugin) it.next(); - - Plugin pmPlugin = (Plugin) pmPlugins.get( buildPlugin.getKey() ); - - if ( pmPlugin != null ) - { - ModelUtils.mergePluginDefinitions( buildPlugin, pmPlugin, false ); - } - } - } - } - - } - - private static void injectDependencyDefaults( List dependencies, DependencyManagement dependencyManagement ) - { - if ( dependencyManagement != null ) - { - // a given project's dependencies should be smaller than the - // group-defined defaults set... - // in other words, the project's deps will probably be a subset of - // those specified in defaults. - Map depsMap = new TreeMap(); - for ( Iterator it = dependencies.iterator(); it.hasNext(); ) - { - Dependency dep = (Dependency) it.next(); - depsMap.put( dep.getManagementKey(), dep ); - } - - List managedDependencies = dependencyManagement.getDependencies(); - - for ( Iterator it = managedDependencies.iterator(); it.hasNext(); ) - { - Dependency def = (Dependency) it.next(); - String key = def.getManagementKey(); - - Dependency dep = (Dependency) depsMap.get( key ); - if ( dep != null ) - { - mergeDependencyWithDefaults( dep, def ); - } - } - } - } - - private static void mergeDependencyWithDefaults( Dependency dep, Dependency def ) - { - if ( dep.getScope() == null && def.getScope() != null ) - { - dep.setScope( def.getScope() ); - dep.setSystemPath( def.getSystemPath() ); - } - - if ( dep.getVersion() == null && def.getVersion() != null ) - { - dep.setVersion( def.getVersion() ); - } - - if ( dep.getClassifier() == null && def.getClassifier() != null ) - { - dep.setClassifier( def.getClassifier() ); - } - - if ( dep.getType() == null && def.getType() != null ) - { - dep.setType( def.getType() ); - } - - List exclusions = dep.getExclusions(); - if ( exclusions == null || exclusions.isEmpty() ) - { - dep.setExclusions( def.getExclusions() ); - } - } -} \ No newline at end of file diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java b/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java new file mode 100644 index 0000000000..0f90e1db64 --- /dev/null +++ b/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java @@ -0,0 +1,83 @@ +package org.apache.maven.repository; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.artifact.handler.ArtifactHandler; + +/** + * Assists unit testing. + * + * @author Benjamin Bentmann + */ +class TestArtifactHandler + implements ArtifactHandler +{ + + private String type; + + private String extension; + + public TestArtifactHandler( String type ) + { + this( type, type ); + } + + public TestArtifactHandler( String type, String extension ) + { + this.type = type; + this.extension = extension; + } + + public String getClassifier() + { + return null; + } + + public String getDirectory() + { + return getPackaging() + "s"; + } + + public String getExtension() + { + return extension; + } + + public String getLanguage() + { + return "java"; + } + + public String getPackaging() + { + return type; + } + + public boolean isAddedToClasspath() + { + return true; + } + + public boolean isIncludesDependencies() + { + return false; + } + +} diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java new file mode 100644 index 0000000000..af57c82bf7 --- /dev/null +++ b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java @@ -0,0 +1,290 @@ +package org.apache.maven.repository; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.DefaultArtifact; +import org.apache.maven.artifact.InvalidRepositoryException; +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; +import org.apache.maven.artifact.repository.MavenArtifactRepository; +import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; +import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; +import org.apache.maven.artifact.resolver.ArtifactResolutionRequest; +import org.apache.maven.artifact.resolver.ArtifactResolutionResult; +import org.apache.maven.model.Dependency; +import org.apache.maven.model.Model; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.Repository; +import org.apache.maven.model.io.ModelReader; +import org.apache.maven.project.artifact.ArtifactWithDependencies; +import org.apache.maven.settings.Mirror; +import org.apache.maven.settings.Proxy; +import org.apache.maven.settings.Server; +import org.codehaus.plexus.component.annotations.Component; +import org.codehaus.plexus.component.annotations.Requirement; +import org.codehaus.plexus.util.FileUtils; + +/** + * @author Benjamin Bentmann + */ +@Component( role = RepositorySystem.class ) +public class TestRepositorySystem + implements RepositorySystem +{ + + @Requirement + private ModelReader modelReader; + + public ArtifactRepository buildArtifactRepository( Repository repository ) + throws InvalidRepositoryException + { + return new MavenArtifactRepository( repository.getId(), repository.getUrl(), new DefaultRepositoryLayout(), + new ArtifactRepositoryPolicy(), new ArtifactRepositoryPolicy() ); + } + + public Artifact createArtifact( String groupId, String artifactId, String version, String packaging ) + { + return createArtifact( groupId, artifactId, version, null, packaging ); + } + + public Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type ) + { + return new DefaultArtifact( groupId, artifactId, version, scope, type, null, new TestArtifactHandler( type ) ); + } + + public ArtifactRepository createArtifactRepository( String id, String url, + ArtifactRepositoryLayout repositoryLayout, + ArtifactRepositoryPolicy snapshots, + ArtifactRepositoryPolicy releases ) + { + return new MavenArtifactRepository( id, url, repositoryLayout, snapshots, releases ); + } + + public Artifact createArtifactWithClassifier( String groupId, String artifactId, String version, String type, + String classifier ) + { + return new DefaultArtifact( groupId, artifactId, version, null, type, classifier, + new TestArtifactHandler( type ) ); + } + + public ArtifactRepository createDefaultLocalRepository() + throws InvalidRepositoryException + { + return createLocalRepository( new File( System.getProperty( "basedir", "" ), "target/local-repo" ).getAbsoluteFile() ); + } + + public ArtifactRepository createDefaultRemoteRepository() + throws InvalidRepositoryException + { + return new MavenArtifactRepository( DEFAULT_REMOTE_REPO_ID, "file://" + + new File( System.getProperty( "basedir", "" ), "src/test/remote-repo" ).toURI().getPath(), + new DefaultRepositoryLayout(), new ArtifactRepositoryPolicy(), + new ArtifactRepositoryPolicy() ); + } + + public Artifact createDependencyArtifact( Dependency dependency ) + { + Artifact artifact = + new DefaultArtifact( dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion(), + dependency.getScope(), dependency.getType(), dependency.getClassifier(), + new TestArtifactHandler( dependency.getType() ) ); + + if ( Artifact.SCOPE_SYSTEM.equals( dependency.getScope() ) ) + { + artifact.setFile( new File( dependency.getSystemPath() ) ); + artifact.setResolved( true ); + } + + return artifact; + } + + public ArtifactRepository createLocalRepository( File localRepository ) + throws InvalidRepositoryException + { + return new MavenArtifactRepository( DEFAULT_LOCAL_REPO_ID, "file://" + localRepository.toURI().getPath(), + new DefaultRepositoryLayout(), new ArtifactRepositoryPolicy(), + new ArtifactRepositoryPolicy() ); + } + + public Artifact createPluginArtifact( Plugin plugin ) + { + return new DefaultArtifact( plugin.getGroupId(), plugin.getArtifactId(), plugin.getVersion(), null, + "maven-plugin", null, new TestArtifactHandler( "maven-plugin", "jar" ) ); + } + + public Artifact createProjectArtifact( String groupId, String artifactId, String version ) + { + return createArtifact( groupId, artifactId, version, "pom" ); + } + + public List getEffectiveRepositories( List repositories ) + { + return repositories; + } + + public Mirror getMirror( ArtifactRepository repository, List mirrors ) + { + return null; + } + + public void injectAuthentication( List repositories, List servers ) + { + } + + public void injectMirror( List repositories, List mirrors ) + { + } + + public void injectProxy( List repositories, List proxies ) + { + } + + public void publish( ArtifactRepository repository, File source, String remotePath, + ArtifactTransferListener transferListener ) + throws ArtifactTransferFailedException + { + // TODO Auto-generated method stub + + } + + public ArtifactResolutionResult resolve( ArtifactResolutionRequest request ) + { + ArtifactResolutionResult result = new ArtifactResolutionResult(); + + if ( request.isResolveRoot() ) + { + try + { + resolve( request.getArtifact(), request ); + result.addArtifact( request.getArtifact() ); + } + catch ( IOException e ) + { + result.addMissingArtifact( request.getArtifact() ); + } + } + + if ( request.isResolveTransitively() ) + { + Map artifacts = new LinkedHashMap(); + + if ( request.getArtifactDependencies() != null ) + { + for ( Artifact artifact : request.getArtifactDependencies() ) + { + artifacts.put( artifact.getDependencyConflictId(), artifact ); + } + } + + List dependencies = new ArrayList(); + if ( request.getArtifact() instanceof ArtifactWithDependencies ) + { + dependencies = ( (ArtifactWithDependencies) request.getArtifact() ).getDependencies(); + } + else + { + Artifact pomArtifact = + createProjectArtifact( request.getArtifact().getGroupId(), request.getArtifact().getArtifactId(), + request.getArtifact().getVersion() ); + File pomFile = + new File( request.getLocalRepository().getBasedir(), + request.getLocalRepository().pathOf( pomArtifact ) ); + + try + { + Model model = modelReader.read( pomFile, null ); + + dependencies = model.getDependencies(); + } + catch ( IOException e ) + { + e.printStackTrace(); + } + } + + for ( Dependency dependency : dependencies ) + { + Artifact artifact = createDependencyArtifact( dependency ); + if ( !artifacts.containsKey( artifact.getDependencyConflictId() ) ) + { + artifacts.put( artifact.getDependencyConflictId(), artifact ); + } + } + + for ( Artifact artifact : artifacts.values() ) + { + try + { + resolve( artifact, request ); + result.addArtifact( artifact ); + } + catch ( IOException e ) + { + result.addMissingArtifact( artifact ); + } + } + } + + return result; + } + + private void resolve( Artifact artifact, ArtifactResolutionRequest request ) + throws IOException + { + if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) ) + { + return; + } + + ArtifactRepository localRepo = request.getLocalRepository(); + + File localFile = new File( localRepo.getBasedir(), localRepo.pathOf( artifact ) ); + + artifact.setFile( localFile ); + + if ( !localFile.exists() ) + { + ArtifactRepository remoteRepo = request.getRemoteRepositories().get( 0 ); + + File remoteFile = new File( remoteRepo.getBasedir(), remoteRepo.pathOf( artifact ) ); + + FileUtils.copyFile( remoteFile, localFile ); + } + + artifact.setResolved( true ); + } + + public void retrieve( ArtifactRepository repository, File destination, String remotePath, + ArtifactTransferListener transferListener ) + throws ArtifactTransferFailedException, ArtifactDoesNotExistException + { + // TODO Auto-generated method stub + + } + +} diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 89c04ff59a..b8b72c43e1 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -23,30 +23,28 @@ org.apache.maven - maven-model + maven-settings org.apache.maven maven-core - - org.apache.maven - maven-compat - org.apache.maven maven-plugin-api - org.apache.maven maven-model-builder + + org.codehaus.plexus + plexus-utils + + + org.codehaus.plexus + plexus-classworlds + org.codehaus.plexus plexus-container-default @@ -59,6 +57,10 @@ org.sonatype.plexus plexus-sec-dispatcher + + org.sonatype.plexus + plexus-cipher + commons-cli diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml index c201ac3a65..c7645e72e8 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -33,6 +33,10 @@ under the License. Maven Plugin API + + org.apache.maven + maven-model + org.apache.maven maven-artifact diff --git a/pom.xml b/pom.xml index d8dc4da4ec..a77d718f50 100644 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,7 @@ 2.0.1 1.0-beta-6 1.3 + 1.4 1.1 1.3 true @@ -315,6 +316,11 @@ plexus-sec-dispatcher ${securityDispatcherVersion} + + org.sonatype.plexus + plexus-cipher + ${cipherVersion} + org.sonatype.plexus plexus-plugin-manager