From 54979b07e499a9c4297cc9fc5180580238ed2c3a Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Wed, 29 Apr 2009 04:45:20 +0000 Subject: [PATCH] o collapsing maven-project into the core, it is now useless to anyone except maven, the maven-model-builder is now something that can be consumed by the outside world git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769652 13f79535-47bb-0310-9956-ffa450edef68 --- apache-maven/pom.xml | 4 - maven-core/pom.xml | 6 +- .../project/DefaultMavenProjectBuilder.java | 0 .../project/DefaultMavenProjectHelper.java | 0 .../DefaultProjectBuilderConfiguration.java | 0 .../DuplicateArtifactAttachmentException.java | 0 .../project/InvalidProjectModelException.java | 0 .../InvalidProjectVersionException.java | 0 .../apache/maven/project/MavenProject.java | 0 .../maven/project/MavenProjectBuilder.java | 0 .../project/MavenProjectBuildingResult.java | 0 .../maven/project/MavenProjectHelper.java | 0 .../project/ProjectBuilderConfiguration.java | 0 .../project/ProjectBuildingException.java | 0 .../artifact/ActiveProjectArtifact.java | 0 .../InvalidDependencyVersionException.java | 0 .../project/artifact/MavenMetadataSource.java | 0 .../artifact/ProjectArtifactMetadata.java | 0 .../validation/DefaultModelValidator.java | 0 .../validation/ModelValidationResult.java | 0 .../project/validation/ModelValidator.java | 0 .../manager/DefaultProfileManagerTest.java | 0 .../profiles/matchers/JdkMatcherTest.java | 0 .../project/AbstractMavenProjectTestCase.java | 0 .../DefaultMavenProjectBuilderTest.java | 0 .../maven/project/MavenProjectTest.java | 0 .../apache/maven/project/ModelUtilsTest.java | 0 .../maven/project/PomConstructionTest.java | 0 .../maven/project/ProjectBuilderURITest.java | 0 .../maven/project/ProjectClasspathTest.java | 0 .../project/TestMavenRepositorySystem.java | 0 .../maven/project/TestProjectBuilder.java | 0 .../artifact/MavenMetadataSourceTest.java | 0 .../artifact/TestModelDefaultsInjector.java | 0 .../CanonicalProjectBuilderTest.java | 0 .../maven/project/harness/PomTestWrapper.java | 39 +- .../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 .../validation/DefaultModelValidatorTest.java | 0 .../src/test/java/org/apache/maven/projectp | 32 + maven-embedder/pom.xml | 4 - maven-project/pom.xml | 101 ---- maven-project/src/site/site.xml | 6 - .../maven/project/harness/PomTestWrapper.java | 172 ------ .../harness/Xpp3DomAttributeIterator.java | 90 --- .../harness/Xpp3DomAttributePointer.java | 105 ---- .../project/harness/Xpp3DomNodeIterator.java | 161 ----- .../project/harness/Xpp3DomNodePointer.java | 156 ----- .../harness/Xpp3DomPointerFactory.java | 62 -- .../resources-mixins/plugins/simple/mixin.xml | 14 - .../basedir-aligned-interpolation/pom.xml | 60 -- .../pom-with-unusual-name.xml | 39 -- .../baseurl-interpolation/pom.xml | 38 -- .../boolean-interpolation/pom.xml | 82 --- .../build-extension-inheritance/pom.xml | 49 -- .../build-extension-inheritance/sub/pom.xml | 75 --- .../complete-model/w-parent/pom.xml | 31 - .../complete-model/w-parent/sub/pom.xml | 319 ---------- .../complete-model/wo-parent/pom.xml | 313 ---------- .../config-with-plugin-mng/pom.xml | 39 -- .../consecutive_empty_elements/pom.xml | 14 - .../dependencies-different-versions/pom.xml | 18 - .../pom.xml | 19 - .../dependency-inheritance/maven-parent.xml | 31 - .../dependency-inheritance/pom.xml | 48 -- .../dependency-inheritance/sub/pom.xml | 34 -- .../pom.xml | 19 - .../sub/pom.xml | 17 - .../dependency-order/w-plugin-mngt/pom.xml | 68 --- .../dependency-order/wo-plugin-mngt/pom.xml | 66 -- .../dependency-scope-inheritance/pom.xml | 15 - .../dependency-scope-inheritance/sub/pom.xml | 19 - .../dependency-scope/pom.xml | 18 - .../dependency-scope/sub/pom.xml | 24 - .../distribution-management/pom.xml | 39 -- .../dual-execution-ids/pom.xml | 27 - .../dual-execution-ids/sub/pom.xml | 43 -- .../nexus-parent.xml | 34 -- .../duplicate-exclusions-dependency/pom.xml | 33 - .../sub/pom.xml | 16 - .../empty-distMng-repo-url/pom.xml | 15 - .../empty-scm/pom.xml | 58 -- .../equal-plugin-deps/pom.xml | 64 -- .../equal-plugin-exec-ids/pom.xml | 83 --- .../execution-configuration-join/pom.xml | 35 -- .../pom.xml | 41 -- .../execution-configuration/pom.xml | 58 -- .../resources-project-builder/foo/sub/pom.xml | 418 ------------- .../full-interpolation/pom.xml | 66 -- .../pom.xml | 97 --- .../sub/pom.xml | 84 --- .../active-profile/pom.xml | 50 -- .../active-profile/sub/pom.xml | 54 -- .../no-profile/pom.xml | 41 -- .../no-profile/sub/pom.xml | 45 -- .../jdk-activation/pom.xml | 105 ---- .../join-different-containers-same-id/pom.xml | 66 -- .../limited-inheritance/child/pom.xml | 61 -- .../limited-inheritance/pom.xml | 87 --- .../managed-profile-dependency/pom.xml | 55 -- .../managed-profile-dependency/sub/pom.xml | 55 -- .../merged-filter-order/pom.xml | 44 -- .../merged-filter-order/sub/pom.xml | 49 -- .../w-plugin-mngt/pom.xml | 64 -- .../w-plugin-mngt/sub/pom.xml | 64 -- .../wo-plugin-mngt/pom.xml | 62 -- .../wo-plugin-mngt/sub/pom.xml | 64 -- .../w-plugin-mngt/pom.xml | 59 -- .../w-plugin-mngt/sub/pom.xml | 59 -- .../wo-plugin-mngt/pom.xml | 57 -- .../wo-plugin-mngt/sub/pom.xml | 59 -- .../w-plugin-mngt/pom.xml | 71 --- .../w-plugin-mngt/sub/pom.xml | 71 --- .../wo-plugin-mngt/pom.xml | 69 --- .../wo-plugin-mngt/sub/pom.xml | 71 --- .../micromailer/pom.xml | 124 ---- .../micromailer/spice-parent-9.pom | 103 ---- .../multiple-filters/pom.xml | 17 - .../multiple-repos/pom.xml | 43 -- .../multiple-repos/sub/pom.xml | 45 -- .../nested-build-dir-interpolation/pom.xml | 55 -- .../parent-inheritance/child3.xml | 6 - .../parent-inheritance/pom.xml | 10 - .../parent-inheritance/sub/pom.xml | 9 - .../parent-interpolation/pom.xml | 15 - .../parent-interpolation/sub/pom.xml | 9 - .../platform-file-separator/pom.xml | 40 -- .../plugin-config-append/no-profile/pom.xml | 80 --- .../no-profile/subproject/pom.xml | 70 --- .../plugin-config-append/with-profile/pom.xml | 90 --- .../with-profile/subproject/pom.xml | 80 --- .../w-plugin-mngt/pom.xml | 62 -- .../w-profile/pom.xml | 74 --- .../wo-plugin-mngt/pom.xml | 53 -- .../plugin-config-merging/child/pom.xml | 76 --- .../plugin-config-merging/pom.xml | 72 --- .../plugin-config-order/w-plugin-mngt/pom.xml | 68 --- .../wo-plugin-mngt/pom.xml | 59 -- .../plugin-config-properties/pom.xml | 30 - .../w-plugin-mngt/pom.xml | 78 --- .../wo-plugin-mngt/pom.xml | 69 --- .../w-plugin-mngt/pom.xml | 66 -- .../wo-plugin-mngt/pom.xml | 57 -- .../pom.xml | 56 -- .../sub/pom.xml | 59 -- .../plugin-exec-merging-wo-version/pom.xml | 55 -- .../sub/pom.xml | 58 -- .../plugin-exec-merging/w-plugin-mngt/pom.xml | 58 -- .../w-plugin-mngt/sub/pom.xml | 59 -- .../wo-plugin-mngt/pom.xml | 56 -- .../wo-plugin-mngt/sub/pom.xml | 59 -- .../plugin-exec-order/w-plugin-mngt/pom.xml | 76 --- .../plugin-exec-order/wo-plugin-mngt/pom.xml | 67 --- .../w-plugin-mngt/pom.xml | 72 --- .../wo-plugin-mngt/pom.xml | 64 -- .../plugin-inheritance-simple/pom.xml | 16 - .../plugin-inheritance-simple/sub/pom.xml | 20 - .../plugin-management-dependencies/pom.xml | 24 - .../sub/pom.xml | 25 - .../plugin-management-duplicate/pom.xml | 37 -- .../plugin-management-duplicate/sub/pom.xml | 64 -- .../plugin-management-inheritance/pom.xml | 64 -- .../plugin-merge-simple/pom.xml | 17 - .../plugin-order/nexus-parent.xml | 18 - .../plugin-order/pom.xml | 27 - .../pluginmanagement-inherited/pom.xml | 17 - .../pluginmanagement-inherited/sub/pom.xml | 17 - .../pom-encoding/latin-1/pom.xml | 36 -- .../pom-encoding/utf-8/pom.xml | 36 -- .../pom-inheritance/pom.xml | 188 ------ .../pom-inheritance/sub/pom.xml | 36 -- .../profile-default-deactivation/pom.xml | 35 -- .../profile-injected-dependencies/pom.xml | 75 --- .../profile-injection-order/pom.xml | 68 --- .../profile-module-inheritance/pom.xml | 18 - .../profile-module-inheritance/sub/pom.xml | 12 - .../profile-module/pom.xml | 24 - .../profile-plugin-mng-dependencies/pom.xml | 77 --- .../sub/pom.xml | 62 -- .../profile-plugins/pom.xml | 50 -- .../profile-properties-interpolation/pom.xml | 54 -- .../properties-inheritance/pom.xml | 34 -- .../properties-inheritance/sub/pom.xml | 40 -- .../properties-no-duplication/pom.xml | 11 - .../properties-no-duplication/sub/pom.xml | 17 - .../repo-inheritance/pom.xml | 64 -- .../reporting-interpolation/pom.xml | 6 - .../reporting-plugin-config/pom.xml | 51 -- .../reporting-plugin-config/sub/pom.xml | 47 -- .../jetty-parent.xml | 37 -- .../single-configuration-inheritance/pom.xml | 41 -- .../unc-path/pom.xml | 41 -- .../unc-path/sub/pom.xml | 57 -- .../child/pom.xml | 104 ---- .../pom.xml | 36 -- .../url-append/child/pom.xml | 64 -- .../url-append/parent/pom.xml | 53 -- .../url-inheritance/another-parent/pom.xml | 36 -- .../another-parent/sub/pom.xml | 35 -- .../url-inheritance/pom.xml | 74 --- .../url-inheritance/sub/pom.xml | 35 -- .../url-no-decoding/pom.xml | 64 -- .../xml-coalesce-text/pom.xml | 567 ------------------ .../xml-markup-interpolation/pom.xml | 41 -- .../xml-whitespace/pom.xml | 43 -- .../xml-whitespace/sub/pom.xml | 49 -- .../src/test/resources/canonical-pom.xml | 51 -- .../resources/dependencyManagement-pom.xml | 41 -- .../resources/distributionManagement-pom.xml | 40 -- .../t01/maven-test/jars/maven-test-a-1.0.jar | 1 - .../t01/maven-test/jars/maven-test-a-1.1.jar | 1 - .../t01/maven-test/jars/maven-test-b-1.0.jar | 1 - .../t01/maven-test/jars/maven-test-b-1.1.jar | 1 - .../t01/maven-test/jars/maven-test-c-1.0.jar | 1 - .../t01/maven-test/jars/maven-test-c-1.1.jar | 1 - .../t01/maven-test/jars/maven-test-d-1.0.jar | 1 - .../t01/maven-test/jars/maven-test-d-1.1.jar | 1 - .../t01/maven-test/jars/maven-test-d-1.2.jar | 1 - .../t01/maven-test/poms/maven-test-a-1.0.pom | 14 - .../t01/maven-test/poms/maven-test-a-1.1.pom | 14 - .../t01/maven-test/poms/maven-test-b-1.0.pom | 7 - .../t01/maven-test/poms/maven-test-b-1.1.pom | 7 - .../t01/maven-test/poms/maven-test-c-1.0.pom | 7 - .../t01/maven-test/poms/maven-test-c-1.1.pom | 7 - .../t01/maven-test/poms/maven-test-d-1.0.pom | 7 - .../t01/maven-test/poms/maven-test-d-1.1.pom | 7 - .../t01/maven-test/poms/maven-test-d-1.2.pom | 7 - .../resources/imports-repo/t01/p0/p1/pom.xml | 45 -- .../resources/imports-repo/t01/p0/p2/pom.xml | 56 -- .../resources/imports-repo/t01/p0/p3/pom.xml | 59 -- .../resources/imports-repo/t01/p0/p4/pom.xml | 67 --- .../resources/imports-repo/t01/p0/pom.xml | 26 - .../t00/maven/poms/p0-1.0.pom | 11 - .../t00/maven/poms/p1-1.0.pom | 16 - .../t00/maven/poms/p2-1.0.pom | 18 - .../t00/maven/poms/p3-1.0.pom | 14 - .../t00/maven/poms/p4-1.0.pom | 13 - .../t01/maven.t01/poms/p0-1.0.pom | 11 - .../t01/maven.t01/poms/p1-1.0.pom | 16 - .../t01/maven.t01/poms/p2-1.0.pom | 16 - .../t01/maven.t01/poms/p3-1.0.pom | 16 - .../t01/maven.t01/poms/p4-1.0.pom | 16 - .../t02/p0/p1/p2/p3/p4/p5/pom.xml | 32 - .../t02/p0/p1/p2/p3/p4/pom.xml | 32 - .../inheritance-repo/t02/p0/p1/p2/p3/pom.xml | 33 - .../inheritance-repo/t02/p0/p1/p2/pom.xml | 37 -- .../inheritance-repo/t02/p0/p1/pom.xml | 51 -- .../resources/inheritance-repo/t02/p0/pom.xml | 30 - .../inheritance-repo/t03/p0/p1/pom.xml | 45 -- .../resources/inheritance-repo/t03/p0/pom.xml | 30 - .../t04/maven-test/jars/t04-a-1.0.jar | 1 - .../t04/maven-test/jars/t04-b-1.0.jar | 1 - .../t04/maven-test/jars/t04-b-2.0.jar | 1 - .../t04/maven-test/jars/t04-c-1.0.jar | 1 - .../t04/maven-test/jars/t04-c-2.0.jar | 1 - .../t04/maven-test/poms/t04-a-1.0.pom | 21 - .../t04/maven-test/poms/t04-b-1.0.pom | 7 - .../t04/maven-test/poms/t04-b-2.0.pom | 7 - .../t04/maven-test/poms/t04-c-1.0.pom | 7 - .../t04/maven-test/poms/t04-c-2.0.pom | 7 - .../inheritance-repo/t04/p0/p1/pom.xml | 41 -- .../resources/inheritance-repo/t04/p0/pom.xml | 37 -- .../t05/maven-test/jars/t05-a-1.0.jar | 1 - .../t05/maven-test/jars/t05-a-2.0.jar | 1 - .../t05/maven-test/jars/t05-b-1.0.jar | 1 - .../t05/maven-test/jars/t05-b-1.1.jar | 1 - .../t05/maven-test/jars/t05-b-2.0.jar | 1 - .../t05/maven-test/jars/t05-c-1.0.jar | 1 - .../t05/maven-test/jars/t05-d-1.0.jar | 1 - .../t05/maven-test/jars/t05-d-1.1.jar | 1 - .../t05/maven-test/jars/t05-d-1.2.jar | 1 - .../t05/maven-test/poms/t05-a-1.0.pom | 23 - .../t05/maven-test/poms/t05-a-2.0.pom | 23 - .../t05/maven-test/poms/t05-b-1.0.pom | 24 - .../t05/maven-test/poms/t05-b-1.1.pom | 24 - .../t05/maven-test/poms/t05-b-2.0.pom | 24 - .../t05/maven-test/poms/t05-c-1.0.pom | 17 - .../t05/maven-test/poms/t05-d-1.0.pom | 7 - .../t05/maven-test/poms/t05-d-1.1.pom | 7 - .../t05/maven-test/poms/t05-d-1.2.pom | 7 - .../inheritance-repo/t05/p0/p1/pom.xml | 54 -- .../resources/inheritance-repo/t05/p0/pom.xml | 36 -- .../t06/maven-test/jars/t06-a-1.0.jar | 1 - .../t06/maven-test/jars/t06-b-1.0.jar | 1 - .../t06/maven-test/jars/t06-b-1.1.jar | 1 - .../t06/maven-test/jars/t06-c-1.0.jar | 1 - .../t06/maven-test/jars/t06-d-1.0.jar | 1 - .../t06/maven-test/jars/t06-d-1.1.jar | 1 - .../t06/maven-test/jars/t06-d-1.2.jar | 1 - .../t06/maven-test/poms/t06-a-1.0.pom | 23 - .../t06/maven-test/poms/t06-b-1.0.pom | 24 - .../t06/maven-test/poms/t06-b-1.1.pom | 24 - .../t06/maven-test/poms/t06-c-1.0.pom | 17 - .../t06/maven-test/poms/t06-d-1.0.pom | 7 - .../t06/maven-test/poms/t06-d-1.1.pom | 7 - .../t06/maven-test/poms/t06-d-1.2.pom | 7 - .../inheritance-repo/t06/p0/p1/pom.xml | 54 -- .../resources/inheritance-repo/t06/p0/pom.xml | 37 -- .../t07/maven-test/jars/t07-a-1.0.jar | 1 - .../t07/maven-test/jars/t07-b-1.0.jar | 1 - .../t07/maven-test/jars/t07-b-1.1.jar | 1 - .../t07/maven-test/jars/t07-c-1.0.jar | 1 - .../t07/maven-test/jars/t07-d-1.0.jar | 1 - .../t07/maven-test/jars/t07-d-1.1.jar | 1 - .../t07/maven-test/jars/t07-d-1.2.jar | 1 - .../t07/maven-test/poms/t07-a-1.0.pom | 23 - .../t07/maven-test/poms/t07-b-1.0.pom | 24 - .../t07/maven-test/poms/t07-b-1.1.pom | 24 - .../t07/maven-test/poms/t07-c-1.0.pom | 17 - .../t07/maven-test/poms/t07-d-1.0.pom | 7 - .../t07/maven-test/poms/t07-d-1.1.pom | 7 - .../t07/maven-test/poms/t07-d-1.2.pom | 7 - .../inheritance-repo/t07/p0/p1/pom.xml | 54 -- .../resources/inheritance-repo/t07/p0/pom.xml | 37 -- .../t08/maven-test/jars/t08-a-1.0.jar | 1 - .../t08/maven-test/jars/t08-b-1.0.jar | 1 - .../t08/maven-test/jars/t08-b-1.1.jar | 1 - .../t08/maven-test/jars/t08-c-1.0.jar | 1 - .../t08/maven-test/jars/t08-d-1.0.jar | 1 - .../t08/maven-test/jars/t08-d-1.1.jar | 1 - .../t08/maven-test/jars/t08-d-1.2.jar | 1 - .../t08/maven-test/poms/t08-a-1.0.pom | 23 - .../t08/maven-test/poms/t08-b-1.0.pom | 24 - .../t08/maven-test/poms/t08-b-1.1.pom | 24 - .../t08/maven-test/poms/t08-c-1.0.pom | 17 - .../t08/maven-test/poms/t08-d-1.0.pom | 7 - .../t08/maven-test/poms/t08-d-1.1.pom | 7 - .../t08/maven-test/poms/t08-d-1.2.pom | 7 - .../inheritance-repo/t08/p0/p1/pom.xml | 59 -- .../resources/inheritance-repo/t08/p0/pom.xml | 37 -- .../t09/maven-test/jars/t09-a-1.0.jar | 1 - .../t09/maven-test/jars/t09-b-1.0.jar | 1 - .../t09/maven-test/jars/t09-c-1.0.jar | 1 - .../t09/maven-test/jars/t09-d-1.0.jar | 1 - .../t09/maven-test/poms/t09-a-1.0.pom | 24 - .../t09/maven-test/poms/t09-b-1.0.pom | 17 - .../t09/maven-test/poms/t09-c-1.0.pom | 7 - .../t09/maven-test/poms/t09-d-1.0.pom | 17 - .../inheritance-repo/t09/p0/p1/pom.xml | 36 -- .../inheritance-repo/t09/p0/p2/pom.xml | 42 -- .../resources/inheritance-repo/t09/p0/pom.xml | 38 -- .../t10/maven-test/jars/t10-a-1.0.jar | 1 - .../t10/maven-test/jars/t10-b-1.0.jar | 1 - .../t10/maven-test/jars/t10-c-1.0.jar | 1 - .../t10/maven-test/poms/t10-a-1.0.pom | 24 - .../t10/maven-test/poms/t10-b-1.0.pom | 7 - .../t10/maven-test/poms/t10-c-1.0.pom | 7 - .../inheritance-repo/t10/p0/p1/pom.xml | 42 -- .../resources/inheritance-repo/t10/p0/pom.xml | 41 -- .../inheritance-repo/t11/p0/p1/pom.xml | 16 - .../resources/inheritance-repo/t11/p0/pom.xml | 27 - .../inheritance-repo/t12/p0/p1/pom.xml | 29 - .../resources/inheritance-repo/t12/p0/pom.xml | 30 - .../t12scm/maven/p0/1.0/p0-1.0.pom | 18 - .../t12scm/maven/p1/1.0/p1-1.0.pom | 11 - .../t12scm/p0/modules/p1/pom.xml | 11 - .../inheritance-repo/t12scm/p0/pom.xml | 18 - .../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 -- .../project/workspace/buildFromFile/pom.xml | 8 - .../project-caching/1/project-caching-1.pom | 8 - .../project-caching/maven-metadata-local.xml | 11 - .../workspace/buildModelLineage/pom.xml | 7 - .../childAndParent/child/pom.xml | 10 - .../resolveParentPom/childAndParent/pom.xml | 7 - .../workspace/resolveParentPom/pom.xml | 10 - .../project-dynamism/plugin-level-dep.pom.xml | 24 - .../resources/project-dynamism/pom-interp.xml | 28 - .../project-dynamism/pom-relative.xml | 36 -- .../test/resources/project-dynamism/pom.xml | 36 -- ...-which-needs-directory-alignment-child.xml | 33 - ...roject-which-needs-directory-alignment.xml | 135 ----- ...-which-needs-directory-alignment-child.xml | 29 - .../projects/build-path-expression-pom.xml | 14 - .../projects/duplicate-plugins-merged-pom.xml | 32 - .../grandchild-check/child/grandchild/pom.xml | 10 - .../projects/grandchild-check/child/pom.xml | 13 - .../projects/grandchild-check/pom.xml | 7 - .../project-with-scoped-dependencies.xml | 99 --- .../projects/scope/transitive-compile-dep.xml | 56 -- .../projects/scope/transitive-default-dep.xml | 57 -- .../scope/transitive-provided-dep.xml | 56 -- .../projects/scope/transitive-runtime-dep.xml | 57 -- .../projects/scope/transitive-test-dep.xml | 57 -- .../invalid-aggregator-packaging-pom.xml | 30 - .../resources/validation/invalid-ids-pom.xml | 26 - .../resources/validation/missing-1-pom.xml | 21 - .../validation/missing-artifactId-pom.xml | 25 - .../missing-dependency-artifactId-pom.xml | 32 - .../missing-dependency-groupId-pom.xml | 32 - ...missing-dependency-mgmt-artifactId-pom.xml | 34 -- .../missing-dependency-mgmt-groupId-pom.xml | 34 -- .../missing-dependency-mgmt-version-pom.xml | 34 -- .../missing-dependency-version-pom.xml | 32 - .../validation/missing-groupId-pom.xml | 25 - .../validation/missing-modelVersion-pom.xml | 25 - .../missing-plugin-artifactId-pom.xml | 33 - .../missing-report-artifactId-pom.xml | 33 - .../validation/missing-repository-id-pom.xml | 36 -- .../missing-resource-directory-pom.xml | 38 -- .../resources/validation/missing-type-pom.xml | 26 - .../validation/missing-version-pom.xml | 25 - pom.xml | 6 - 431 files changed, 54 insertions(+), 14022 deletions(-) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/InvalidProjectModelException.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/MavenProject.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/MavenProjectBuilder.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/MavenProjectHelper.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/ProjectBuildingException.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java (100%) rename {maven-project => maven-core}/src/main/java/org/apache/maven/project/validation/ModelValidator.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/MavenProjectTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/ModelUtilsTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/PomConstructionTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/ProjectClasspathTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/TestProjectBuilder.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java (100%) rename {maven-project => maven-core}/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java (100%) create mode 100644 maven-core/src/test/java/org/apache/maven/projectp delete mode 100644 maven-project/pom.xml delete mode 100644 maven-project/src/site/site.xml delete mode 100644 maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java delete mode 100644 maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java delete mode 100644 maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java delete mode 100644 maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java delete mode 100644 maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java delete mode 100644 maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java delete mode 100644 maven-project/src/test/resources-mixins/plugins/simple/mixin.xml delete mode 100644 maven-project/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml delete mode 100644 maven-project/src/test/resources-project-builder/baseurl-interpolation/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/boolean-interpolation/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/build-extension-inheritance/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/complete-model/w-parent/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/complete-model/wo-parent/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/config-with-plugin-mng/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/consecutive_empty_elements/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dependencies-different-versions/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dependencies-with-different-versions/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml delete mode 100644 maven-project/src/test/resources-project-builder/dependency-inheritance/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dependency-scope/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/distribution-management/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml delete mode 100644 maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/empty-distMng-repo-url/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/empty-scm/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/equal-plugin-deps/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/execution-configuration-join/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/execution-configuration/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/foo/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/full-interpolation/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/jdk-activation/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/limited-inheritance/child/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/limited-inheritance/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/managed-profile-dependency/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-filter-order/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-filter-order/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/micromailer/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/micromailer/spice-parent-9.pom delete mode 100644 maven-project/src/test/resources-project-builder/multiple-filters/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/multiple-repos/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/multiple-repos/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/parent-inheritance/child3.xml delete mode 100644 maven-project/src/test/resources-project-builder/parent-inheritance/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/parent-inheritance/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/parent-interpolation/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/parent-interpolation/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/platform-file-separator/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-config-merging/child/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-config-merging/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-management-dependencies/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-management-dependencies/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-management-inheritance/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-merge-simple/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-order/nexus-parent.xml delete mode 100644 maven-project/src/test/resources-project-builder/plugin-order/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/pom-inheritance/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/pom-inheritance/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/profile-default-deactivation/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/profile-injected-dependencies/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/profile-injection-order/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/profile-module-inheritance/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/profile-module-inheritance/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/profile-module/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/profile-plugins/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/profile-properties-interpolation/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/properties-inheritance/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/properties-inheritance/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/properties-no-duplication/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/repo-inheritance/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/reporting-interpolation/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/reporting-plugin-config/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml delete mode 100644 maven-project/src/test/resources-project-builder/single-configuration-inheritance/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/unc-path/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/unc-path/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/url-append/child/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/url-append/parent/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/url-inheritance/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/url-inheritance/sub/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/url-no-decoding/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/xml-coalesce-text/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/xml-whitespace/pom.xml delete mode 100644 maven-project/src/test/resources-project-builder/xml-whitespace/sub/pom.xml delete mode 100644 maven-project/src/test/resources/canonical-pom.xml delete mode 100644 maven-project/src/test/resources/dependencyManagement-pom.xml delete mode 100644 maven-project/src/test/resources/distributionManagement-pom.xml delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom delete mode 100644 maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom delete mode 100644 maven-project/src/test/resources/imports-repo/t01/p0/p1/pom.xml delete mode 100644 maven-project/src/test/resources/imports-repo/t01/p0/p2/pom.xml delete mode 100644 maven-project/src/test/resources/imports-repo/t01/p0/p3/pom.xml delete mode 100644 maven-project/src/test/resources/imports-repo/t01/p0/p4/pom.xml delete mode 100644 maven-project/src/test/resources/imports-repo/t01/p0/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t03/p0/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t05/p0/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t06/p0/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t07/p0/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t08/p0/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t09/p0/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar delete mode 100644 maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t10/p0/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t11/p0/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t12/p0/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom delete mode 100644 maven-project/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml delete mode 100644 maven-project/src/test/resources/inheritance-repo/t12scm/p0/pom.xml delete mode 100644 maven-project/src/test/resources/local-repo/marker.txt delete mode 100644 maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar delete mode 100644 maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar delete mode 100644 maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar delete mode 100644 maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar delete mode 100644 maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom delete mode 100644 maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom delete mode 100644 maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom delete mode 100644 maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom delete mode 100644 maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom delete mode 100644 maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar delete mode 100644 maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version delete mode 100644 maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar delete mode 100644 maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version delete mode 100644 maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar delete mode 100644 maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version delete mode 100644 maven-project/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom delete mode 100644 maven-project/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml delete mode 100644 maven-project/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom delete mode 100644 maven-project/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/maven-metadata-local.xml delete mode 100644 maven-project/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml delete mode 100644 maven-project/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml delete mode 100644 maven-project/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml delete mode 100644 maven-project/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml delete mode 100644 maven-project/src/test/resources/project-dynamism/plugin-level-dep.pom.xml delete mode 100644 maven-project/src/test/resources/project-dynamism/pom-interp.xml delete mode 100644 maven-project/src/test/resources/project-dynamism/pom-relative.xml delete mode 100644 maven-project/src/test/resources/project-dynamism/pom.xml delete mode 100644 maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml delete mode 100644 maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml delete mode 100644 maven-project/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml delete mode 100644 maven-project/src/test/resources/projects/build-path-expression-pom.xml delete mode 100644 maven-project/src/test/resources/projects/duplicate-plugins-merged-pom.xml delete mode 100644 maven-project/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml delete mode 100644 maven-project/src/test/resources/projects/grandchild-check/child/pom.xml delete mode 100644 maven-project/src/test/resources/projects/grandchild-check/pom.xml delete mode 100644 maven-project/src/test/resources/projects/scope/project-with-scoped-dependencies.xml delete mode 100644 maven-project/src/test/resources/projects/scope/transitive-compile-dep.xml delete mode 100644 maven-project/src/test/resources/projects/scope/transitive-default-dep.xml delete mode 100644 maven-project/src/test/resources/projects/scope/transitive-provided-dep.xml delete mode 100644 maven-project/src/test/resources/projects/scope/transitive-runtime-dep.xml delete mode 100644 maven-project/src/test/resources/projects/scope/transitive-test-dep.xml delete mode 100644 maven-project/src/test/resources/validation/invalid-aggregator-packaging-pom.xml delete mode 100644 maven-project/src/test/resources/validation/invalid-ids-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-1-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-artifactId-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-dependency-artifactId-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-dependency-groupId-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-dependency-mgmt-artifactId-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-dependency-mgmt-groupId-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-dependency-mgmt-version-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-dependency-version-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-groupId-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-modelVersion-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-plugin-artifactId-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-report-artifactId-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-repository-id-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-resource-directory-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-type-pom.xml delete mode 100644 maven-project/src/test/resources/validation/missing-version-pom.xml diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 8f067ee14d..cad1bdc025 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -37,10 +37,6 @@ org.apache.maven maven-core - - org.apache.maven - maven-project - org.apache.maven maven-toolchain diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 506dca342e..ca07fe2466 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -32,11 +32,11 @@ org.apache.maven - maven-plugin-api - + maven-repository + org.apache.maven - maven-project + maven-plugin-api org.apache.maven diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java rename to maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java rename to maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java rename to maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java diff --git a/maven-project/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java b/maven-core/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java rename to maven-core/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java diff --git a/maven-project/src/main/java/org/apache/maven/project/InvalidProjectModelException.java b/maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/InvalidProjectModelException.java rename to maven-core/src/main/java/org/apache/maven/project/InvalidProjectModelException.java diff --git a/maven-project/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java b/maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java rename to maven-core/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/MavenProject.java rename to maven-core/src/main/java/org/apache/maven/project/MavenProject.java diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java rename to maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java b/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java rename to maven-core/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/MavenProjectHelper.java rename to maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java diff --git a/maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java rename to maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java diff --git a/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java b/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java rename to maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java diff --git a/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java rename to maven-core/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java diff --git a/maven-project/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java b/maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java rename to maven-core/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java diff --git a/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java rename to maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java diff --git a/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java rename to maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java diff --git a/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java b/maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java rename to maven-core/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java diff --git a/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java b/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java rename to maven-core/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java diff --git a/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidator.java b/maven-core/src/main/java/org/apache/maven/project/validation/ModelValidator.java similarity index 100% rename from maven-project/src/main/java/org/apache/maven/project/validation/ModelValidator.java rename to maven-core/src/main/java/org/apache/maven/project/validation/ModelValidator.java diff --git a/maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java b/maven-core/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java rename to maven-core/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java diff --git a/maven-project/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java b/maven-core/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java rename to maven-core/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java rename to maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java diff --git a/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java rename to maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java rename to maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java b/maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java rename to maven-core/src/test/java/org/apache/maven/project/ModelUtilsTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java rename to maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java rename to maven-core/src/test/java/org/apache/maven/project/ProjectBuilderURITest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java rename to maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java b/maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java rename to maven-core/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java diff --git a/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java b/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java rename to maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java diff --git a/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java b/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java rename to maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java b/maven-core/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java rename to maven-core/src/test/java/org/apache/maven/project/artifact/TestModelDefaultsInjector.java diff --git a/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java rename to maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java b/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java index b60158aa90..b0b95231c7 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java @@ -26,12 +26,11 @@ import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.JXPathNotFoundException; import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl; import org.apache.maven.model.PomClassicDomainModel; -import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.project.MavenProject; -import org.codehaus.plexus.util.xml.pull.XmlPullParserException; public class PomTestWrapper { + private PomClassicDomainModel domainModel; private File pomFile; @@ -60,11 +59,7 @@ public class PomTestWrapper } this.domainModel = domainModel; this.pomFile = pomFile; - try { - context = JXPathContext.newContext( new MavenXpp3Reader().read(domainModel.getInputStream())); - } catch (XmlPullParserException e) { - throw new IOException(e.getMessage()); - } + context = JXPathContext.newContext( domainModel.getModel()); } public PomTestWrapper( File pomFile, MavenProject mavenProject ) @@ -99,11 +94,7 @@ public class PomTestWrapper } this.domainModel = new PomClassicDomainModel( file ); - try { - context = JXPathContext.newContext( new MavenXpp3Reader().read(domainModel.getInputStream())); - } catch (XmlPullParserException e) { - throw new IOException(e.getMessage()); - } + context = JXPathContext.newContext( domainModel.getModel() ); } public MavenProject getMavenProject() @@ -112,11 +103,9 @@ public class PomTestWrapper } public PomClassicDomainModel getDomainModel() - { + throws IOException { if ( domainModel == null && mavenProject != null ) { - try - { domainModel = new PomClassicDomainModel( mavenProject.getModel() ); int lineageCount = 1; for ( MavenProject parent = mavenProject.getParent(); parent != null; parent = parent.getParent() ) @@ -124,11 +113,6 @@ public class PomTestWrapper lineageCount++; } domainModel.setLineageCount( lineageCount ); - } - catch ( IOException e ) - { - - } } return this.domainModel; @@ -144,6 +128,20 @@ public class PomTestWrapper context.setValue( expression, value ); } + /* + public int containerCountForUri( String uri ) + throws IOException + { + if ( uri == null || uri.trim().equals( "" ) ) + { + throw new IllegalArgumentException( "uri: null or empty" ); + } + ModelDataSource source = new DefaultModelDataSource(); + source.init( domainModel.getModelProperties(), null ); + return source.queryFor( uri ).size(); + } + */ + public Iterator getIteratorForXPathExpression( String expression ) { return context.iterate( expression ); @@ -170,4 +168,5 @@ public class PomTestWrapper { return context.getValue( expression ) != null && context.getValue( expression ).equals( value ); } + } diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java b/maven-core/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java rename to maven-core/src/test/java/org/apache/maven/project/inheritance/t12scm/ProjectInheritanceTest.java diff --git a/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java b/maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java similarity index 100% rename from maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java rename to maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java diff --git a/maven-core/src/test/java/org/apache/maven/projectp b/maven-core/src/test/java/org/apache/maven/projectp new file mode 100644 index 0000000000..21214f44b0 --- /dev/null +++ b/maven-core/src/test/java/org/apache/maven/projectp @@ -0,0 +1,32 @@ +package org.apache.maven.project; + +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; + +import junit.framework.TestCase; + +public class ProjectBuilderURITest + extends TestCase +{ + + /** + * MNG-3272: + * See {@link DefaultMavenProjectBuilder#readModel(String, URL, boolean)} + * for where this fix is implemented. + */ + public void testURL_to_URI_forSuperPom_WhenMavenHasSpaceInPath() + throws URISyntaxException, MalformedURLException, UnsupportedEncodingException + { + String url = "jar:file:/c:/Program Files/maven2.1/bin/../lib/maven-project-2.1-SNAPSHOT.jar!/org/apache/maven/project/pom-4.0.0.xml"; + System.out.println( "Original URL String:\n" + url ); + + URL urlInst = new URL( url ); + + URI uUri = new URI( urlInst.toExternalForm().replaceAll( " ", "%20" ) ); + System.out.println( "URI result:\n" + uUri ); + } + +} diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 0c3078db7a..00c68a12c8 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -28,10 +28,6 @@ org.apache.maven maven-core - - org.apache.maven - maven-project - org.apache.maven maven-toolchain diff --git a/maven-project/pom.xml b/maven-project/pom.xml deleted file mode 100644 index de78d2ca47..0000000000 --- a/maven-project/pom.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven - maven - 3.0-SNAPSHOT - - - maven-project - - Maven Project - - This library is used to not only read Maven project object model files, but to assemble inheritence - and to retrieve remote models as required. - - - - org.apache.maven - maven-model - - - org.codehaus.plexus - plexus-utils - - - org.codehaus.plexus - plexus-interpolation - - - org.apache.maven - maven-compat - - - org.codehaus.plexus - plexus-container-default - - - org.apache.maven.wagon - wagon-file - test - - - org.codehaus.woodstox - wstx-asl - - - org.apache.maven - maven-model-builder - - - org.apache.maven - maven-repository - - - commons-jxpath - commons-jxpath - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/ProjectClasspathTest.java - **/PomConstructionTest.java - **/ProjectInheritanceTest.java - - - - - org.codehaus.plexus - plexus-component-metadata - - - - diff --git a/maven-project/src/site/site.xml b/maven-project/src/site/site.xml deleted file mode 100644 index 15f431a9c0..0000000000 --- a/maven-project/src/site/site.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java b/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java deleted file mode 100644 index b0b95231c7..0000000000 --- a/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java +++ /dev/null @@ -1,172 +0,0 @@ -package org.apache.maven.project.harness; - -/* - * 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.*; -import java.util.Iterator; - -import org.apache.commons.jxpath.JXPathContext; -import org.apache.commons.jxpath.JXPathNotFoundException; -import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl; -import org.apache.maven.model.PomClassicDomainModel; -import org.apache.maven.project.MavenProject; - -public class PomTestWrapper -{ - - private PomClassicDomainModel domainModel; - - private File pomFile; - - private JXPathContext context; - - private MavenProject mavenProject; - - static - { - JXPathContextReferenceImpl.addNodePointerFactory( new Xpp3DomPointerFactory() ); - } - - public PomTestWrapper( PomClassicDomainModel domainModel ) - throws IOException - { - this( null, domainModel ); - } - - public PomTestWrapper( File pomFile, PomClassicDomainModel domainModel ) - throws IOException - { - if ( domainModel == null ) - { - throw new IllegalArgumentException( "domainModel: null" ); - } - this.domainModel = domainModel; - this.pomFile = pomFile; - context = JXPathContext.newContext( domainModel.getModel()); - } - - public PomTestWrapper( File pomFile, MavenProject mavenProject ) - throws IOException - { - if ( mavenProject == null ) - { - throw new IllegalArgumentException( "mavenProject: null" ); - } - this.mavenProject = mavenProject; - this.pomFile = pomFile; - context = JXPathContext.newContext( mavenProject.getModel() ); - } - - public PomTestWrapper( MavenProject mavenProject ) - throws IOException - { - if ( mavenProject == null ) - { - throw new IllegalArgumentException( "mavenProject: null" ); - } - this.mavenProject = mavenProject; - context = JXPathContext.newContext( mavenProject.getModel() ); - } - - public PomTestWrapper( File file ) - throws IOException - { - if ( file == null ) - { - throw new IllegalArgumentException( "file: null" ); - } - - this.domainModel = new PomClassicDomainModel( file ); - context = JXPathContext.newContext( domainModel.getModel() ); - } - - public MavenProject getMavenProject() - { - return mavenProject; - } - - public PomClassicDomainModel getDomainModel() - throws IOException { - if ( domainModel == null && mavenProject != null ) - { - domainModel = new PomClassicDomainModel( mavenProject.getModel() ); - int lineageCount = 1; - for ( MavenProject parent = mavenProject.getParent(); parent != null; parent = parent.getParent() ) - { - lineageCount++; - } - domainModel.setLineageCount( lineageCount ); - } - - return this.domainModel; - } - - public File getBasedir() - { - return ( pomFile != null ) ? pomFile.getParentFile() : null; - } - - public void setValueOnModel( String expression, Object value ) - { - context.setValue( expression, value ); - } - - /* - public int containerCountForUri( String uri ) - throws IOException - { - if ( uri == null || uri.trim().equals( "" ) ) - { - throw new IllegalArgumentException( "uri: null or empty" ); - } - ModelDataSource source = new DefaultModelDataSource(); - source.init( domainModel.getModelProperties(), null ); - return source.queryFor( uri ).size(); - } - */ - - public Iterator getIteratorForXPathExpression( String expression ) - { - return context.iterate( expression ); - } - - public boolean containsXPathExpression( String expression ) - { - return context.getValue( expression ) != null; - } - - public Object getValue( String expression ) - { - try - { - return context.getValue( expression ); - } - catch ( JXPathNotFoundException e ) - { - return null; - } - } - - public boolean xPathExpressionEqualsValue( String expression, String value ) - { - return context.getValue( expression ) != null && context.getValue( expression ).equals( value ); - } - -} diff --git a/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java b/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java deleted file mode 100644 index c77b2ee9d9..0000000000 --- a/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.apache.maven.project.harness; - -/* - * 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.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.jxpath.ri.QName; -import org.apache.commons.jxpath.ri.model.NodeIterator; -import org.apache.commons.jxpath.ri.model.NodePointer; -import org.codehaus.plexus.util.xml.Xpp3Dom; - -/** - * An attribute iterator for JXPath to support Xpp3Dom. - * - * @author Benjamin Bentmann - * @version $Id$ - */ -class Xpp3DomAttributeIterator - implements NodeIterator -{ - - private NodePointer parent; - - private Xpp3Dom node; - - private List> attributes; - - private Map.Entry attribute; - - private int position; - - public Xpp3DomAttributeIterator( NodePointer parent, QName qname ) - { - this.parent = parent; - this.node = (Xpp3Dom) parent.getNode(); - - Map map = new LinkedHashMap(); - for ( String name : this.node.getAttributeNames() ) - { - if ( name.equals( qname.getName() ) || "*".equals( qname.getName() ) ) - { - String value = this.node.getAttribute( name ); - map.put( name, value ); - } - } - this.attributes = new ArrayList>( map.entrySet() ); - } - - public NodePointer getNodePointer() - { - if ( position == 0 ) - { - setPosition( 1 ); - } - return ( attribute == null ) ? null : new Xpp3DomAttributePointer( parent, attribute ); - } - - public int getPosition() - { - return position; - } - - public boolean setPosition( int position ) - { - this.position = position; - attribute = ( position > 0 && position <= attributes.size() ) ? attributes.get( position - 1 ) : null; - return attribute != null; - } - -} diff --git a/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java b/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java deleted file mode 100644 index e1aa29f36b..0000000000 --- a/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.apache.maven.project.harness; - -/* - * 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.Map; - -import org.apache.commons.jxpath.ri.QName; -import org.apache.commons.jxpath.ri.model.NodePointer; - -/** - * An attribute pointer for JXPath to support Xpp3Dom. - * - * @author Benjamin Bentmann - */ -class Xpp3DomAttributePointer - extends NodePointer -{ - - private Map.Entry attrib; - - public Xpp3DomAttributePointer( NodePointer parent, Map.Entry attrib ) - { - super( parent ); - this.attrib = attrib; - } - - @Override - public int compareChildNodePointers( NodePointer pointer1, NodePointer pointer2 ) - { - // should never happen because attributes have no children - return 0; - } - - @Override - public Object getValue() - { - return attrib.getValue(); - } - - @Override - public Object getBaseValue() - { - return attrib; - } - - @Override - public Object getImmediateNode() - { - return attrib; - } - - @Override - public int getLength() - { - return 1; - } - - @Override - public QName getName() - { - return new QName( null, attrib.getKey() ); - } - - @Override - public boolean isActual() - { - return true; - } - - @Override - public boolean isCollection() - { - return false; - } - - @Override - public boolean isLeaf() - { - return true; - } - - @Override - public void setValue( Object value ) - { - throw new UnsupportedOperationException(); - } - -} diff --git a/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java b/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java deleted file mode 100644 index f3d57786b0..0000000000 --- a/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java +++ /dev/null @@ -1,161 +0,0 @@ -package org.apache.maven.project.harness; - -/* - * 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.ArrayList; -import java.util.List; - -import org.apache.commons.jxpath.ri.Compiler; -import org.apache.commons.jxpath.ri.compiler.NodeNameTest; -import org.apache.commons.jxpath.ri.compiler.NodeTest; -import org.apache.commons.jxpath.ri.compiler.NodeTypeTest; -import org.apache.commons.jxpath.ri.model.NodeIterator; -import org.apache.commons.jxpath.ri.model.NodePointer; -import org.codehaus.plexus.util.StringUtils; -import org.codehaus.plexus.util.xml.Xpp3Dom; - -/** - * A node iterator for JXPath to support Xpp3Dom. - * - * @author Benjamin Bentmann - * @version $Id$ - */ -class Xpp3DomNodeIterator - implements NodeIterator -{ - - private NodePointer parent; - - private NodeTest test; - - private Xpp3Dom node; - - private Xpp3Dom[] children; - - private List filteredChildren = new ArrayList(); - - private int filteredIndex; - - private Xpp3Dom child; - - private int position; - - public Xpp3DomNodeIterator( NodePointer parent, NodeTest test, boolean reverse, NodePointer startWith ) - { - this.parent = parent; - this.node = (Xpp3Dom) parent.getNode(); - this.children = this.node.getChildren(); - if ( startWith != null ) - { - for ( ; filteredIndex < children.length; filteredIndex++ ) - { - if ( startWith.equals( children[filteredIndex] ) ) - { - filteredIndex++; - break; - } - } - } - this.test = test; - if ( reverse ) - { - throw new UnsupportedOperationException(); - } - } - - public NodePointer getNodePointer() - { - if ( position == 0 ) - { - setPosition( 1 ); - } - return ( child == null ) ? null : new Xpp3DomNodePointer( parent, child ); - } - - public int getPosition() - { - return position; - } - - public boolean setPosition( int position ) - { - this.position = position; - filterChildren( position ); - child = ( position > 0 && position <= filteredChildren.size() ) ? filteredChildren.get( position - 1 ) : null; - return child != null; - } - - private void filterChildren( int position ) - { - for ( ; position > filteredChildren.size() && filteredIndex < children.length; filteredIndex++ ) - { - Xpp3Dom child = children[filteredIndex]; - if ( testNode( child ) ) - { - filteredChildren.add( child ); - } - } - } - - private boolean testNode( Xpp3Dom node ) - { - if ( test == null ) - { - return true; - } - if ( test instanceof NodeNameTest ) - { - String nodeName = node.getName(); - if ( StringUtils.isEmpty( nodeName ) ) - { - return false; - } - - NodeNameTest nodeNameTest = (NodeNameTest) test; - String namespaceURI = nodeNameTest.getNamespaceURI(); - boolean wildcard = nodeNameTest.isWildcard(); - String testName = nodeNameTest.getNodeName().getName(); - String testPrefix = nodeNameTest.getNodeName().getPrefix(); - if ( wildcard && testPrefix == null ) - { - return true; - } - if ( wildcard || testName.equals( nodeName ) ) - { - return StringUtils.isEmpty( namespaceURI ) || StringUtils.isEmpty( testPrefix ); - } - return false; - } - if ( test instanceof NodeTypeTest ) - { - switch ( ( (NodeTypeTest) test ).getNodeType() ) - { - case Compiler.NODE_TYPE_NODE: - return true; - case Compiler.NODE_TYPE_TEXT: - return node.getValue() != null; - default: - return false; - } - } - return false; - } - -} diff --git a/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java b/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java deleted file mode 100644 index c6ebb18bfb..0000000000 --- a/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java +++ /dev/null @@ -1,156 +0,0 @@ -package org.apache.maven.project.harness; - -/* - * 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.ArrayList; -import java.util.List; - -import org.apache.commons.jxpath.ri.QName; -import org.apache.commons.jxpath.ri.compiler.NodeTest; -import org.apache.commons.jxpath.ri.model.NodeIterator; -import org.apache.commons.jxpath.ri.model.NodePointer; -import org.codehaus.plexus.util.xml.Xpp3Dom; - -/** - * A node pointer for JXPath to support Xpp3Dom. - * - * @author Benjamin Bentmann - * @version $Id$ - */ -class Xpp3DomNodePointer - extends NodePointer -{ - - private Xpp3Dom node; - - public Xpp3DomNodePointer( Xpp3Dom node ) - { - super( null ); - this.node = node; - } - - public Xpp3DomNodePointer( NodePointer parent, Xpp3Dom node ) - { - super( parent ); - this.node = node; - } - - @Override - public int compareChildNodePointers( NodePointer pointer1, NodePointer pointer2 ) - { - Xpp3Dom node1 = (Xpp3Dom) pointer1.getBaseValue(); - Xpp3Dom node2 = (Xpp3Dom) pointer2.getBaseValue(); - if ( node1 == node2 ) - { - return 0; - } - for ( int i = 0; i < node.getChildCount(); i++ ) - { - Xpp3Dom child = node.getChild( i ); - if ( child == node1 ) - { - return -1; - } - if ( child == node2 ) - { - return 1; - } - } - return 0; - } - - @Override - public Object getValue() - { - return getValue(node); - } - - private static Object getValue( Xpp3Dom node ) - { - if ( node.getValue() != null ) - { - return node.getValue().trim(); - } - else - { - List children = new ArrayList(); - for ( int i = 0; i < node.getChildCount(); i++ ) - { - children.add( getValue( node.getChild( i ) ) ); - } - return children; - } - } - - @Override - public Object getBaseValue() - { - return node; - } - - @Override - public Object getImmediateNode() - { - return node; - } - - @Override - public int getLength() - { - return 1; - } - - @Override - public QName getName() - { - return new QName( null, node.getName() ); - } - - @Override - public boolean isCollection() - { - return false; - } - - @Override - public boolean isLeaf() - { - return node.getChildCount() <= 0; - } - - @Override - public void setValue( Object value ) - { - throw new UnsupportedOperationException(); - } - - @Override - public NodeIterator childIterator( NodeTest test, boolean reverse, NodePointer startWith ) - { - return new Xpp3DomNodeIterator( this, test, reverse, startWith ); - } - - @Override - public NodeIterator attributeIterator( QName qname ) - { - return new Xpp3DomAttributeIterator( this, qname ); - } - -} diff --git a/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java b/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java deleted file mode 100644 index b58c22666c..0000000000 --- a/maven-project/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.apache.maven.project.harness; - -/* - * 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.Locale; - -import org.apache.commons.jxpath.ri.QName; -import org.apache.commons.jxpath.ri.model.NodePointer; -import org.apache.commons.jxpath.ri.model.NodePointerFactory; -import org.codehaus.plexus.util.xml.Xpp3Dom; - -/** - * A node pointer factory for JXPath to support Xpp3Dom. - * - * @author Benjamin Bentmann - * @version $Id$ - */ -class Xpp3DomPointerFactory - implements NodePointerFactory -{ - - public int getOrder() - { - return 200; - } - - public NodePointer createNodePointer( QName name, Object object, Locale locale ) - { - if ( object instanceof Xpp3Dom ) - { - return new Xpp3DomNodePointer( (Xpp3Dom) object ); - } - return null; - } - - public NodePointer createNodePointer( NodePointer parent, QName name, Object object ) - { - if ( object instanceof Xpp3Dom ) - { - return new Xpp3DomNodePointer( parent, (Xpp3Dom) object ); - } - return null; - } - -} diff --git a/maven-project/src/test/resources-mixins/plugins/simple/mixin.xml b/maven-project/src/test/resources-mixins/plugins/simple/mixin.xml deleted file mode 100644 index 5bcd5714e8..0000000000 --- a/maven-project/src/test/resources-mixins/plugins/simple/mixin.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - FAILED - - - - - diff --git a/maven-project/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml b/maven-project/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml deleted file mode 100644 index e9fcd5ba57..0000000000 --- a/maven-project/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3822 - test1 - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-3822 - - Verify that POM interpolation uses basedir-aligned build directories. - - - - - ${project.build.sourceDirectory} - ${project.build.testSourceDirectory} - ${project.build.scriptSourceDirectory} - ${project.build.directory} - ${project.build.outputDirectory} - ${project.build.testOutputDirectory} - ${project.reporting.outputDirectory} - - - - - src/main/java - src/test/java - src/main/scripts - target - target/classes - target/test-classes - - - - target/site - - diff --git a/maven-project/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml b/maven-project/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml deleted file mode 100644 index 4f055a3784..0000000000 --- a/maven-project/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3944 - test1 - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-3944 - - Test that interpolation of ${basedir} works for a POM that is not named "pom.xml" - - - - - ${basedir} - ${project.basedir} - - diff --git a/maven-project/src/test/resources-project-builder/baseurl-interpolation/pom.xml b/maven-project/src/test/resources-project-builder/baseurl-interpolation/pom.xml deleted file mode 100644 index 206a54ccc6..0000000000 --- a/maven-project/src/test/resources-project-builder/baseurl-interpolation/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3760 - test1 - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-3760 - - Test interpolation of ${project.baseUri} - - - - - ${project.baseUri} - - diff --git a/maven-project/src/test/resources-project-builder/boolean-interpolation/pom.xml b/maven-project/src/test/resources-project-builder/boolean-interpolation/pom.xml deleted file mode 100644 index 98dc8ef0fb..0000000000 --- a/maven-project/src/test/resources-project-builder/boolean-interpolation/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng1995 - test1 - 1.0 - - Maven Integration Test :: MNG-1995 - - Verify that POM fields that are of type boolean can be interpolated with expressions. - - - - true - true - - - - - maven-core-it - file:///${basedir}/repo - - - ${releasesEnabled} - - - - - - - - src/main/resources - - ${filter.resources} - - - - - org.apache.maven.its.plugins - maven-it-plugin-expression - 2.1-SNAPSHOT - - target/expression.properties - - project/build/resources/0/filtering - project/repositories - - - - - test - validate - - eval - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/build-extension-inheritance/pom.xml b/maven-project/src/test/resources-project-builder/build-extension-inheritance/pom.xml deleted file mode 100644 index 2d95cb1c5d..0000000000 --- a/maven-project/src/test/resources-project-builder/build-extension-inheritance/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3899 - parent - 0.1 - pom - - Maven Integration Test :: MNG-3899 - - Test that build extensions are properly merged during inheritance. - - - - - - org.apache.maven.its.mng3899 - a - 0.1 - - - org.apache.maven.its.mng3899 - c - 0.1 - - - - diff --git a/maven-project/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml b/maven-project/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml deleted file mode 100644 index 4411b8929f..0000000000 --- a/maven-project/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3899 - parent - 0.1 - - - child - - Maven Integration Test :: MNG-3899 - - Test that build extensions are properly merged during inheritance. - - - - - - - org.apache.maven.its.mng3899 - b - 0.1 - - - - org.apache.maven.its.mng3899 - a - 0.2 - - - - - org.apache.maven.its.plugins - maven-it-plugin-expression - 2.1-SNAPSHOT - - - validate - - eval - - - target/extension.properties - - project/build/extensions - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/complete-model/w-parent/pom.xml b/maven-project/src/test/resources-project-builder/complete-model/w-parent/pom.xml deleted file mode 100644 index ebcd7d1ee9..0000000000 --- a/maven-project/src/test/resources-project-builder/complete-model/w-parent/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng - parent - 0.1 - pom - - - diff --git a/maven-project/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml b/maven-project/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml deleted file mode 100644 index 2fe674abb6..0000000000 --- a/maven-project/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng - parent - 0.1 - - - org.apache.maven.its.mng - test - 0.2 - pom - - project-name - project-description - http://project.url/ - 2009 - - project-org - http://project-org.url/ - - - - project-license - http://project.url/license - repo - free - - - - - - dev - project-developer - developer@ - http://developer - developer - http://devel.org - - devel - - -1 - - yes - - - - - - project-contributor - contributor@ - http://contributor - contributor - http://contrib.org - - contrib - - +1 - - yes - - - - - - - project-mailing-list - subscribe@ - unsubscribe@ - post@ - mail-archive - - other-archive - - - - - - 2.0.1 - - - - http://project.url/trunk - http://project.url/scm - https://project.url/scm - TAG - - - issues - http://project.url/issues - - - ci - http://project.url/ci - - - irc -
ci@
- true - false - false - false - - ci - - - - - - - http://project.url/dist - project.distros - distros - - - http://project.url/snaps - project.snaps - snaps - false - - - http://project.url/site - project.site - docs - - http://project.url/download - - reloc-gid - reloc-aid - reloc-version - project-reloc-msg - - - - - sub - - - - project-property - - - - - - org.apache.maven.its - managed-dep - 0.1 - war - runtime - - - org.apache.maven.its - excluded-managed-dep - - - - - - - - - org.apache.maven.its - dep - 0.2 - ejb - test - true - - - org.apache.maven.its - excluded-dep - - - - - - - - project-remote-repo - http://project.url/remote - repo - - - - - - - org.apache.maven.its.ext - ext - 3.0 - - - - test - build - sources/main - sources/scripts - sources/test - build/main - build/test - coreit - - - res/main - true - main - - main.included - - - main.excluded - - - - - - res/test - true - test - - test.included - - - test.excluded - - - - - src/main/filter/it.properties - - - - - org.apache.maven.its.plugins - maven-it-plugin-build - 2.1-SNAPSHOT - - test.properties - - - - test - validate - - eval - - - pom.properties - - - - - - org.apache.maven.its - build-plugin-dep - 0.3 - zip - - - org.apache.maven.its - excluded-build-plugin-dep - - - - - - - - - - true - docs - - - - org.apache.maven.its.plugins - maven-it-plugin-reporting - 2.0-SNAPSHOT - - test.html - - - - it - - run - - - index.html - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/complete-model/wo-parent/pom.xml b/maven-project/src/test/resources-project-builder/complete-model/wo-parent/pom.xml deleted file mode 100644 index 72dd787276..0000000000 --- a/maven-project/src/test/resources-project-builder/complete-model/wo-parent/pom.xml +++ /dev/null @@ -1,313 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng - test - 0.2 - pom - - project-name - project-description - http://project.url/ - 2009 - - project-org - http://project-org.url/ - - - - project-license - http://project.url/license - repo - free - - - - - - dev - project-developer - developer@ - http://developer - developer - http://devel.org - - devel - - -1 - - yes - - - - - - project-contributor - contributor@ - http://contributor - contributor - http://contrib.org - - contrib - - +1 - - yes - - - - - - - project-mailing-list - subscribe@ - unsubscribe@ - post@ - mail-archive - - other-archive - - - - - - 2.0.1 - - - - http://project.url/trunk - http://project.url/scm - https://project.url/scm - TAG - - - issues - http://project.url/issues - - - ci - http://project.url/ci - - - irc -
ci@
- true - false - false - false - - ci - - - - - - - http://project.url/dist - project.distros - distros - - - http://project.url/snaps - project.snaps - snaps - false - - - http://project.url/site - project.site - docs - - http://project.url/download - - reloc-gid - reloc-aid - reloc-version - project-reloc-msg - - - - - sub - - - - project-property - - - - - - org.apache.maven.its - managed-dep - 0.1 - war - runtime - - - org.apache.maven.its - excluded-managed-dep - - - - - - - - - org.apache.maven.its - dep - 0.2 - ejb - test - true - - - org.apache.maven.its - excluded-dep - - - - - - - - project-remote-repo - http://project.url/remote - repo - - - - - - - org.apache.maven.its.ext - ext - 3.0 - - - - test - build - sources/main - sources/scripts - sources/test - build/main - build/test - coreit - - - res/main - true - main - - main.included - - - main.excluded - - - - - - res/test - true - test - - test.included - - - test.excluded - - - - - src/main/filter/it.properties - - - - - org.apache.maven.its.plugins - maven-it-plugin-build - 2.1-SNAPSHOT - - test.properties - - - - test - validate - - eval - - - pom.properties - - - - - - org.apache.maven.its - build-plugin-dep - 0.3 - zip - - - org.apache.maven.its - excluded-build-plugin-dep - - - - - - - - - - true - docs - - - - org.apache.maven.its.plugins - maven-it-plugin-reporting - 2.0-SNAPSHOT - - test.html - - - - it - - run - - - index.html - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/config-with-plugin-mng/pom.xml b/maven-project/src/test/resources-project-builder/config-with-plugin-mng/pom.xml deleted file mode 100644 index e13c8a89b3..0000000000 --- a/maven-project/src/test/resources-project-builder/config-with-plugin-mng/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - 4.0.0 - org.sonatype.nexus - nexus - 1.3.0-SNAPSHOT - - - - org.codehaus.modello - modello-maven-plugin - - - nexus.xml - - 1.0.8 - - - - security.xml - - 1.0.0 - src/main/mdo/security.xml - - - - - - - - - org.codehaus.modello - modello-maven-plugin - 1.0-alpha-21 - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/consecutive_empty_elements/pom.xml b/maven-project/src/test/resources-project-builder/consecutive_empty_elements/pom.xml deleted file mode 100644 index 16d1968fa3..0000000000 --- a/maven-project/src/test/resources-project-builder/consecutive_empty_elements/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - 4.0.0 - test - artifact - 1.0 - - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/dependencies-different-versions/pom.xml b/maven-project/src/test/resources-project-builder/dependencies-different-versions/pom.xml deleted file mode 100644 index 60ceaf728c..0000000000 --- a/maven-project/src/test/resources-project-builder/dependencies-different-versions/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - 4.0.0 - org - org-artifact - 1.0 - - - test - test-artifact - 1.0 - - - test - test-artifact - 1.1 - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/dependencies-with-different-versions/pom.xml b/maven-project/src/test/resources-project-builder/dependencies-with-different-versions/pom.xml deleted file mode 100644 index 8d4631935c..0000000000 --- a/maven-project/src/test/resources-project-builder/dependencies-with-different-versions/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - 4.0.0 - a - b - 1.0 - - - commons-collections - commons-collections - 2.0 - - - commons-collections - commons-collections - 3.1 - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml b/maven-project/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml deleted file mode 100644 index 6d642626c3..0000000000 --- a/maven-project/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven - maven-parent - 11 - pom - - Apache Maven - diff --git a/maven-project/src/test/resources-project-builder/dependency-inheritance/pom.xml b/maven-project/src/test/resources-project-builder/dependency-inheritance/pom.xml deleted file mode 100644 index c2c061c327..0000000000 --- a/maven-project/src/test/resources-project-builder/dependency-inheritance/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven - maven-parent - 11 - maven-parent.xml - - org.apache.maven - maven - 3.0-SNAPSHOT - pom - - - 3.8.1 - - - - - junit - junit - ${junitVersion} - test - - - - diff --git a/maven-project/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml b/maven-project/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml deleted file mode 100644 index 116e5bd051..0000000000 --- a/maven-project/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - maven - org.apache.maven - 3.0-SNAPSHOT - - 4.0.0 - org.apache.maven - maven-project-builder - 3.0-SNAPSHOT - Maven Project Builder - - - junit - junit - 4.4 - test - - - - - diff --git a/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml b/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml deleted file mode 100644 index 49ffab5a50..0000000000 --- a/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - 4.0.0 - - asm-parent - asm - 3.0 - pom - - - - - asm-util - ${project.groupId} - ${project.version} - - - - - diff --git a/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml b/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml deleted file mode 100644 index 2423568ef8..0000000000 --- a/maven-project/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - asm-parent - asm - 3.0 - - 4.0.0 - - asm-xml - 3.0 - - - asm - asm-util - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml deleted file mode 100644 index 97407e9b84..0000000000 --- a/maven-project/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng4003 - test - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-4003 - - Verify that dependencies survive the project construction in the POM order. - - - - - org.apache.maven.its.mng4003 - a - 1 - - - org.apache.maven.its.mng4003 - c - 1 - - - org.apache.maven.its.mng4003 - b - 1 - - - org.apache.maven.its.mng4003 - d - 1 - - - - - - - - - maven-clean-plugin - 2.3 - - - - - diff --git a/maven-project/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml deleted file mode 100644 index 29a37eab00..0000000000 --- a/maven-project/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng4003 - test - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-4003 - - Verify that dependencies survive the project construction in the POM order. - - - - - org.apache.maven.its.mng4003 - a - 1 - - - org.apache.maven.its.mng4003 - c - 1 - - - org.apache.maven.its.mng4003 - b - 1 - - - org.apache.maven.its.mng4003 - d - 1 - - - - - - - - maven-clean-plugin - 2.3 - - - - diff --git a/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml b/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml deleted file mode 100644 index bac6164c1c..0000000000 --- a/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - p0 - maven - 1.0 - - - - maven-test - 1.0 - a - test - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml b/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml deleted file mode 100644 index 80c5570cf0..0000000000 --- a/maven-project/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - p0 - maven - 1.0 - - 4.0.0 - maven - p1 - 1.0 - - - - maven-test - 1.0 - a - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/dependency-scope/pom.xml b/maven-project/src/test/resources-project-builder/dependency-scope/pom.xml deleted file mode 100644 index 0f9ae5c6fd..0000000000 --- a/maven-project/src/test/resources-project-builder/dependency-scope/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - 4.0.0 - maven-t10 - p0 - pom - p0 - 1.0 - - - - - maven-test - t10-a - 2.0 - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml b/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml deleted file mode 100644 index 8cec33d1a0..0000000000 --- a/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - p0 - maven-t10 - 1.0 - - 4.0.0 - maven-t10 - p1 - pom - p1 - 1.0 - - scm-url - - - - - maven-test - t10-a - 1.0 - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/distribution-management/pom.xml b/maven-project/src/test/resources-project-builder/distribution-management/pom.xml deleted file mode 100644 index 0c98793eca..0000000000 --- a/maven-project/src/test/resources-project-builder/distribution-management/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.it0061 - maven-it-it0061 - 1.0 - jar - - Maven Integration Test :: it0061 - - - - test - file:target/test-repo - legacy - - - diff --git a/maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml b/maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml deleted file mode 100644 index a7983550d9..0000000000 --- a/maven-project/src/test/resources-project-builder/dual-execution-ids/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - 4.0.0 - org.apache.maven.mercury - mercury-parent - 1.0.0-alpha-3-SNAPSHOT - - - - org.apache.maven.plugins - maven-remote-resources-plugin - - - - process - - - - org.apache:apache-jar-resource-bundle:1.5 - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml b/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml deleted file mode 100644 index fde9e14965..0000000000 --- a/maven-project/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - mercury-parent - org.apache.maven.mercury - 1.0.0-alpha-3-SNAPSHOT - - -4.0.0 -org.apache.maven.mercury -mercury-util -Mercury Shared Utilities -1.0.0-alpha-3-SNAPSHOT - - - - - maven-remote-resources-plugin - 1.0 - - - - - - maven-remote-resources-plugin - 1.0 - - - default - - process - - - - org.apache:apache-jar-resource-bundle:1.4 - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml b/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml deleted file mode 100644 index cf695cb38d..0000000000 --- a/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml +++ /dev/null @@ -1,34 +0,0 @@ - - 4.0.0 - - org.sonatype.nexus - nexus-parent - 8-SNAPSHOT - - - 1.0-beta-3.0.5-SNAPSHOT - - - - - - org.codehaus.plexus - plexus-container-default - ${plexus.version} - - - commons-logging - commons-logging-api - - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml b/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml deleted file mode 100644 index b12db4f084..0000000000 --- a/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - 4.0.0 - - - org.sonatype.nexus - nexus-parent - 8-SNAPSHOT - nexus-parent.xml - - - org.sonatype.nexus - nexus - pom - Nexus Repository Manager - 1.3.0-SNAPSHOT - - - - - org.codehaus.plexus - plexus-container-default - provided - ${plexus.version} - - - commons-logging - commons-logging-api - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml b/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml deleted file mode 100644 index 37b166d197..0000000000 --- a/maven-project/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - org.sonatype.nexus - nexus - 1.3.0-SNAPSHOT - - 4.0.0 - nexus-proxy - - - - org.codehaus.plexus - plexus-container-default - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/empty-distMng-repo-url/pom.xml b/maven-project/src/test/resources-project-builder/empty-distMng-repo-url/pom.xml deleted file mode 100644 index 91ce38dfa7..0000000000 --- a/maven-project/src/test/resources-project-builder/empty-distMng-repo-url/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - org.apache.commons - commons-parent - pom - 11 - - - - dummy - Dummy to avoid accidental deploys - - - - diff --git a/maven-project/src/test/resources-project-builder/empty-scm/pom.xml b/maven-project/src/test/resources-project-builder/empty-scm/pom.xml deleted file mode 100644 index a0462ddd95..0000000000 --- a/maven-project/src/test/resources-project-builder/empty-scm/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - 4.0.0 - - - - org.apache.maven.its.mng3843 - test-1 - 0.1 - - test - - - - - org.apache.maven.its.plugins - maven-it-plugin-expression - 2.1-SNAPSHOT - - - validate - - eval - - - target/pom.properties - - project - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/equal-plugin-deps/pom.xml b/maven-project/src/test/resources-project-builder/equal-plugin-deps/pom.xml deleted file mode 100644 index d24d4e1f3d..0000000000 --- a/maven-project/src/test/resources-project-builder/equal-plugin-deps/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3838 - test - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-3838 - - Verify that using the same dependency for different plugins doesn't blow up the project builder. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - - org.apache.maven.its.mng3838 - dep - 123 - - - - - org.apache.maven.its.plugins - maven-it-plugin-b - 1.0-SNAPSHOT - - - - org.apache.maven.its.mng3838 - dep - 123 - - - - - - diff --git a/maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml b/maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml deleted file mode 100644 index d0ef617779..0000000000 --- a/maven-project/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3821 - test - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-3821 - - Verify that using the same id for executions/reportsets of different plugins doesn't blow up the project builder. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - the-one-and-only-id - - - - - org.apache.maven.its.plugins - maven-it-plugin-b - 1.0-SNAPSHOT - - - the-one-and-only-id - - - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - the-one-and-only-id - - - - - org.apache.maven.its.plugins - maven-it-plugin-b - 1.0-SNAPSHOT - - - the-one-and-only-id - - - - - - diff --git a/maven-project/src/test/resources-project-builder/execution-configuration-join/pom.xml b/maven-project/src/test/resources-project-builder/execution-configuration-join/pom.xml deleted file mode 100644 index be09b0614c..0000000000 --- a/maven-project/src/test/resources-project-builder/execution-configuration-join/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - 4.0.0 - org.sonatype.nexus - nexus - 1.3.0-SNAPSHOT - - - - org.codehaus.modello - modello-maven-plugin - 1.0-alpha-21 - - - - - - org.codehaus.modello - modello-maven-plugin - 1.0-alpha-21 - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml b/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml deleted file mode 100644 index 5b65ea6501..0000000000 --- a/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - 4.0.0 - test - nexus - pom - Nexus Repository Manager - 1.1-M1 - - - - - - maven-enforcer-plugin - - - - enforce - - enforce - - - - - commons-logging:* - - a - - - - *:plexus-component-api - - - - - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/execution-configuration/pom.xml b/maven-project/src/test/resources-project-builder/execution-configuration/pom.xml deleted file mode 100644 index 130174d5c4..0000000000 --- a/maven-project/src/test/resources-project-builder/execution-configuration/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - 4.0.0 - org.sonatype.nexus - nexus - 1.3.0-SNAPSHOT - - - - org.codehaus.modello - modello-maven-plugin - 1.0-alpha-21 - - - nexus.xml - - java - xpp3-reader - xpp3-writer - - - 1.0.8 - - 1.0.0 - 1.0.1 - 1.0.6 - - src/main/mdo/nexus.xml - - - - - security.xml - - java1 - xpp3-reader1 - xpp3-writer1 - - - 1.0.0 - src/main/mdo/security.xml - - - - - - - - - - org.codehaus.modello - modello-maven-plugin - 1.0-alpha-21 - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/foo/sub/pom.xml b/maven-project/src/test/resources-project-builder/foo/sub/pom.xml deleted file mode 100644 index c5e3d9a62f..0000000000 --- a/maven-project/src/test/resources-project-builder/foo/sub/pom.xml +++ /dev/null @@ -1,418 +0,0 @@ - - - 4.0.0 - - archetype-common - Maven Archetype Common - jar - - - org.apache.maven - maven-core - - - net.sourceforge.jchardet - jchardet - - - dom4j - dom4j - - - jdom - jdom - - - org.apache.maven - maven-model - - - org.apache.maven - maven-project - - - org.codehaus.plexus - plexus-container-default - - - org.codehaus.plexus - plexus-utils - - - org.apache.maven.shared - maven-plugin-testing-harness - test - - - commons-io - commons-io - - - org.codehaus.plexus - plexus-velocity - - - velocity - velocity - - - dom4j - dom4j - - - commons-collections - commons-collections - - - junit - junit - - - org.codehaus.cargo - cargo-core-api-container - 0.9 - test - - - org.codehaus.cargo - cargo-core-api-util - 0.9 - test - - - org.codehaus.cargo - cargo-core-api-generic - 0.9 - test - - - org.codehaus.cargo - cargo-core-api-module - 0.9 - test - - - org.codehaus.cargo - cargo-core-container-jetty - 0.9 - test - - - org.mortbay.jetty - jetty - 6.1.4 - test - - - org.apache.maven.wagon - wagon-file - - - org.apache.maven.wagon - wagon-http - 1.0-beta-2 - test - - - ${project.groupId} - archetype-repository - ${project.version} - war - test - - - ${project.groupId} - archetype-proxy - ${project.version} - war - test - - - - - - - src/test/resources - true - - - - - org.codehaus.modello - modello-maven-plugin - 1.0-alpha-14 - - - archetype-common - - java - xsd - xpp3-reader - xpp3-writer - - - 1.0.0 - src/main/mdo/archetype-common.mdo - - - - archetype-registry - - java - xsd - xpp3-reader - xpp3-writer - - - 1.0.0 - src/main/mdo/archetype-registry.mdo - - - - archetype-descriptor - - java - xsd - xpp3-reader - xpp3-writer - - - 1.0.0 - src/main/mdo/archetype-descriptor.mdo - - - - archetype-catalog - - java - xsd - xpp3-reader - xpp3-writer - - - 1.0.0 - src/main/mdo/archetype-catalog.mdo - - - - archetype-old - - java - xsd - xpp3-reader - xpp3-writer - - - 1.0.0 - src/main/mdo/archetype.mdo - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy - process-test-resources - - copy-dependencies - - - ${project.build.directory}/wars - true - true - war - true - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - ant - ant-antlr - 1.6.5 - - - - - - archetype-test - process-test-resources - - - - - - - - - - - - - - - - run - - - - - archetype-test-partial - process-test-resources - - - - - - - - - - - - - - - run - - - - - archetype-test-site - process-test-resources - - - - - - - - - - - - - - - - run - - - - - archetype-test-old - process-test-resources - - - - - - - - - - - - - - - - run - - - - - archetype-test-fileset - process-test-resources - - - - - - - - - - - - - - - - run - - - - - repository-metadata - process-test-resources - - - - - - - - - - - run - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/ArchetyperRoundtripTest.java - **/ArchetyperRoundtripWithProxyTest.java - **/DefaultRepositoryCrawlerTest.java - - - - - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.2 - - - - - - - internal-catalog - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*Verification.java - - - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/full-interpolation/pom.xml b/maven-project/src/test/resources-project-builder/full-interpolation/pom.xml deleted file mode 100644 index 08080b3045..0000000000 --- a/maven-project/src/test/resources-project-builder/full-interpolation/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3833 - coreit - 0.1 - jar - - Maven Integration Test :: MNG-3833 - - Test that POM interpolation fully interpolates all properties in data flow chain, i.e. where property - A depends on property B, and property B depends on property C and so on. - - - - - ${property22} - ${property20} - ${property18} - ${property16} - ${property14} - ${property12} - ${property10} - ${property08} - ${property06} - ${property04} - ${property02} - ${property00} - PASSED - ${property01} - ${property03} - ${property05} - ${property09} - ${property11} - ${property07} - ${property13} - ${property15} - ${property17} - ${property19} - ${property21} - - diff --git a/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml b/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml deleted file mode 100644 index ed95efb09d..0000000000 --- a/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3979 - parent - 0.1 - pom - - Maven Integration Test :: MNG-3979 - - Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent - POM has a non-empty element and the child POM has an empty element to join. - - - - test - - - - - equal-repo-id - http://maven.apache.org/null - - false - - - ignore - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-log-file - 2.1-SNAPSHOT - - - equal-build-exec-id - initialize - - reset - - - target/exec.log - test - - - - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-log-file - 2.1-SNAPSHOT - - - equal-report-exec-id - - reset - - - target/exec.log - test - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml b/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml deleted file mode 100644 index 9bd61d0f62..0000000000 --- a/maven-project/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3979 - parent - 0.1 - - - child - - Maven Integration Test :: MNG-3979 - - Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent - POM has a non-empty element and the child POM has an empty element to join. - - - - - - - equal-repo-id - file:///${basedir}/null - - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-log-file - 2.1-SNAPSHOT - - - equal-build-exec-id - initialize - - - - - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-log-file - 2.1-SNAPSHOT - - - equal-report-exec-id - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml b/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml deleted file mode 100644 index 640cf2881c..0000000000 --- a/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng4102 - parent - 0.1 - pom - - Maven Integration Test :: MNG-4102 - - Verify that the effective value of an inherited property reflects the values of any nested property - as defined by the child. This boils down to the order of inheritance and (parent) interpolation. - - - - PARENT - - ${overridden} - - - - - it-parent - - true - - - - diff --git a/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml b/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml deleted file mode 100644 index 2aa40dedd7..0000000000 --- a/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng4102 - parent - 0.1 - - - org.apache.maven.its.mng4102 - test - 0.1 - jar - - Maven Integration Test :: MNG-4102 :: Child - - Verify that the effective value of an inherited property reflects the values of any nested property - as defined by the child. This boils down to the order of inheritance and (parent) interpolation. - - - - CHILD - - - - - it-child - - true - - - - diff --git a/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml b/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml deleted file mode 100644 index 3e11a6d63c..0000000000 --- a/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng4102 - parent - 0.1 - pom - - Maven Integration Test :: MNG-4102 - - Verify that the effective value of an inherited property reflects the values of any nested property - as defined by the child. This boils down to the order of inheritance and (parent) interpolation. - - - - PARENT - - ${overridden} - - diff --git a/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml b/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml deleted file mode 100644 index 49c8fd21e3..0000000000 --- a/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng4102 - parent - 0.1 - - - org.apache.maven.its.mng4102 - test - 0.1 - jar - - Maven Integration Test :: MNG-4102 :: Child - - Verify that the effective value of an inherited property reflects the values of any nested property - as defined by the child. This boils down to the order of inheritance and (parent) interpolation. - - - - CHILD - - diff --git a/maven-project/src/test/resources-project-builder/jdk-activation/pom.xml b/maven-project/src/test/resources-project-builder/jdk-activation/pom.xml deleted file mode 100644 index c0431f5807..0000000000 --- a/maven-project/src/test/resources-project-builder/jdk-activation/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng1957 - test - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-1957 - - Test that JDK profile activation allows version ranges. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-expression - 2.1-SNAPSHOT - - - validate - - eval - - - target/jdk.properties - - project/properties - - - - - - - - - - - test-1 - - [1.4,) - - - PASSED - - - - test-2 - - (,100) - - - PASSED - - - - test-3 - - (1.3,100) - - - PASSED - - - - test-4 - - (100,) - - - FAILED - - - - test-5 - - (,1.4) - - - FAILED - - - - diff --git a/maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml b/maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml deleted file mode 100644 index b3f48caa3a..0000000000 --- a/maven-project/src/test/resources-project-builder/join-different-containers-same-id/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - 4.0.0 - - mng3984 - test - 0.1 - pom - - MNG-3984 - - - - - - org.apache.maven.its.plugins - maven-it-plugin-b - 1.0-SNAPSHOT - - - foo - - a - - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - foo - - b - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/limited-inheritance/child/pom.xml b/maven-project/src/test/resources-project-builder/limited-inheritance/child/pom.xml deleted file mode 100644 index 8e9e62376a..0000000000 --- a/maven-project/src/test/resources-project-builder/limited-inheritance/child/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3845 - parent - 0.1 - - - child - - - child-org - - - - https://child.url/scm - - - http://child.url/issues - - - child-ci - http://child.url/ci - - - - child-distros - ssh://child.url/distros - - - child-snaps - ssh://child.url/snaps - - - child-site - scp://child.url/site - - - diff --git a/maven-project/src/test/resources-project-builder/limited-inheritance/pom.xml b/maven-project/src/test/resources-project-builder/limited-inheritance/pom.xml deleted file mode 100644 index bd7b4588a0..0000000000 --- a/maven-project/src/test/resources-project-builder/limited-inheritance/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3845 - parent - 0.1 - pom - - Maven Integration Test :: MNG-3845 - - Test that inheritance is all-or-nothing for certain sub-trees of the POM. - - - - parent-org - http://parent.url/org - - - - http://parent.url/viewvc - http://parent.url/scm - https://parent.url/scm - parent-tag - - - parent-issues - http://parent.url/issues - - - parent-ci - http://parent.url/ci - - - irc - true - true - false - false - -
irc://parent.url/#ci
- - - - - - - parent-distros - parent-distros - ssh://parent.url/distros - false - legacy - - - parent-snaps - parent-snaps - ssh://parent.url/snaps - false - legacy - - - parent-site - parent-site - scp://parent.url/site - - - diff --git a/maven-project/src/test/resources-project-builder/managed-profile-dependency/pom.xml b/maven-project/src/test/resources-project-builder/managed-profile-dependency/pom.xml deleted file mode 100644 index b3305c76bd..0000000000 --- a/maven-project/src/test/resources-project-builder/managed-profile-dependency/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng4034 - parent - 1.0-SNAPSHOT - pom - - Maven Integration Test :: MNG-4034 - - Verify that dependencies defined in profiles are subject to the dependency management of the parent. - - - - sub - - - - - - org.apache.maven.its - maven-core-it-support - 1.3 - runtime - - - commons-lang - commons-lang - - - - - - diff --git a/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml b/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml deleted file mode 100644 index 706e748a62..0000000000 --- a/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng4034 - parent - 1.0-SNAPSHOT - - - org.apache.maven.its.mng4034 - child - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-4034 - - Verify that dependencies defined in profiles are subject to the dependency management of the parent. - - - - - maven-core-it - - true - - - - org.apache.maven.its - maven-core-it-support - - - - - - diff --git a/maven-project/src/test/resources-project-builder/merged-filter-order/pom.xml b/maven-project/src/test/resources-project-builder/merged-filter-order/pom.xml deleted file mode 100644 index bd15b7774f..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-filter-order/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng4008 - parent - 1.0 - pom - - Maven Integration Test :: MNG-4008 - - Verify that filter definitions are properly merged. - - - - - - src/main/filters/child-a.properties - src/main/filters/parent-c.properties - src/main/filters/parent-b.properties - src/main/filters/parent-d.properties - - - diff --git a/maven-project/src/test/resources-project-builder/merged-filter-order/sub/pom.xml b/maven-project/src/test/resources-project-builder/merged-filter-order/sub/pom.xml deleted file mode 100644 index 2d7444f4b8..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-filter-order/sub/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng4008 - parent - 1.0 - - - org.apache.maven.its.mng4008 - test - 1.0 - jar - - Maven Integration Test :: MNG-4008 - - Verify that filter definitions are properly merged. - - - - - src/main/filters/child-a.properties - src/main/filters/child-c.properties - src/main/filters/child-b.properties - src/main/filters/child-d.properties - - - diff --git a/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml deleted file mode 100644 index 6c4b186677..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3906 - parent - 0.1 - pom - - Maven Integration Test :: MNG-3906 - - Test that project-level plugin dependencies are properly merged during inheritance. - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-class-loader - 2.1-SNAPSHOT - - - org.apache.maven.its.mng3906 - e - 1 - - - org.apache.maven.its.mng3906 - a - 1 - - - org.apache.maven.its.mng3906 - d - 1 - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml b/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml deleted file mode 100644 index 85cc818847..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3906 - parent - 0.1 - - - child - - Maven Integration Test :: MNG-3906 - - Test that project-level plugin dependencies are properly merged during inheritance. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-class-loader - 2.1-SNAPSHOT - - - org.apache.maven.its.mng3906 - c - 1 - - - org.apache.maven.its.mng3906 - a - 2 - - - org.apache.maven.its.mng3906 - b - 1 - - - - - - diff --git a/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml deleted file mode 100644 index d4dcf657e2..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3906 - parent - 0.1 - pom - - Maven Integration Test :: MNG-3906 - - Test that project-level plugin dependencies are properly merged during inheritance. - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-class-loader - 2.1-SNAPSHOT - - - org.apache.maven.its.mng3906 - e - 1 - - - org.apache.maven.its.mng3906 - a - 1 - - - org.apache.maven.its.mng3906 - d - 1 - - - - - - diff --git a/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml b/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml deleted file mode 100644 index 85cc818847..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3906 - parent - 0.1 - - - child - - Maven Integration Test :: MNG-3906 - - Test that project-level plugin dependencies are properly merged during inheritance. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-class-loader - 2.1-SNAPSHOT - - - org.apache.maven.its.mng3906 - c - 1 - - - org.apache.maven.its.mng3906 - a - 2 - - - org.apache.maven.its.mng3906 - b - 1 - - - - - - diff --git a/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml deleted file mode 100644 index 97fc9c4793..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3937 - parent-2 - 0.1 - pom - - Maven Integration Test :: MNG-3937 - - Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly - ordered. - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - merge - validate - - parent-b - merged - parent-a - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml b/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml deleted file mode 100644 index b21f6a9227..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3937 - parent-2 - 0.1 - - - child-2 - - Maven Integration Test :: MNG-3937 - - Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly - ordered. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - merge - validate - - child-a - merged - child-b - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml deleted file mode 100644 index b56a7a028c..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3937 - parent-1 - 0.1 - pom - - Maven Integration Test :: MNG-3937 - - Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly - ordered. - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - merge - validate - - parent-b - merged - parent-a - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml b/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml deleted file mode 100644 index 8da0710c47..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3937 - parent-1 - 0.1 - - - child-1 - - Maven Integration Test :: MNG-3937 - - Test that during inheritance/merging of a plugin execution the goals specified by child and parent are properly - ordered. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - merge - validate - - child-a - merged - child-b - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml deleted file mode 100644 index cd5383cede..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3925 - parent - 0.1 - pom - - Maven Integration Test :: MNG-3925 - - Test that plugin executions (in the same phase) are properly ordered after inheritance/merge with - parent executions. - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - parent-1 - validate - - parent-1 - - - - parent-2 - validate - - parent-2 - - - - - validate - - parent-default - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml b/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml deleted file mode 100644 index c14f8e37a4..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3925 - parent - 0.1 - - - child - - Maven Integration Test :: MNG-3925 - - Test that plugin executions (in the same phase) are properly ordered after inheritance/merge with - parent executions. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - child-1 - validate - - child-1 - - - - child-2 - validate - - child-2 - - - - - validate - - child-default - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml deleted file mode 100644 index 90d2bef8e4..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3925 - parent - 0.1 - pom - - Maven Integration Test :: MNG-3925 - - Test that plugin executions (in the same phase) are properly ordered after inheritance/merge with - parent executions. - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - parent-1 - validate - - parent-1 - - - - parent-2 - validate - - parent-2 - - - - - validate - - parent-default - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml b/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml deleted file mode 100644 index c14f8e37a4..0000000000 --- a/maven-project/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3925 - parent - 0.1 - - - child - - Maven Integration Test :: MNG-3925 - - Test that plugin executions (in the same phase) are properly ordered after inheritance/merge with - parent executions. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - child-1 - validate - - child-1 - - - - child-2 - validate - - child-2 - - - - - validate - - child-default - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/micromailer/pom.xml b/maven-project/src/test/resources-project-builder/micromailer/pom.xml deleted file mode 100644 index 57f85dd801..0000000000 --- a/maven-project/src/test/resources-project-builder/micromailer/pom.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - 4.0.0 - - - org.sonatype.spice - spice-parent - 11 - spice-parent-9.pom - - - org.sonatype.micromailer - micromailer - 1.0.3 - jar - Micro Mailer - - - scm:svn:http://svn.sonatype.org/spice/trunk/micromailer - http://svn.sonatype.org/spice/trunk/micromailer - scm:svn:https://svn.sonatype.org/spice/trunk/micromailer - - - - - - org.codehaus.plexus - plexus-container-default - 1.0-alpha-47 - jar - compile - - - commons-logging - commons-logging - - - commons-logging - commons-logging-api - - - log4j - log4j - - - - - - org.codehaus.plexus - plexus-utils - 1.5.5 - jar - compile - - - - - org.codehaus.plexus - plexus-velocity - 1.1.7 - jar - compile - - - org.codehaus.plexus - plexus-component-api - - - velocity - velocity - - - commons-collections - commons-collections - - - - - - org.apache.velocity - velocity - 1.5 - jar - compile - - - - - javax.mail - mail - 1.4 - jar - compile - - - - - junit - junit - 3.8.2 - jar - test - - - - - - - - org.codehaus.plexus - plexus-maven-plugin - 1.3.8 - - - - child-descriptor - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/micromailer/spice-parent-9.pom b/maven-project/src/test/resources-project-builder/micromailer/spice-parent-9.pom deleted file mode 100644 index 695c3c93c0..0000000000 --- a/maven-project/src/test/resources-project-builder/micromailer/spice-parent-9.pom +++ /dev/null @@ -1,103 +0,0 @@ - - 4.0.0 - org.sonatype.spice - spice-parent - 11 - pom - Sonatype Spice Components - - - scm:svn:http://svn.sonatype.org/spice/trunk/spice-parent - http://svn.sonatype.org/spice/trunk/spice-parent - scm:svn:https://svn.sonatype.org/spice/trunk/spice-parent - - - - - 6.1.12 - - - - - - org.codehaus.plexus - plexus-container-default - 1.0-beta-1 - - - commons-logging - commons-logging - - - commons-logging - commons-logging-api - - - log4j - log4j - - - - - org.codehaus.plexus - plexus-component-annotations - 1.0-beta-1 - - - org.codehaus.plexus - plexus-utils - 1.5.5 - - - org.mortbay.jetty - jetty - ${jetty.version} - - - org.mortbay.jetty - jetty-client - ${jetty.version} - - - junit - junit - 4.5 - test - - - - - - - - - org.codehaus.plexus - plexus-component-metadata - 1.0-beta-1 - - - process-classes - - generate-metadata - - - - - - org.codehaus.plexus - plexus-maven-plugin - 1.3.8 - - - - descriptor - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/multiple-filters/pom.xml b/maven-project/src/test/resources-project-builder/multiple-filters/pom.xml deleted file mode 100644 index 1141efb5a7..0000000000 --- a/maven-project/src/test/resources-project-builder/multiple-filters/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - a - b - 1.0 - - - - src/main/filters/a.properties - src/main/filters/c.properties - src/main/filters/b.properties - src/main/filters/d.properties - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/multiple-repos/pom.xml b/maven-project/src/test/resources-project-builder/multiple-repos/pom.xml deleted file mode 100644 index 6c14fcd035..0000000000 --- a/maven-project/src/test/resources-project-builder/multiple-repos/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - 4.0.0 - - mng3984 - test-1 - 0.1 - - MNG-3984 - - - central-parent - Maven Repository Switchboard - default - http://repo1.maven.org/maven2 - - false - - - - - - diff --git a/maven-project/src/test/resources-project-builder/multiple-repos/sub/pom.xml b/maven-project/src/test/resources-project-builder/multiple-repos/sub/pom.xml deleted file mode 100644 index d7b210201a..0000000000 --- a/maven-project/src/test/resources-project-builder/multiple-repos/sub/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - 4.0.0 - - mng3984 - test-1 - 0.1 - - mng3984 - test-2 - 0.1 - - MNG-3984 - - - central-child - Maven Repository Switchboard - default - http://repo1.maven.org/maven2 - - false - - - - diff --git a/maven-project/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml b/maven-project/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml deleted file mode 100644 index d3c5cc1f69..0000000000 --- a/maven-project/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3904 - test - 0.1 - jar - - Maven Integration Test :: MNG-3904 - - Test that properties which refer to build directories which in turn refer to other build directories are - properly interpolated. - - - - - ${project.build.outputDirectory}/dir0 - ${project.build.testSourceDirectory}/dir1 - ${project.reporting.outputDirectory}/dir2 - - - - - ${project.basedir}/target - ${project.build.directory}/classes - - ${basedir}/src - ${project.build.sourceDirectory}/test - - - - ${project.build.directory}/site - - diff --git a/maven-project/src/test/resources-project-builder/parent-inheritance/child3.xml b/maven-project/src/test/resources-project-builder/parent-inheritance/child3.xml deleted file mode 100644 index 54f9b29daf..0000000000 --- a/maven-project/src/test/resources-project-builder/parent-inheritance/child3.xml +++ /dev/null @@ -1,6 +0,0 @@ - - gid - child-3 - 1.0 - 4.0.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/parent-inheritance/pom.xml b/maven-project/src/test/resources-project-builder/parent-inheritance/pom.xml deleted file mode 100644 index 3dc28738a3..0000000000 --- a/maven-project/src/test/resources-project-builder/parent-inheritance/pom.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - gid - child-3 - 1.0 - child3.xml - - 4.0.0 - child-2 - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/parent-inheritance/sub/pom.xml b/maven-project/src/test/resources-project-builder/parent-inheritance/sub/pom.xml deleted file mode 100644 index 2d4671ed9f..0000000000 --- a/maven-project/src/test/resources-project-builder/parent-inheritance/sub/pom.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - gid - child-2 - 1.0 - - 4.0.0 - child-1 - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/parent-interpolation/pom.xml b/maven-project/src/test/resources-project-builder/parent-interpolation/pom.xml deleted file mode 100644 index 7414d0234e..0000000000 --- a/maven-project/src/test/resources-project-builder/parent-interpolation/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - 4.0.0 - org.sonatype.nexus - nexus - 1.3.0-SNAPSHOT - - - - org.codehaus.modello - modello-maven-plugin - ${project.version} - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/parent-interpolation/sub/pom.xml b/maven-project/src/test/resources-project-builder/parent-interpolation/sub/pom.xml deleted file mode 100644 index 752852b1b1..0000000000 --- a/maven-project/src/test/resources-project-builder/parent-interpolation/sub/pom.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - org.sonatype.nexus - nexus - 1.3.0-SNAPSHOT - - 4.0.0 - a - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/platform-file-separator/pom.xml b/maven-project/src/test/resources-project-builder/platform-file-separator/pom.xml deleted file mode 100644 index a5bea4848e..0000000000 --- a/maven-project/src/test/resources-project-builder/platform-file-separator/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3877 - test - 1.0 - jar - - Maven Integration Test :: MNG-3877 - - Verify that paths to project directories use the platform-specific file separator. - - - - - src/main/filters/it.properties - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml deleted file mode 100644 index 52fb468dc2..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng2591 - parent - 1.0 - pom - - Maven Integration Test :: MNG-2591 - - Test aggregation of list configuration items for build plugins when using - 'combine.children=append' attribute. - - - - subproject - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - true - - - - PARENT-1 - PARENT-3 - PARENT-2 - PARENT-4 - - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - true - - - - PARENT-1 - PARENT-3 - PARENT-2 - PARENT-4 - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml deleted file mode 100644 index cef53d32f4..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng2591 - parent - 1.0 - - - subproject - 1.0 - jar - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - target/config.properties - - - CHILD-1 - CHILD-3 - CHILD-2 - CHILD-4 - - - - CHILD-1 - CHILD-3 - CHILD-2 - CHILD-4 - - - - - test - validate - - config - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml deleted file mode 100644 index 48a8d393ba..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng2591 - parent - 1.0 - pom - - Maven Integration Test :: MNG-2591 - - Test aggregation of list configuration items for build plugins when using - 'combine.children=append' attribute. - - - - subproject - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - true - - - - PARENT-1 - PARENT-3 - PARENT-2 - PARENT-4 - - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - true - - - - PARENT-1 - PARENT-3 - PARENT-2 - PARENT-4 - - - - - - - - - - parent - - true - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml deleted file mode 100644 index 7023503089..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng2591 - parent - 1.0 - - - subproject - 1.0 - jar - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - target/config.properties - - - CHILD-1 - CHILD-3 - CHILD-2 - CHILD-4 - - - - CHILD-1 - CHILD-3 - CHILD-2 - CHILD-4 - - - - - test - validate - - config - - - - - - - - - - - child - - true - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml deleted file mode 100644 index cfe425b631..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng4053 - test2 - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-4053 - - Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when - plugin management is used. - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - target/config.properties - - - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml deleted file mode 100644 index f22a18190e..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng4053 - test3 - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-4053 - - Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when - plugin management and a profile are used. - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - - - - - - - - maven-core-it - - true - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - target/config.properties - - - - - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml deleted file mode 100644 index 49e2452d87..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng4053 - test1 - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-4053 - - Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when - no plugin management is used. - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - target/config.properties - - - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-config-merging/child/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-merging/child/pom.xml deleted file mode 100644 index dd5fe00885..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-config-merging/child/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3836 - parent - 1.0-SNAPSHOT - - - org.apache.maven.its.mng3836 - child - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-3836 - - Verify that children can *override* inherited plugin configuration. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - - PASSED - - PASSED-1 - PASSED-3 - PASSED-2 - PASSED-4 - - - PASSED-1 - PASSED-3 - PASSED-2 - PASSED-4 - - - - - validate - - config - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-config-merging/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-merging/pom.xml deleted file mode 100644 index e96d6e1534..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-config-merging/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3836 - parent - 1.0-SNAPSHOT - pom - - Maven Integration Test :: MNG-3836 - - Verify that children can *override* inherited plugin configuration. - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - FAILED - - FAILED-1 - FAILED-3 - FAILED-2 - FAILED-4 - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - FAILED - - FAILED-1 - FAILED-3 - FAILED-2 - FAILED-4 - - PASSED - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml deleted file mode 100644 index 2b3fd71d03..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3827 - test2 - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-3827 - - Verify that plain plugin configuration works correctly. - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - - - one - two - three - four - - - - - validate - - config - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml deleted file mode 100644 index 22a2b810f6..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3827 - test1 - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-3827 - - Verify that plain plugin configuration works correctly. - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - - - one - two - three - four - - - - - validate - - config - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml b/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml deleted file mode 100644 index e56603919b..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - a - b - 1.0 - - - - maven-surefire-plugin - - - - - - maven-surefire-plugin - 2.4 - - - - my.property - my.value - - - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml deleted file mode 100644 index a5ecf1ba6f..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3827 - test2 - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-3864 - - Verify that plain per-execution plugin configuration works correctly. - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - - - validate - - config - - - - one - two - three - four - - - - key1 - value1 - - - key2 - value2 - - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml deleted file mode 100644 index 5a5f4c726b..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3827 - test1 - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-3864 - - Verify that plain per-execution plugin configuration works correctly. - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - - - validate - - config - - - - one - two - three - four - - - - key1 - value1 - - - key2 - value2 - - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml deleted file mode 100644 index 07450ca28f..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3886 - test - 0.1 - pom - - Maven Integration Test :: MNG-3886 - - Test that the goals from a plugin execution are executed in the order given by the POM, regardless whether - plugin management is present or not. - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - - b - a - d - c - e - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml deleted file mode 100644 index 51660135fb..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3886 - test - 0.1 - pom - - Maven Integration Test :: MNG-3886 - - Test that the goals from a plugin execution are executed in the order given by the POM, regardless whether - plugin management is present or not. - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - - b - a - d - c - e - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml deleted file mode 100644 index b64af3ae4a..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3916 - parent - 0.1 - pom - - Maven Integration Test :: MNG-3943 - - Test that plugin executions are properly merged during inheritance, even if the child uses a different - plugin version than the parent. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - - 1.0 - - - parent-1 - parent-1 - - - parent-2 - parent-2 - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml deleted file mode 100644 index f96116adfb..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3916 - parent - 0.1 - - - child - - Maven Integration Test :: MNG-3943 - - Test that plugin executions are properly merged during inheritance, even if the child uses a different - plugin version than the parent. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - - 2.0 - - - child-1 - child-1 - - - child-2 - child-2 - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml deleted file mode 100644 index e243cfd054..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3916 - parent - 0.1 - pom - - Maven Integration Test :: MNG-3916 - - Test that plugin executions are properly merged during inheritance, even if the child plugin section has no - version. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0 - - - parent-1 - parent-1 - - - parent-2 - parent-2 - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml deleted file mode 100644 index bdeb76e105..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3916 - parent - 0.1 - - - child - - Maven Integration Test :: MNG-3916 - - Test that plugin executions are properly merged during inheritance, even if the child plugin section has no - version. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - - - - child-1 - child-1 - - - child-2 - child-2 - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml deleted file mode 100644 index e04c7b1e23..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3938 - parent - 0.1 - pom - - Maven Integration Test :: MNG-3938 - - Test that plugin executions with the same id are merged during inheritance, especially executions using the - default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults. - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 2.1-SNAPSHOT - - - - parent-default - - - non-default - parent-non-default - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml deleted file mode 100644 index 827b907535..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3938 - parent - 0.1 - - - child - - Maven Integration Test :: MNG-3938 - - Test that plugin executions with the same id are merged during inheritance, especially executions using the - default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 2.1-SNAPSHOT - - - - default - child-default - - - non-default - child-non-default - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml deleted file mode 100644 index e0055d0032..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3938 - parent - 0.1 - pom - - Maven Integration Test :: MNG-3938 - - Test that plugin executions with the same id are merged during inheritance, especially executions using the - default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults. - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 2.1-SNAPSHOT - - - - parent-default - - - non-default - parent-non-default - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml deleted file mode 100644 index 827b907535..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3938 - parent - 0.1 - - - child - - Maven Integration Test :: MNG-3938 - - Test that plugin executions with the same id are merged during inheritance, especially executions using the - default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 2.1-SNAPSHOT - - - - default - child-default - - - non-default - child-non-default - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml deleted file mode 100644 index a8b031f2f7..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3887 - test - 0.1 - pom - - Maven Integration Test :: MNG-3887 - - Test that multiple plugin executions bound to the same phase are executed in the order given by the POM. - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - b - validate - - - a - validate - - - d - validate - - - c - validate - - - e - validate - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml deleted file mode 100644 index c226262c5c..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3887 - test - 0.1 - pom - - Maven Integration Test :: MNG-3887 - - Test that multiple plugin executions bound to the same phase are executed in the order given by the POM. - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-a - 1.0-SNAPSHOT - - - b - validate - - - a - validate - - - d - validate - - - c - validate - - - e - validate - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml deleted file mode 100644 index 4cbab22e5b..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng4000 - test2 - 0.1 - - Maven Integration Test :: MNG-4000 - - Test that plugin executions without id are not lost among other plugin executions. - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-log-file - 2.1-SNAPSHOT - - - - - - org.apache.maven.its.plugins - maven-it-plugin-log-file - - target/exec.log - exec - - - - exec-1 - validate - - log-string - - - - - validate - - log-string - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml b/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml deleted file mode 100644 index 9fcf91b16d..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng4000 - test1 - 0.1 - - Maven Integration Test :: MNG-4000 - - Test that plugin executions without id are not lost among other plugin executions. - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-log-file - 2.1-SNAPSHOT - - target/exec.log - exec - - - - exec-1 - validate - - log-string - - - - - validate - - log-string - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml b/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml deleted file mode 100644 index 37e004440c..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - 4.0.0 - gid - aid - 1.0 - - - - org.codehaus.modello - modello-maven-plugin - 1.0-alpha-21 - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml b/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml deleted file mode 100644 index f6ed4dd499..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - gid - aid - 1.0 - - 4.0.0 - org.sonatype.nexus - nexus - 1.3.0-SNAPSHOT - - - - org.codehaus.modello - modello-maven-plugin2 - 1.0-alpha-21 - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/plugin-management-dependencies/pom.xml b/maven-project/src/test/resources-project-builder/plugin-management-dependencies/pom.xml deleted file mode 100644 index 4df7cc6fb9..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-management-dependencies/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - gid - aid - 1.0 - - - - - org.codehaus.modello - modello-maven-plugin - 1.0-alpha-21 - - - a - b - 1.0 - - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/plugin-management-dependencies/sub/pom.xml b/maven-project/src/test/resources-project-builder/plugin-management-dependencies/sub/pom.xml deleted file mode 100644 index 7f73423e5e..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-management-dependencies/sub/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - gid - aid - 1.0 - - 4.0.0 - org.sonatype.nexus - nexus - 1.3.0-SNAPSHOT - - - test - - - - org.codehaus.modello - modello-maven-plugin - 1.0-alpha-21 - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml b/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml deleted file mode 100644 index b59e68befb..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - gid - aid - 1.0 - - - - - org.apache.maven.its.plugins - - maven-it-plugin-configuration - - 2.1-SNAPSHOT - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml b/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml deleted file mode 100644 index 5e844b7987..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - gid - aid - 1.0 - - 4.0.0 - - org.apache.maven.its.mng4053 - test2 - 1.0-SNAPSHOT - - - - - - maven-compiler-plugin - 0.1-stub-SNAPSHOT - - - maven-jar-plugin - 0.1-stub-SNAPSHOT - - - maven-javadoc-plugin - 0.1-stub-SNAPSHOT - - - maven-resources-plugin - 0.1-stub-SNAPSHOT - - - maven-source-plugin - 0.1-stub-SNAPSHOT - - - maven-surefire-plugin - 0.1-stub-SNAPSHOT - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/plugin-management-inheritance/pom.xml b/maven-project/src/test/resources-project-builder/plugin-management-inheritance/pom.xml deleted file mode 100644 index ac4da04b86..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-management-inheritance/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.it0052 - maven-it-it0052 - 1.0 - jar - - Maven Integration Test :: it0052 - Test that source attachment doesn't take place when -DperformRelease=true is missing. - - - - - - - maven-compiler-plugin - 0.1-stub-SNAPSHOT - - - maven-jar-plugin - 0.1-stub-SNAPSHOT - - - maven-javadoc-plugin - 0.1-stub-SNAPSHOT - - - maven-resources-plugin - 0.1-stub-SNAPSHOT - - - maven-source-plugin - 0.1-stub-SNAPSHOT - - - maven-surefire-plugin - 0.1-stub-SNAPSHOT - - - - - diff --git a/maven-project/src/test/resources-project-builder/plugin-merge-simple/pom.xml b/maven-project/src/test/resources-project-builder/plugin-merge-simple/pom.xml deleted file mode 100644 index 10eac25fd4..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-merge-simple/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - 4.0.0 - - org.sonatype.nexus - nexus-indexer - 1.1.3-SNAPSHOT - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/plugin-order/nexus-parent.xml b/maven-project/src/test/resources-project-builder/plugin-order/nexus-parent.xml deleted file mode 100644 index 64851f9e2c..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-order/nexus-parent.xml +++ /dev/null @@ -1,18 +0,0 @@ - - 4.0.0 - - org.sonatype.nexus - nexus-parent - 8-SNAPSHOT - - - - - org.codehaus.plexus - plexus-component-metadata - ${plexus.version} - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/plugin-order/pom.xml b/maven-project/src/test/resources-project-builder/plugin-order/pom.xml deleted file mode 100644 index 22594e52b4..0000000000 --- a/maven-project/src/test/resources-project-builder/plugin-order/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - 4.0.0 - - - org.sonatype.nexus - nexus-parent - 8-SNAPSHOT - nexus-parent.xml - - - org.sonatype.nexus - nexus-indexer - 1.1.3-SNAPSHOT - - - - - org.codehaus.plexus - plexus-component-metadata - - - - maven-surefire-plugin - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml b/maven-project/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml deleted file mode 100644 index 65560c0763..0000000000 --- a/maven-project/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - 4.0.0 - org.sonatype.nexus - nexus - 1.3.0-SNAPSHOT - - - - - org.codehaus.modello - modello-maven-plugin - 1.0-alpha-21 - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml b/maven-project/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml deleted file mode 100644 index 319e6adbf0..0000000000 --- a/maven-project/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - org.sonatype.nexus - nexus - 1.3.0-SNAPSHOT - - 4.0.0 - a - - - - org.codehaus.modello - modello-maven-plugin - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml b/maven-project/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml deleted file mode 100644 index aaa433e443..0000000000 --- a/maven-project/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - 4.0.0 - - org.apache.maven.its.mng2254 - latin-1 - 0.1-SNAPSHOT - pom - - Maven Integration Test :: MNG-2254 :: Latin-1 - TEST-CHARS: ÄÖÜäöüß - diff --git a/maven-project/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml b/maven-project/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml deleted file mode 100644 index 07b892466b..0000000000 --- a/maven-project/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - 4.0.0 - - org.apache.maven.its.mng2254 - utf-8 - 0.1-SNAPSHOT - pom - - Maven Integration Test :: MNG-2254 :: UTF-8 - TEST-CHARS: ßıΣЯ×€ - diff --git a/maven-project/src/test/resources-project-builder/pom-inheritance/pom.xml b/maven-project/src/test/resources-project-builder/pom-inheritance/pom.xml deleted file mode 100644 index 59cef1d8dc..0000000000 --- a/maven-project/src/test/resources-project-builder/pom-inheritance/pom.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - - - - 4.0.0 - - - - org.apache.maven.its.mng3843 - parent-1 - 0.1 - pom - - parent-name - parent-description - http://parent.url/ - 2008 - - parent-org - http://parent-org.url/ - - - - parent-license - http://parent.url/license - repo - - - - - - parent-developer - - - - - parent-contributor - - - - - - parent-mailing-list - - - - - 2.0 - - - - child-1 - child-2 - - - - http://parent.url/trunk - http://parent.url/scm - https://parent.url/scm - - - http://parent.url/issues - - - http://parent.url/ci - - - - http://parent.url/dist - parent.distros - - - http://parent.url/snaps - parent.snaps - - - http://parent.url/site - parent.site - - http://parent.url/download - - parent-reloc-msg - - - - - parent-property - parent-property - - - - - - org.apache.maven.its.mng3843 - parent-dep-a - 1 - test - - - - - - org.apache.maven.its.mng3843 - parent-dep-b - 1 - test - - - - - - parent-remote-repo - http://parent.url/remote - - - - - initialize - out - src/main - src/scripts - src/test - out/main - out/test - - - res/main - - - - - res/test - - - - - org.apache.maven.its.plugins - maven-it-plugin-expression - 2.1-SNAPSHOT - - - validate - - eval - - - target/pom.properties - - project - - - - - - - - - - true - site - - - - - parent-profile - - - diff --git a/maven-project/src/test/resources-project-builder/pom-inheritance/sub/pom.xml b/maven-project/src/test/resources-project-builder/pom-inheritance/sub/pom.xml deleted file mode 100644 index ae74902875..0000000000 --- a/maven-project/src/test/resources-project-builder/pom-inheritance/sub/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - 4.0.0 - - - - - org.apache.maven.its.mng3843 - parent-1 - 0.1 - - - child-1 - diff --git a/maven-project/src/test/resources-project-builder/profile-default-deactivation/pom.xml b/maven-project/src/test/resources-project-builder/profile-default-deactivation/pom.xml deleted file mode 100644 index dfe19253f8..0000000000 --- a/maven-project/src/test/resources-project-builder/profile-default-deactivation/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - 4.0.0 - org.apache.maven.its.mng3545 - test-artifact - 1.0-SNAPSHOT - - - profile1 - - true - - - - - org.apache.maven.its.plugins - maven-it-plugin-touch - 2.2 - - - - - - profile4 - - - - org.apache.maven.its.plugins - maven-it-plugin-touch - 2.1 - - - - - - diff --git a/maven-project/src/test/resources-project-builder/profile-injected-dependencies/pom.xml b/maven-project/src/test/resources-project-builder/profile-injected-dependencies/pom.xml deleted file mode 100644 index fc7fab955b..0000000000 --- a/maven-project/src/test/resources-project-builder/profile-injected-dependencies/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng1412 - test - 0.1-SNAPSHOT - - Maven Integration Test :: MNG-1412 - - Check that dependencies are available in classpath in same order as declared in POM. - - - - - - org.apache.maven.its.mng1412 - a - 0.1 - - - org.apache.maven.its.mng1412 - c - 0.1 - - - org.apache.maven.its.mng1412 - b - 0.1 - - - - - - mng-1412 - - true - - - - - - org.apache.maven.its.mng1412 - a - 0.1 - - - org.apache.maven.its.mng1412 - d - 0.1 - - - - - diff --git a/maven-project/src/test/resources-project-builder/profile-injection-order/pom.xml b/maven-project/src/test/resources-project-builder/profile-injection-order/pom.xml deleted file mode 100644 index 784996de5f..0000000000 --- a/maven-project/src/test/resources-project-builder/profile-injection-order/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng2309 - test - 1.0-SNAPSHOT - jar - - Maven Integration Test :: MNG-2309 - - Test that profiles are injected in declaration order, with the last profile being the most dominant. - - - - - - pom-a - - a - - - - pom-b - - b - - - - pom-c - - c - - - - pom-d - - d - - - - pom-e - - e - - - - diff --git a/maven-project/src/test/resources-project-builder/profile-module-inheritance/pom.xml b/maven-project/src/test/resources-project-builder/profile-module-inheritance/pom.xml deleted file mode 100644 index 4e4c40b216..0000000000 --- a/maven-project/src/test/resources-project-builder/profile-module-inheritance/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - 4.0.0 - org.ops4j.pax - construct - 1.0 - pom - - - - dist - - maven-inherit-plugin - maven-pax-plugin - - - - - diff --git a/maven-project/src/test/resources-project-builder/profile-module-inheritance/sub/pom.xml b/maven-project/src/test/resources-project-builder/profile-module-inheritance/sub/pom.xml deleted file mode 100644 index 60f057cce3..0000000000 --- a/maven-project/src/test/resources-project-builder/profile-module-inheritance/sub/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - org.ops4j.pax - construct - 1.0 - - - 4.0.0 - org.ops4j - maven-inherit-plugin - 1.1 - diff --git a/maven-project/src/test/resources-project-builder/profile-module/pom.xml b/maven-project/src/test/resources-project-builder/profile-module/pom.xml deleted file mode 100644 index b6336fd48c..0000000000 --- a/maven-project/src/test/resources-project-builder/profile-module/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - gid - aid - 1.0 - pom - - module-2 - module-1 - module-3 - - - - a - - test-prop - - - module-1 - module-4 - - - - diff --git a/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml b/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml deleted file mode 100644 index 118861a34a..0000000000 --- a/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng2174 - parent - 1.0-SNAPSHOT - pom - - Maven Integration Test :: MNG-2174 - - Verify that plugin dependencies defined by plugin management of a parent profile are not lost when the - parent's main plugin management section is also present. - - - - sub - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-class-loader - 2.1-SNAPSHOT - - - - - - - - maven-core-it - - true - - - - - - org.apache.maven.its.plugins - maven-it-plugin-class-loader - - - org.apache.maven.its.mng2174 - a - 0.1 - - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml b/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml deleted file mode 100644 index 9c06879520..0000000000 --- a/maven-project/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng2174 - parent - 1.0-SNAPSHOT - - - org.apache.maven.its.mng2174 - child - 1.0-SNAPSHOT - - Maven Integration Test :: MNG-2174 - - Verify that plugin dependencies defined by plugin management of a parent profile are not lost when the - parent's main plugin management section is also present. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-class-loader - - - test - validate - - mng-2174.properties - target/pcl.properties - - - load - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/profile-plugins/pom.xml b/maven-project/src/test/resources-project-builder/profile-plugins/pom.xml deleted file mode 100644 index cc305f9788..0000000000 --- a/maven-project/src/test/resources-project-builder/profile-plugins/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven - maven - 3.0-SNAPSHOT - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - - - standard - - true - - - - - org.apache.maven.plugins - maven-assembly2-plugin - - - - - - diff --git a/maven-project/src/test/resources-project-builder/profile-properties-interpolation/pom.xml b/maven-project/src/test/resources-project-builder/profile-properties-interpolation/pom.xml deleted file mode 100644 index a95e253b63..0000000000 --- a/maven-project/src/test/resources-project-builder/profile-properties-interpolation/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3900 - test - 0.1 - jar - - Maven Integration Test :: MNG-3900 - - Test that build properties defined via active profiles are used for - interpolation. - - - - http://maven.apache.org/${test} - - - FAILED - ${test} - - - - - interpolation-profile - - - PASSED - PASSED - - - - diff --git a/maven-project/src/test/resources-project-builder/properties-inheritance/pom.xml b/maven-project/src/test/resources-project-builder/properties-inheritance/pom.xml deleted file mode 100644 index 6d17dd3a0a..0000000000 --- a/maven-project/src/test/resources-project-builder/properties-inheritance/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3843 - parent-1 - 0.1 - pom - - - parent-property - parent-property - - diff --git a/maven-project/src/test/resources-project-builder/properties-inheritance/sub/pom.xml b/maven-project/src/test/resources-project-builder/properties-inheritance/sub/pom.xml deleted file mode 100644 index c5394df5c3..0000000000 --- a/maven-project/src/test/resources-project-builder/properties-inheritance/sub/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3843 - parent-1 - 0.1 - - - org.apache.maven.its.mng3843.child - child-2 - 0.2 - jar - - - child-property - child-override - - diff --git a/maven-project/src/test/resources-project-builder/properties-no-duplication/pom.xml b/maven-project/src/test/resources-project-builder/properties-no-duplication/pom.xml deleted file mode 100644 index ebdb8b1cc1..0000000000 --- a/maven-project/src/test/resources-project-builder/properties-no-duplication/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - 4.0.0 - org.apache.maven.its - test-parent - 1.0-SNAPSHOT - - parent - - diff --git a/maven-project/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml b/maven-project/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml deleted file mode 100644 index 9241b8bb76..0000000000 --- a/maven-project/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - - org.apache.maven.its - test-parent - 1.0-SNAPSHOT - - org.apache.maven.its - test - 1.0-SNAPSHOT - - child - - - diff --git a/maven-project/src/test/resources-project-builder/repo-inheritance/pom.xml b/maven-project/src/test/resources-project-builder/repo-inheritance/pom.xml deleted file mode 100644 index 67f9ee6fc9..0000000000 --- a/maven-project/src/test/resources-project-builder/repo-inheritance/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.it0043 - maven-it-it0043 - 1.0-SNAPSHOT - - Maven Integration Test :: it0043 - Test for repository inheritence - ensure using the same id overrides the defaults - - - - central - it0043 - file:///${basedir}/target/maven-core-it0043-repo - - - - - - central - it0043 - file:///${basedir}/target/maven-core-it0043-repo - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-expression - 2.1-SNAPSHOT - - target/expression.properties - - project/repositories - project/pluginRepositories - - - - - - diff --git a/maven-project/src/test/resources-project-builder/reporting-interpolation/pom.xml b/maven-project/src/test/resources-project-builder/reporting-interpolation/pom.xml deleted file mode 100644 index 49df00a8bb..0000000000 --- a/maven-project/src/test/resources-project-builder/reporting-interpolation/pom.xml +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - gid - aid - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/reporting-plugin-config/pom.xml b/maven-project/src/test/resources-project-builder/reporting-plugin-config/pom.xml deleted file mode 100644 index fdb455a090..0000000000 --- a/maven-project/src/test/resources-project-builder/reporting-plugin-config/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3811 - test-parent - 1.0-SNAPSHOT - pom - - MNG-3811 :: Parent - Test inheritance of reporting plugin configuration - - - child - - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - true - - parentParam - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml b/maven-project/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml deleted file mode 100644 index e6018dd604..0000000000 --- a/maven-project/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3811 - test-parent - 1.0-SNAPSHOT - - test-child - - MNG-3811 :: Child - - - - - org.apache.maven.its.plugins - maven-it-plugin-configuration - 2.1-SNAPSHOT - - - childParam - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml b/maven-project/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml deleted file mode 100644 index 6a60a8eb94..0000000000 --- a/maven-project/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml +++ /dev/null @@ -1,37 +0,0 @@ - - 4.0.0 - org.mortbay.jetty - jetty-parent - pom - Jetty :: Administrative Parent - 7 - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.0-alpha-3 - - - enforce-java - - enforce - - - - - [2.0.6,) - - - [1.5,) - - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/single-configuration-inheritance/pom.xml b/maven-project/src/test/resources-project-builder/single-configuration-inheritance/pom.xml deleted file mode 100644 index 695ffaff0c..0000000000 --- a/maven-project/src/test/resources-project-builder/single-configuration-inheritance/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - 4.0.0 - - org.mortbay.jetty - jetty-parent - 7 - jetty-parent.xml - - org.mortbay.jetty - project - pom - Jetty Server Project - 6.1.12 - - install - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-java - - enforce - - - - - 2.0.6 - - - [1.4,) - - - - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources-project-builder/unc-path/pom.xml b/maven-project/src/test/resources-project-builder/unc-path/pom.xml deleted file mode 100644 index 1e9035c487..0000000000 --- a/maven-project/src/test/resources-project-builder/unc-path/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3621 - test-parent - 1.0-SNAPSHOT - pom - - MNG-3621 :: Parent - Test inheritance of UNC paths - - - child - - - - - site - file:////host/site/ - - - diff --git a/maven-project/src/test/resources-project-builder/unc-path/sub/pom.xml b/maven-project/src/test/resources-project-builder/unc-path/sub/pom.xml deleted file mode 100644 index fddd8723bd..0000000000 --- a/maven-project/src/test/resources-project-builder/unc-path/sub/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3621 - test-parent - 1.0-SNAPSHOT - - test-child - - MNG-3621 :: Child - - - - - org.apache.maven.its.plugins - maven-it-plugin-expression - 2.1-SNAPSHOT - - target/pom.properties - - project/distributionManagement/site/url - - - - - test - validate - - eval - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml b/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml deleted file mode 100644 index 5081a6cf38..0000000000 --- a/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3831 - parent - 1.0 - - - org.apache.maven.its.mng3831.child - child - 2.0-alpha-1 - jar - - child-name - child-desc - http://child.org/ - 2008 - - child-org-name - - - - 2.0.0 - - - - http://scm.org/ - - - http://issue.org/ - - - http://ci.org/ - - - - maven-core-it - child-dist-repo - http://dist.org/ - - - maven-core-it - child-site - http://site.org/ - - - - - - ${basedir} - ${groupId} - ${artifactId} - ${version} - ${packaging} - ${name} - ${description} - ${url} - ${inceptionYear} - ${organization.name} - ${prerequisites.maven} - ${scm.url} - ${issueManagement.url} - ${ciManagement.url} - ${distributionManagement.repository.name} - ${distributionManagement.repository.url} - ${distributionManagement.site.url} - ${build.outputDirectory} - ${reporting.outputDirectory} - ${parent.groupId} - ${parent.artifactId} - ${parent.version} - - - - target/bin - - - - target/doc - - - diff --git a/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml b/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml deleted file mode 100644 index d5c76696e7..0000000000 --- a/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3831 - parent - 1.0 - pom - - Maven Integration Test :: MNG-3831 - Test POM interpolation with expressions of the form $ { * } (ugly but real) - - - parent/child - - diff --git a/maven-project/src/test/resources-project-builder/url-append/child/pom.xml b/maven-project/src/test/resources-project-builder/url-append/child/pom.xml deleted file mode 100644 index 1f377df1ff..0000000000 --- a/maven-project/src/test/resources-project-builder/url-append/child/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng2006 - parent - 0.1 - ../parent/pom.xml - - - child - Child Project - - Test that inheritance of those URLs which automatically append the child's artifact id take the child's - relative location to the parent into account. - - - - - - org.apache.maven.its.plugins - maven-it-plugin-expression - 2.1-SNAPSHOT - - - validate - - eval - - - target/pom.properties - - project/url - project/scm - project/distributionManagement/site - - - - - - - - diff --git a/maven-project/src/test/resources-project-builder/url-append/parent/pom.xml b/maven-project/src/test/resources-project-builder/url-append/parent/pom.xml deleted file mode 100644 index 00a4a349b3..0000000000 --- a/maven-project/src/test/resources-project-builder/url-append/parent/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng2006 - parent - 0.1 - pom - - Maven Integration Test :: MNG-2006 - - Test that inheritance of those URLs which automatically append the child's artifact id take the child's - relative location to the parent into account. - - - - ../child - - - http://project.url/parent - - - http://viewvc.project.url/parent - http://scm.project.url/parent - https://scm.project.url/parent - - - - http://site.project.url/parent - parent.site - - - diff --git a/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml b/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml deleted file mode 100644 index 463772feb2..0000000000 --- a/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - 4.0.0 - - - - - org.apache.maven.its.mng3846 - parent - 0.1 - - - ap - pom - Another Parent to test multi-level URL adjustment - diff --git a/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml b/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml deleted file mode 100644 index 128e63d12e..0000000000 --- a/maven-project/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - 4.0.0 - - - - - org.apache.maven.its.mng3846 - ap - 0.1 - - - child - Child Project - diff --git a/maven-project/src/test/resources-project-builder/url-inheritance/pom.xml b/maven-project/src/test/resources-project-builder/url-inheritance/pom.xml deleted file mode 100644 index 138cb6942d..0000000000 --- a/maven-project/src/test/resources-project-builder/url-inheritance/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3846 - parent - 0.1 - pom - - Maven Integration Test :: MNG-3846 - - Test that inheritance of certain URLs automatically appends the child's artifact id. - - - http://parent.url/ - - parent-org - http://parent.url/org/ - - - - parent-license - http://parent.url/license.txt - repo - - - - - http://parent.url/viewvc - http://parent.url/scm - https://parent.url/scm - - - http://parent.url/issues - - - http://parent.url/ci - - - - http://parent.url/dist - parent.distros - - - http://parent.url/snaps - parent.snaps - - - http://parent.url/site - parent.site - - http://parent.url/download - - diff --git a/maven-project/src/test/resources-project-builder/url-inheritance/sub/pom.xml b/maven-project/src/test/resources-project-builder/url-inheritance/sub/pom.xml deleted file mode 100644 index c8e9c108d3..0000000000 --- a/maven-project/src/test/resources-project-builder/url-inheritance/sub/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - 4.0.0 - - - - - org.apache.maven.its.mng3846 - parent - 0.1 - - - child - Child Project - diff --git a/maven-project/src/test/resources-project-builder/url-no-decoding/pom.xml b/maven-project/src/test/resources-project-builder/url-no-decoding/pom.xml deleted file mode 100644 index 5b92e23ed9..0000000000 --- a/maven-project/src/test/resources-project-builder/url-no-decoding/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng4116 - test - 1.0-SNAPSHOT - jar - - Maven Integration Test :: MNG-4116 - - Test that the project builder does not decode URLs (which must be done by the transport layer instead). - - - - http://maven.apache.org/spacy%20path - - scm:svn:svn+ssh://svn.apache.org/spacy%20path - scm:svn:svn+ssh://svn.apache.org/spacy%20path - http://svn.apache.org/viewvc/spacy%20path - - - none - http://issues.apache.org/spacy%20path - - - none - http://ci.apache.org/spacy%20path - - - - dist - scm:svn:svn+ssh://dist.apache.org/spacy%20path - - - snap - scm:svn:svn+ssh://snap.apache.org/spacy%20path - - - site - scm:svn:svn+ssh://site.apache.org/spacy%20path - - - diff --git a/maven-project/src/test/resources-project-builder/xml-coalesce-text/pom.xml b/maven-project/src/test/resources-project-builder/xml-coalesce-text/pom.xml deleted file mode 100644 index f7742fd72e..0000000000 --- a/maven-project/src/test/resources-project-builder/xml-coalesce-text/pom.xml +++ /dev/null @@ -1,567 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3839 - coreit - 0.1 - jar - - Maven Integration Test :: MNG-3839 - - Test that POM parsing properly coalesces text data. - - - - - A ProjectProperty - - - That's a test! - - - -00 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -01 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -02 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -03 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -04 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -05 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -06 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -07 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -08 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -09 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -10 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -11 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -12 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -13 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -14 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -15 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -16 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -17 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -18 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -19 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -20 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -21 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -22 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -23 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -24 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -25 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -26 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -27 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -28 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -29 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -30 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -31 KB 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X -0 1 2 3 4 5 6 X - - - diff --git a/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml b/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml deleted file mode 100644 index aec8b6cbc3..0000000000 --- a/maven-project/src/test/resources-project-builder/xml-markup-interpolation/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3924 - test - 0.1-SNAPSHOT - jar - - Maven Integration Test :: MNG-3924 - - Test that interpolation of properties that resolve to XML markup doesn't crash the project builder. - - - - - <?xml version='1.0'?>Tom&Jerry - - ${xmlMarkup} - - diff --git a/maven-project/src/test/resources-project-builder/xml-whitespace/pom.xml b/maven-project/src/test/resources-project-builder/xml-whitespace/pom.xml deleted file mode 100644 index 433dd522c8..0000000000 --- a/maven-project/src/test/resources-project-builder/xml-whitespace/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - 4.0.0 - - - - org.apache.maven.its.mng4070 - - - parent - - - 1.0 - - - pom - - - Maven Integration Test :: MNG-4070 - - Test that whitespace around artifact coordinates does not change artifact identity. - - diff --git a/maven-project/src/test/resources-project-builder/xml-whitespace/sub/pom.xml b/maven-project/src/test/resources-project-builder/xml-whitespace/sub/pom.xml deleted file mode 100644 index 858a82d6a6..0000000000 --- a/maven-project/src/test/resources-project-builder/xml-whitespace/sub/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - 4.0.0 - - - - org.apache.maven.its.mng4070 - parent - 1.0 - - - subproject - 1.0 - jar - - Maven Integration Test :: MNG-4070 :: Child - - Test that whitespace around artifact coordinates does not change artifact identity. - - - - - - org.apache.maven.its.mng4070 - a - 0.1 - - - diff --git a/maven-project/src/test/resources/canonical-pom.xml b/maven-project/src/test/resources/canonical-pom.xml deleted file mode 100644 index cccbf7fdf5..0000000000 --- a/maven-project/src/test/resources/canonical-pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - 4.0.0 - maven - maven-core - Maven - 2.0-SNAPSHOT - - - - maven-plexus-plugin - 1.0 - - src/conf/plexus.conf - src/conf/plexus.properties - Continuum - - - - - plexus:runtime - - - ContinuumPro - - - - - - - diff --git a/maven-project/src/test/resources/dependencyManagement-pom.xml b/maven-project/src/test/resources/dependencyManagement-pom.xml deleted file mode 100644 index 0ac9b461d7..0000000000 --- a/maven-project/src/test/resources/dependencyManagement-pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - 4.0.0 - maven - maven-core - Maven - 2.0-SNAPSHOT - - - - maven-test - maven-test-b - 1.0 - - - - - - - maven-plexus-plugin - 1.0 - - src/conf/plexus.conf - src/conf/plexus.properties - Continuum - - - - - plexus:runtime - - - ContinuumPro - - - - - - - diff --git a/maven-project/src/test/resources/distributionManagement-pom.xml b/maven-project/src/test/resources/distributionManagement-pom.xml deleted file mode 100644 index 772998601b..0000000000 --- a/maven-project/src/test/resources/distributionManagement-pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - 4.0.0 - maven - maven-core - Maven - 2.0-SNAPSHOT - - - repo-id - my snapshot repository - file:///path/to/snapshot/repo - - - repo-id2 - my repository - file:///path/to/repo - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar b/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar b/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar b/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar b/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar b/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar b/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar b/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar b/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar b/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom b/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom deleted file mode 100644 index 93fc0d0b3e..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom +++ /dev/null @@ -1,14 +0,0 @@ - - 4.0.0 - maven-test - maven-test-a - jar - 1.0 - - - central - Fake Maven Central Repository - file://dummy - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom b/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom deleted file mode 100644 index a08308610b..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom +++ /dev/null @@ -1,14 +0,0 @@ - - 4.0.0 - maven-test - maven-test-a - jar - 1.1 - - - central - Fake Maven Central Repository - file://dummy - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom b/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom deleted file mode 100644 index c173c663de..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - maven-test-b - jar - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom b/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom deleted file mode 100644 index fff241a19b..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - maven-test-b - jar - 1.1 - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom b/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom deleted file mode 100644 index 1f0497860f..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - maven-test-c - jar - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom b/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom deleted file mode 100644 index 8bd52514ce..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - maven-test-c - jar - 1.1 - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom b/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom deleted file mode 100644 index ac6ef12ec5..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - maven-test-d - jar - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom b/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom deleted file mode 100644 index 6e22f6083e..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - maven-test-d - jar - 1.1 - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom b/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom deleted file mode 100644 index 16f8d90515..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - maven-test-d - jar - 1.2 - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/p0/p1/pom.xml b/maven-project/src/test/resources/imports-repo/t01/p0/p1/pom.xml deleted file mode 100644 index 7bfca34249..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/p0/p1/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - p0 - maven - 1.0 - - 4.0.0 - maven - p1 - pom - p1 - 1.0 - - scm-url - - - - - maven-test - maven-test-b - 1.0 - - - - - - maven-test - maven-test-a - - - maven-test - maven-test-b - - - - - - maven-antrun-plugin - - ${project.parent.basedir} - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/p0/p2/pom.xml b/maven-project/src/test/resources/imports-repo/t01/p0/p2/pom.xml deleted file mode 100644 index b45ce9c618..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/p0/p2/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - p0 - maven - 1.0 - - 4.0.0 - maven - p2 - pom - p2 - 1.0 - - scm-url - - - - - maven - p1 - 1.0 - pom - import - - - maven-test - maven-test-c - 1.0 - - - - - - maven-test - maven-test-a - - - maven-test - maven-test-b - - - maven-test - maven-test-c - - - - - - maven-antrun-plugin - - ${project.parent.basedir} - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/p0/p3/pom.xml b/maven-project/src/test/resources/imports-repo/t01/p0/p3/pom.xml deleted file mode 100644 index e9648e393d..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/p0/p3/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - p0 - maven - 1.0 - - 4.0.0 - maven - p3 - pom - p3 - 1.0 - - scm-url - - - - - maven-test - maven-test-a - 1.1 - - - maven-test - maven-test-c - 1.1 - - - maven-test - maven-test-d - 1.0 - - - - - - maven-test - maven-test-a - - - maven-test - maven-test-c - - - maven-test - maven-test-d - - - - - - maven-antrun-plugin - - ${project.parent.basedir} - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/p0/p4/pom.xml b/maven-project/src/test/resources/imports-repo/t01/p0/p4/pom.xml deleted file mode 100644 index 7ffef9d727..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/p0/p4/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - p0 - maven - 1.0 - - 4.0.0 - maven - p4 - pom - p4 - 1.0 - - scm-url - - - - - maven - p2 - 1.0 - pom - import - - - maven - p3 - 1.0 - pom - import - - - maven-test - maven-test-b - 1.1 - - - - - - maven-test - maven-test-a - - - maven-test - maven-test-b - - - maven-test - maven-test-c - - - maven-test - maven-test-d - - - - - - maven-antrun-plugin - - ${project.parent.basedir} - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/imports-repo/t01/p0/pom.xml b/maven-project/src/test/resources/imports-repo/t01/p0/pom.xml deleted file mode 100644 index 3ccf7e6336..0000000000 --- a/maven-project/src/test/resources/imports-repo/t01/p0/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - 4.0.0 - maven - p0 - pom - p0 - 1.0 - - Codehaus - - - - - maven-test - maven-test-a - 1.0 - - - - - p1 - p2 - p3 - p4 - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom deleted file mode 100644 index 92c9f41d22..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom +++ /dev/null @@ -1,11 +0,0 @@ - - 4.0.0 - maven - p0 - pom - p0 - 1.0 - - Codehaus - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom deleted file mode 100644 index 6038a806a4..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom +++ /dev/null @@ -1,16 +0,0 @@ - - - p0 - maven - 1.0 - - 4.0.0 - maven - p1 - pom - p1 - 1.0 - - scm-url - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom deleted file mode 100644 index 9ac112ac46..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom +++ /dev/null @@ -1,18 +0,0 @@ - - - p1 - maven - 1.0 - - 4.0.0 - maven - p2 - pom - p2 - 1.0 - - - mailing-list - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom deleted file mode 100644 index d40684e970..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom +++ /dev/null @@ -1,14 +0,0 @@ - - - p2 - maven - 1.0 - - 4.0.0 - maven - p3 - pom - p3 - 1.0 - 2000 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom deleted file mode 100644 index dc9a273529..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom +++ /dev/null @@ -1,13 +0,0 @@ - - - p3 - maven - 1.0 - - 4.0.0 - maven - p4 - jar - p4 - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom deleted file mode 100644 index 9df2582d66..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom +++ /dev/null @@ -1,11 +0,0 @@ - - 4.0.0 - maven.t01 - p0 - pom - p0 - 1.0 - - p0-org - - diff --git a/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom deleted file mode 100644 index 4fc81d8338..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom +++ /dev/null @@ -1,16 +0,0 @@ - - - p0 - maven.t01 - 1.0 - - 4.0.0 - maven.t01 - p1 - pom - p1 - 1.0 - - p1-org - - diff --git a/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom deleted file mode 100644 index 8032cf2fb1..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom +++ /dev/null @@ -1,16 +0,0 @@ - - - p1 - maven.t01 - 1.0 - - 4.0.0 - maven.t01 - p2 - pom - p2 - 1.0 - - p2-org - - diff --git a/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom deleted file mode 100644 index 6ed58569fc..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom +++ /dev/null @@ -1,16 +0,0 @@ - - - p2 - maven.t01 - 1.0 - - 4.0.0 - maven.t01 - p3 - pom - p3 - 1.0 - - p3-org - - diff --git a/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom deleted file mode 100644 index 1739333a82..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom +++ /dev/null @@ -1,16 +0,0 @@ - - - p3 - maven.t01 - 1.0 - - 4.0.0 - maven.t01 - p4 - jar - p4 - 1.0 - - p4-org - - diff --git a/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml b/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml deleted file mode 100644 index 93d1d72f64..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - p4 - maven.t02 - 1.0 - - 4.0.0 - maven.t02 - p5 - jar - p5 - 1.0 - diff --git a/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml b/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml deleted file mode 100644 index 123341b31c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - p3 - maven.t02 - 1.0 - - 4.0.0 - maven.t02 - p4 - jar - p4 - 1.0 - diff --git a/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml b/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml deleted file mode 100644 index d83de976d1..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - p2 - maven.t02 - 1.0 - - 4.0.0 - maven.t02 - p3 - pom - p3 - 1.0 - 2000 - diff --git a/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml b/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml deleted file mode 100644 index c2b7d7153e..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - p1 - maven.t02 - 1.0 - - 4.0.0 - maven.t02 - p2 - pom - p2 - 1.0 - - - mailing-list - - - diff --git a/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml deleted file mode 100644 index af2d92ede4..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - p0 - maven.t02 - 1.0 - - 4.0.0 - maven.t02 - p1 - pom - p1 - 1.0 - - scm-url - - - - - maven-compiler-plugin - - - test - package - - compile - - - - - - - diff --git a/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml deleted file mode 100644 index 3643fe49f3..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t02/p0/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - 4.0.0 - maven.t02 - p0 - pom - p0 - 1.0 - - Codehaus - - diff --git a/maven-project/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml deleted file mode 100644 index 69fe6a1dce..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - p0 - maven.t03 - 1.0 - - 4.0.0 - maven.t03 - p1 - pom - p1 - 1.0 - - scm-url - - - - - maven-antrun-plugin - - ${project.parent.basedir} - - - - - diff --git a/maven-project/src/test/resources/inheritance-repo/t03/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t03/p0/pom.xml deleted file mode 100644 index 476ffdfbdd..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t03/p0/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - 4.0.0 - maven.t03 - p0 - pom - p0 - 1.0 - - Codehaus - - diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom deleted file mode 100644 index 5ca34c3a2e..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom +++ /dev/null @@ -1,21 +0,0 @@ - - 4.0.0 - maven-test - t04-a - jar - 1.0 - - - central - Fake Maven Central Repository - file://dummy - - - - - maven-test - t04-b - 2.0 - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom deleted file mode 100644 index 4c311ab133..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t04-b - jar - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom deleted file mode 100644 index d24e3bc1f5..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t04-b - jar - 2.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom deleted file mode 100644 index bef2488ba4..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t04-c - jar - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom b/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom deleted file mode 100644 index d24e3bc1f5..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t04-b - jar - 2.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml deleted file mode 100644 index c25fc3e738..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - p0 - maven-t04 - 1.0 - - 4.0.0 - maven-t04 - p1 - pom - p1 - 1.0 - - scm-url - - - - - - maven-test - t04-a - - - - maven-test - t04-c - 1.0 - - - - - - - maven-antrun-plugin - - ${project.parent.basedir} - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml deleted file mode 100644 index 1b02dc2c0c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t04/p0/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - 4.0.0 - maven-t04 - p0 - pom - p0 - 1.0 - - Codehaus - - - - - - - - maven-test - t04-a - 1.0 - - - - maven-test - t04-b - 1.0 - - - - maven-test - t04-c - 2.0 - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom deleted file mode 100644 index a1b8cb9b11..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom +++ /dev/null @@ -1,23 +0,0 @@ - - 4.0.0 - maven-test - t05-a - jar - 1.0 - - - central - Fake Maven Central Repository - file://dummy - - - - - maven-test - t05-b - 1.0 - jar - compile - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom deleted file mode 100644 index 097101e81f..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom +++ /dev/null @@ -1,23 +0,0 @@ - - 4.0.0 - maven-test - t05-a - jar - 2.0 - - - central - Fake Maven Central Repository - file://dummy - - - - - maven-test - t05-b - 1.0 - jar - compile - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom deleted file mode 100644 index e0490ff73b..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - maven-test - t05-b - jar - 1.0 - - - maven-test - t05-c - 1.0 - jar - compile - - - maven-test - t05-d - 1.1 - jar - compile - false - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom deleted file mode 100644 index ff59f5d2b7..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - maven-test - t05-b - jar - 1.1 - - - maven-test - t05-c - 1.0 - jar - compile - - - maven-test - t05-d - 1.1 - jar - compile - false - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom deleted file mode 100644 index 79370ec4f0..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - maven-test - t05-b - jar - 2.0 - - - maven-test - t05-c - 1.0 - jar - compile - - - maven-test - t05-d - 1.1 - jar - compile - false - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom deleted file mode 100644 index 0edc3ddd6f..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom +++ /dev/null @@ -1,17 +0,0 @@ - - 4.0.0 - maven-test - t05-c - jar - 1.0 - - - maven-test - t05-d - 1.1 - jar - compile - true - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom deleted file mode 100644 index 9290b033d5..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t05-d - jar - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom deleted file mode 100644 index b4af4b2cdb..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t05-d - jar - 1.1 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom b/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom deleted file mode 100644 index 09e1d9470c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t05-d - jar - 1.2 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml deleted file mode 100644 index d9c2d52bba..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - p0 - maven-t05 - 1.0 - - 4.0.0 - maven-t05 - p1 - pom - p1 - 1.0 - - scm-url - - - - - maven-test - t05-b - 1.0 - - - maven-test - t05-d - 1.0 - - - - - - maven-test - t05-a - 1.0 - runtime - - - maven-test - t05-c - 1.0 - runtime - - - - - - maven-antrun-plugin - - ${project.parent.basedir} - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t05/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t05/p0/pom.xml deleted file mode 100644 index 6c93838b93..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t05/p0/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - 4.0.0 - maven-t05 - p0 - pom - p0 - 1.0 - - Codehaus - - - - - maven-test - t05-a - 1.0 - - - maven-test - t05-b - 1.1 - - - maven-test - t05-c - 1.0 - compile - - - maven-test - t05-d - 1.2 - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom deleted file mode 100644 index 21aa5f556b..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom +++ /dev/null @@ -1,23 +0,0 @@ - - 4.0.0 - maven-test - t06-a - jar - 1.0 - - - central - Fake Maven Central Repository - file://dummy - - - - - maven-test - t06-b - 1.0 - jar - compile - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom deleted file mode 100644 index a9af131cba..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - maven-test - t06-b - jar - 1.0 - - - maven-test - t06-c - 1.0 - jar - compile - - - maven-test - t06-d - 1.1 - jar - compile - false - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom deleted file mode 100644 index a9af131cba..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - maven-test - t06-b - jar - 1.0 - - - maven-test - t06-c - 1.0 - jar - compile - - - maven-test - t06-d - 1.1 - jar - compile - false - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom deleted file mode 100644 index 80272114a8..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom +++ /dev/null @@ -1,17 +0,0 @@ - - 4.0.0 - maven-test - t06-c - jar - 1.0 - - - maven-test - t06-d - 1.1 - jar - compile - true - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom deleted file mode 100644 index e4531ab4a7..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t06-d - jar - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom deleted file mode 100644 index c146cb89a6..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t06-d - jar - 1.1 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom b/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom deleted file mode 100644 index ff91f975ae..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t06-d - jar - 1.2 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml deleted file mode 100644 index 468621901e..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - p0 - maven-t06 - 1.0 - - 4.0.0 - maven-t06 - p1 - pom - p1 - 1.0 - - scm-url - - - - - maven-test - t06-b - 1.0 - - - maven-test - t06-d - 1.0 - test - false - - - - - - maven-test - t06-a - 1.0 - - - maven-test - t06-c - 1.0 - - - - - - maven-antrun-plugin - - ${project.parent.basedir} - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t06/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t06/p0/pom.xml deleted file mode 100644 index 60c540ca12..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t06/p0/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - 4.0.0 - maven-t06 - p0 - pom - p0 - 1.0 - - Codehaus - - - - - maven-test - t06-a - 1.0 - - - maven-test - t06-b - 1.1 - - - maven-test - t06-c - 1.0 - - - maven-test - t06-d - 1.2 - test - false - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom deleted file mode 100644 index 05665a9c27..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom +++ /dev/null @@ -1,23 +0,0 @@ - - 4.0.0 - maven-test - t07-a - jar - 1.0 - - - central - Fake Maven Central Repository - file://dummy - - - - - maven-test - t07-b - 1.0 - jar - compile - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom deleted file mode 100644 index 8ce6751c93..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - maven-test - t07-b - jar - 1.0 - - - maven-test - t07-c - 1.0 - jar - compile - - - maven-test - t07-d - 1.1 - jar - compile - true - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom deleted file mode 100644 index 689ad055ed..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - maven-test - t07-b - jar - 1.1 - - - maven-test - t07-c - 1.0 - jar - compile - - - maven-test - t07-d - 1.1 - jar - compile - true - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom deleted file mode 100644 index 494470c49b..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom +++ /dev/null @@ -1,17 +0,0 @@ - - 4.0.0 - maven-test - t07-c - jar - 1.0 - - - maven-test - t07-d - 1.1 - jar - compile - true - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom deleted file mode 100644 index 5761d51547..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t07-d - jar - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom deleted file mode 100644 index 08fc179c17..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t07-d - jar - 1.1 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom b/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom deleted file mode 100644 index 544ccc59a0..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t07-d - jar - 1.2 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml deleted file mode 100644 index 6f700429a0..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - p0 - maven-t07 - 1.0 - - 4.0.0 - maven-t07 - p1 - pom - p1 - 1.0 - - scm-url - - - - - maven-test - t07-b - 1.0 - - - maven-test - t07-d - 1.0 - test - false - - - - - - maven-test - t07-a - 1.0 - - - maven-test - t07-c - 1.0 - - - - - - maven-antrun-plugin - - ${project.parent.basedir} - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t07/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t07/p0/pom.xml deleted file mode 100644 index b500ee0e58..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t07/p0/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - 4.0.0 - maven-t07 - p0 - pom - p0 - 1.0 - - Codehaus - - - - - maven-test - t07-a - 1.0 - - - maven-test - t07-b - 1.1 - - - maven-test - t07-c - 1.0 - - - maven-test - t07-d - 1.2 - test - false - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom deleted file mode 100644 index 186c2d89f1..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom +++ /dev/null @@ -1,23 +0,0 @@ - - 4.0.0 - maven-test - t08-a - jar - 1.0 - - - central - Fake Maven Central Repository - file://dummy - - - - - maven-test - t08-b - 1.0 - jar - compile - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom deleted file mode 100644 index d866ab3556..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - maven-test - t08-b - jar - 1.0 - - - maven-test - t08-c - 1.0 - jar - compile - - - maven-test - t08-d - 1.1 - jar - compile - false - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom deleted file mode 100644 index d402466e9f..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - maven-test - t08-b - jar - 1.1 - - - maven-test - t08-c - 1.0 - jar - compile - - - maven-test - t08-d - 1.1 - jar - compile - false - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom deleted file mode 100644 index d8250528e2..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom +++ /dev/null @@ -1,17 +0,0 @@ - - 4.0.0 - maven-test - t08-c - jar - 1.0 - - - maven-test - t08-d - 1.1 - jar - compile - true - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom deleted file mode 100644 index f453045880..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t08-d - jar - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom deleted file mode 100644 index c7703b02db..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t08-d - jar - 1.1 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom b/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom deleted file mode 100644 index e341be534d..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t08-d - jar - 1.2 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml deleted file mode 100644 index 331996d87e..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - p0 - maven-t08 - 1.0 - - 4.0.0 - maven-t08 - p1 - pom - p1 - 1.0 - - scm-url - - - - - maven-test - t08-b - 1.0 - - - maven-test - t08-d - 1.0 - test - true - - - - - - maven-test - t08-a - 1.0 - - - maven-test - t08-c - 1.0 - - - maven-test - t08-d - 1.0 - - - - - - maven-antrun-plugin - - ${project.parent.basedir} - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t08/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t08/p0/pom.xml deleted file mode 100644 index a18ab853d1..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t08/p0/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - 4.0.0 - maven-t08 - p0 - pom - p0 - 1.0 - - Codehaus - - - - - maven-test - t08-a - 1.0 - - - maven-test - t08-b - 1.1 - - - maven-test - t08-c - 1.0 - - - maven-test - t08-d - 1.2 - test - false - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom deleted file mode 100644 index 54cf647b2b..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - maven-test - t09-a - jar - 1.0 - - - central - Fake Maven Central Repository - file://dummy - - - - - - maven-test - t09-b - 1.0 - compile - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom deleted file mode 100644 index ce001c2f30..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom +++ /dev/null @@ -1,17 +0,0 @@ - - 4.0.0 - maven-test - t09-b - jar - 1.0 - - - - maven-test - t09-c - 1.0 - compile - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom deleted file mode 100644 index da7bc34946..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t09-c - jar - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom deleted file mode 100644 index 862274728a..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom +++ /dev/null @@ -1,17 +0,0 @@ - - 4.0.0 - maven-test - t09-d - jar - 1.0 - - - - maven-test - t09-c - 1.0 - compile - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml deleted file mode 100644 index ae4358436d..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - p0 - maven-t09 - 1.0 - - 4.0.0 - maven-t09 - p1 - pom - p1 - 1.0 - - scm-url - - - - - - maven-test - t09-a - - - - - - - - maven-antrun-plugin - - ${project.parent.basedir} - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml b/maven-project/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml deleted file mode 100644 index 4681c2efe8..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - p0 - maven-t09 - 1.0 - - 4.0.0 - maven-t09 - p2 - pom - p2 - 1.0 - - scm-url - - - - - - maven-test - t09-a - - - - maven-test - t09-d - 1.0 - - - - - - - - maven-antrun-plugin - - ${project.parent.basedir} - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t09/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t09/p0/pom.xml deleted file mode 100644 index a93746d281..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t09/p0/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - 4.0.0 - maven-t09 - p0 - pom - p0 - 1.0 - - Codehaus - - - - - - - - maven-test - t09-a - 1.0 - - - - maven-test - t09-b - 1.0 - - - maven-test - t09-c - - - - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom deleted file mode 100644 index 1fc2a2216a..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - maven-test - t10-a - jar - 1.0 - - - central - Fake Maven Central Repository - file://dummy - - - - - - maven-test - t10-b - 1.0 - compile - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom deleted file mode 100644 index 64b5f97a0c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t10-b - jar - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom deleted file mode 100644 index 6548ab3006..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - t10-c - jar - 1.0 - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml deleted file mode 100644 index ed82ae1344..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - p0 - maven-t10 - 1.0 - - 4.0.0 - maven-t10 - p1 - pom - p1 - 1.0 - - scm-url - - - - - - maven-test - t10-a - - - - maven-test - t10-c - runtime - - - - - - - - maven-antrun-plugin - - ${project.parent.basedir} - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t10/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t10/p0/pom.xml deleted file mode 100644 index 853af40df2..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t10/p0/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - 4.0.0 - maven-t10 - p0 - pom - p0 - 1.0 - - Codehaus - - - - - - - - maven-test - t10-a - 1.0 - test - - - - maven-test - t10-b - 1.0 - runtime - - - - maven-test - t10-c - 1.0 - test - - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml deleted file mode 100644 index e4c79be457..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - p0 - maven - 1.0 - - 4.0.0 - maven - p1 - jar - p1 - 1.0 - - scm-url - - diff --git a/maven-project/src/test/resources/inheritance-repo/t11/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t11/p0/pom.xml deleted file mode 100644 index 23b07e2c0a..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t11/p0/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - 4.0.0 - maven - p0 - pom - p0 - 1.0 - - Codehaus - - - - - - - - maven - p1 - 1.0 - test - - - - - - - diff --git a/maven-project/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml deleted file mode 100644 index c97995654e..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - p0 - maven - 1.0 - - 4.0.0 - p1 - jar - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - normal - - - compile - - - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t12/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t12/p0/pom.xml deleted file mode 100644 index 54356618b5..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t12/p0/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - 4.0.0 - maven - p0 - pom - 1.0 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - test - - - false - - - compile - - install - - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom deleted file mode 100644 index 97bf7ccc22..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom +++ /dev/null @@ -1,18 +0,0 @@ - - 4.0.0 - maven - p0 - pom - 1.0 - - - scm:svn:http://host/p0 - scm:svn:https://host/p0 - http://host/viewer?path=/p0 - - - - modules/p1 - - - diff --git a/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom b/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom deleted file mode 100644 index e9ddf0d78c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom +++ /dev/null @@ -1,11 +0,0 @@ - - - p0 - maven - 1.0 - ../../pom.xml - - 4.0.0 - p1 - - diff --git a/maven-project/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml b/maven-project/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml deleted file mode 100644 index e9ddf0d78c..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - p0 - maven - 1.0 - ../../pom.xml - - 4.0.0 - p1 - - diff --git a/maven-project/src/test/resources/inheritance-repo/t12scm/p0/pom.xml b/maven-project/src/test/resources/inheritance-repo/t12scm/p0/pom.xml deleted file mode 100644 index 97bf7ccc22..0000000000 --- a/maven-project/src/test/resources/inheritance-repo/t12scm/p0/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - 4.0.0 - maven - p0 - pom - 1.0 - - - scm:svn:http://host/p0 - scm:svn:https://host/p0 - http://host/viewer?path=/p0 - - - - modules/p1 - - - diff --git a/maven-project/src/test/resources/local-repo/marker.txt b/maven-project/src/test/resources/local-repo/marker.txt deleted file mode 100644 index d9bab060dd..0000000000 --- a/maven-project/src/test/resources/local-repo/marker.txt +++ /dev/null @@ -1 +0,0 @@ -this is just a marker file. \ No newline at end of file diff --git a/maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar b/maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar b/maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar b/maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar b/maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar deleted file mode 100644 index 257cc5642c..0000000000 --- a/maven-project/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom b/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom deleted file mode 100644 index 6905f6c8de..0000000000 --- a/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom +++ /dev/null @@ -1,23 +0,0 @@ - - 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-project/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom b/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom deleted file mode 100644 index e814951a0d..0000000000 --- a/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom +++ /dev/null @@ -1,23 +0,0 @@ - - 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-project/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom b/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom deleted file mode 100644 index 4631b88f3c..0000000000 --- a/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom +++ /dev/null @@ -1,16 +0,0 @@ - - 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-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom b/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom deleted file mode 100644 index 6e22f6083e..0000000000 --- a/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - maven-test-d - jar - 1.1 - \ No newline at end of file diff --git a/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom b/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom deleted file mode 100644 index 6e22f6083e..0000000000 --- a/maven-project/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - maven-test - maven-test-d - jar - 1.1 - \ No newline at end of file diff --git a/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar b/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar deleted file mode 100644 index c2c027fec1..0000000000 --- a/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar +++ /dev/null @@ -1 +0,0 @@ -local \ No newline at end of file diff --git a/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version b/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version deleted file mode 100644 index 09f9180ff2..0000000000 --- a/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version +++ /dev/null @@ -1 +0,0 @@ -20040101.101010 \ No newline at end of file diff --git a/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar b/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar deleted file mode 100644 index c2c027fec1..0000000000 --- a/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar +++ /dev/null @@ -1 +0,0 @@ -local \ No newline at end of file diff --git a/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version b/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version deleted file mode 100644 index 09f9180ff2..0000000000 --- a/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version +++ /dev/null @@ -1 +0,0 @@ -20040101.101010 \ No newline at end of file diff --git a/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar b/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar deleted file mode 100644 index c2c027fec1..0000000000 --- a/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar +++ /dev/null @@ -1 +0,0 @@ -local \ No newline at end of file diff --git a/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version b/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version deleted file mode 100644 index 09f9180ff2..0000000000 --- a/maven-project/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version +++ /dev/null @@ -1 +0,0 @@ -20040101.101010 \ No newline at end of file diff --git a/maven-project/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom b/maven-project/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom deleted file mode 100644 index 64a075f4e9..0000000000 --- a/maven-project/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom +++ /dev/null @@ -1,49 +0,0 @@ - - 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-project/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml b/maven-project/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml deleted file mode 100644 index 45dc77d2a9..0000000000 --- a/maven-project/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml +++ /dev/null @@ -1,8 +0,0 @@ - - 4.0.0 - - org.apache.maven.tests - build-from-file - 1 - - \ No newline at end of file diff --git a/maven-project/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom b/maven-project/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom deleted file mode 100644 index d42117656a..0000000000 --- a/maven-project/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom +++ /dev/null @@ -1,8 +0,0 @@ - - 4.0.0 - - tests - project-caching - 1 - - \ No newline at end of file diff --git a/maven-project/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/maven-metadata-local.xml b/maven-project/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/maven-metadata-local.xml deleted file mode 100644 index a608b4f81d..0000000000 --- a/maven-project/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/maven-metadata-local.xml +++ /dev/null @@ -1,11 +0,0 @@ - - tests - project-caching - - 1 - 1 - - 1 - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml b/maven-project/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml deleted file mode 100644 index 5c62a787cc..0000000000 --- a/maven-project/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - - tests - build-model-lineage - 1 - \ No newline at end of file diff --git a/maven-project/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml b/maven-project/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml deleted file mode 100644 index 5953c32e2f..0000000000 --- a/maven-project/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml +++ /dev/null @@ -1,10 +0,0 @@ - - 4.0.0 - - tests - childAndParent-parent - 1 - - - childAndParent-child - \ No newline at end of file diff --git a/maven-project/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml b/maven-project/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml deleted file mode 100644 index 365ec18388..0000000000 --- a/maven-project/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - - tests - childAndParent-parent - 1 - \ No newline at end of file diff --git a/maven-project/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml b/maven-project/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml deleted file mode 100644 index e0eec3a2b0..0000000000 --- a/maven-project/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml +++ /dev/null @@ -1,10 +0,0 @@ - - 4.0.0 - - tests - resolve-parent-pom-parent - 1 - - - resolve-parent-pom - \ No newline at end of file diff --git a/maven-project/src/test/resources/project-dynamism/plugin-level-dep.pom.xml b/maven-project/src/test/resources/project-dynamism/plugin-level-dep.pom.xml deleted file mode 100644 index 988736751a..0000000000 --- a/maven-project/src/test/resources/project-dynamism/plugin-level-dep.pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - 4.0.0 - testing - plugin-level-dep - jar - 3.8.1 - - - - - maven-compiler-plugin - 2.0.2 - - - junit - junit - ${pom.version} - - - - - - diff --git a/maven-project/src/test/resources/project-dynamism/pom-interp.xml b/maven-project/src/test/resources/project-dynamism/pom-interp.xml deleted file mode 100644 index 2ad098aab3..0000000000 --- a/maven-project/src/test/resources/project-dynamism/pom-interp.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - 4.0.0 - - org.test - test-build-dynamism - 1 - - - /${project.groupId}/src/main/java - /${pom.groupId}/src/test/java - /${groupId}/src/main/scripts - - - - my-plugin - - ${project.groupId} - ${pom.groupId} - ${groupId} - - - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/project-dynamism/pom-relative.xml b/maven-project/src/test/resources/project-dynamism/pom-relative.xml deleted file mode 100644 index a24aebe68e..0000000000 --- a/maven-project/src/test/resources/project-dynamism/pom-relative.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - - org.test - test-build-dynamism - 1 - - - ${pom.build.directory} - - - - - - ${pom.build.directory}/generated-resources/plexus - - - - - ${pom.build.directory}/generated-filters.properties - - - target - - src/main/java - src/test/java - src/main/scripts - - ${pom.build.directory}/classes - ${pom.build.directory}/test-classes - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/project-dynamism/pom.xml b/maven-project/src/test/resources/project-dynamism/pom.xml deleted file mode 100644 index 02bbed08f0..0000000000 --- a/maven-project/src/test/resources/project-dynamism/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - - org.test - test-build-dynamism - 1 - - - ${pom.build.directory} - - - - - - ${pom.build.directory}/generated-resources/plexus - - - - - ${pom.build.directory}/generated-filters.properties - - - target - - ${pom.basedir}/src/main/java - ${pom.basedir}/src/test/java - ${pom.basedir}/src/main/scripts - - ${pom.build.directory}/classes - ${pom.build.directory}/test-classes - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml b/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml deleted file mode 100644 index ee2207ee4e..0000000000 --- a/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - project-which-needs-directory-alignment.xml - - - maven - project-which-needs-directory-alignment.xml - 1.0-beta-9 - - - maven - maven-foo - 1.0 - diff --git a/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml b/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml deleted file mode 100644 index cefbcb0417..0000000000 --- a/maven-project/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - 4.0.0 - maven - project-which-needs-directory-alignment - Maven - 1.0-beta-9 - 2001 - Description - http://maven.apache.org/ - - - Apache Software Foundation - http://apache.org/ - - - - anon-connection - developer-connection - repository-url - - - - - Maven User List - subscribe - unsubscribe - archive - - - - - - Jason van Zyl - jvanzyl - jason@maven.org - Zenplex - - Founder - Release Manager - - - - - - - Martin van dem Bemt - mvdb@mvdb.com - - - - - - - g1 - d1 - 1.0 - - - - g2 - d2 - 2.0 - - - - g3 - d3 - - - - - - - - g3 - d3 - 3.0 - - - - - - sourceDirectory - unitTestSourceDirectory - - - src/test - - **/*.xml - - - - - - src/conf - - *.xsd - *.dtd - *.mod - log4j.properties - driver.jelly - driver.properties - - - - src/messages - org/apache/maven/messages - - messages*.properties - - - - - diff --git a/maven-project/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml b/maven-project/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml deleted file mode 100644 index 68775efc56..0000000000 --- a/maven-project/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - ../project-which-needs-directory-alignment.xml - - - maven - project-which-needs-directory-alignment - 1.0-beta-9 - - diff --git a/maven-project/src/test/resources/projects/build-path-expression-pom.xml b/maven-project/src/test/resources/projects/build-path-expression-pom.xml deleted file mode 100644 index d7e296f483..0000000000 --- a/maven-project/src/test/resources/projects/build-path-expression-pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - 4.0.0 - org.apache.maven.project.tests - build-path-expression - 1 - - sources - - - ${project.build.sourceDirectory} - - - - \ No newline at end of file diff --git a/maven-project/src/test/resources/projects/duplicate-plugins-merged-pom.xml b/maven-project/src/test/resources/projects/duplicate-plugins-merged-pom.xml deleted file mode 100644 index 9cbbd12df8..0000000000 --- a/maven-project/src/test/resources/projects/duplicate-plugins-merged-pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - 4.0.0 - tests.project - duplicate-plugin-defs-merged - 1 - - - - - maven-compiler-plugin - - - group - first - 1 - - - - - maven-compiler-plugin - - - group - second - 1 - - - - - - - diff --git a/maven-project/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml b/maven-project/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml deleted file mode 100644 index 56bed2c938..0000000000 --- a/maven-project/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml +++ /dev/null @@ -1,10 +0,0 @@ - - 4.0.0 - - grandchildtest - child - 1 - - grandchild - - diff --git a/maven-project/src/test/resources/projects/grandchild-check/child/pom.xml b/maven-project/src/test/resources/projects/grandchild-check/child/pom.xml deleted file mode 100644 index 0858c6d141..0000000000 --- a/maven-project/src/test/resources/projects/grandchild-check/child/pom.xml +++ /dev/null @@ -1,13 +0,0 @@ - - 4.0.0 - - grandchildtest - root-pom - 1 - - child - pom - - grandchild - - diff --git a/maven-project/src/test/resources/projects/grandchild-check/pom.xml b/maven-project/src/test/resources/projects/grandchild-check/pom.xml deleted file mode 100644 index 3b1ebd0ea8..0000000000 --- a/maven-project/src/test/resources/projects/grandchild-check/pom.xml +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - grandchildtest - root-pom - 1 - pom - diff --git a/maven-project/src/test/resources/projects/scope/project-with-scoped-dependencies.xml b/maven-project/src/test/resources/projects/scope/project-with-scoped-dependencies.xml deleted file mode 100644 index c706250170..0000000000 --- a/maven-project/src/test/resources/projects/scope/project-with-scoped-dependencies.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - 4.0.0 - maven - maven-project-test - Maven - 1.0-beta-9 - - - - maven-test - scope-default - 1.0 - - - - maven-test - scope-test - 1.0 - test - - - - maven-test - scope-runtime - 1.0 - runtime - - - - maven-test - scope-compile - 1.0 - compile - - - - maven-test - scope-provided - 1.0 - provided - - - - maven-inherited - scope-default - 1.0 - - - - maven-inherited - scope-compile - 1.0 - compile - - - - maven-inherited - scope-runtime - 1.0 - runtime - - - - maven-inherited - scope-test - 1.0 - test - - - - maven-inherited - scope-provided - 1.0 - provided - - - - diff --git a/maven-project/src/test/resources/projects/scope/transitive-compile-dep.xml b/maven-project/src/test/resources/projects/scope/transitive-compile-dep.xml deleted file mode 100644 index 0ef804c042..0000000000 --- a/maven-project/src/test/resources/projects/scope/transitive-compile-dep.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - maven-test - scope-compile - 1.0 - - - - maven-test-compile - scope-default - 1.0 - - - - maven-test-compile - scope-test - 1.0 - test - - - - maven-test-compile - scope-runtime - 1.0 - runtime - - - - maven-test-compile - scope-compile - 1.0 - compile - - - - diff --git a/maven-project/src/test/resources/projects/scope/transitive-default-dep.xml b/maven-project/src/test/resources/projects/scope/transitive-default-dep.xml deleted file mode 100644 index 187016b14b..0000000000 --- a/maven-project/src/test/resources/projects/scope/transitive-default-dep.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - maven-test - scope-default - 1.0 - - - - maven-test-default - scope-default - 1.0 - - - - maven-test-default - scope-test - 1.0 - test - - - - maven-test-default - scope-runtime - 1.0 - runtime - - - - maven-test-default - scope-compile - 1.0 - compile - - - - - diff --git a/maven-project/src/test/resources/projects/scope/transitive-provided-dep.xml b/maven-project/src/test/resources/projects/scope/transitive-provided-dep.xml deleted file mode 100644 index f36d00f599..0000000000 --- a/maven-project/src/test/resources/projects/scope/transitive-provided-dep.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - maven-test - scope-provided - 1.0 - - - - maven-test-provided - scope-default - 1.0 - - - - maven-test-provided - scope-test - 1.0 - test - - - - maven-test-provided - scope-runtime - 1.0 - runtime - - - - maven-test-provided - scope-compile - 1.0 - compile - - - - diff --git a/maven-project/src/test/resources/projects/scope/transitive-runtime-dep.xml b/maven-project/src/test/resources/projects/scope/transitive-runtime-dep.xml deleted file mode 100644 index 2f8b1ab039..0000000000 --- a/maven-project/src/test/resources/projects/scope/transitive-runtime-dep.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - maven-test - scope-runtime - 1.0 - - - - maven-test-runtime - scope-default - 1.0 - - - - maven-test-runtime - scope-test - 1.0 - test - - - - maven-test-runtime - scope-runtime - 1.0 - runtime - - - - maven-test-runtime - scope-compile - 1.0 - compile - - - - - diff --git a/maven-project/src/test/resources/projects/scope/transitive-test-dep.xml b/maven-project/src/test/resources/projects/scope/transitive-test-dep.xml deleted file mode 100644 index 79b1441247..0000000000 --- a/maven-project/src/test/resources/projects/scope/transitive-test-dep.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - maven-test - scope-test - 1.0 - - - - maven-test-test - scope-default - 1.0 - - - - maven-test-test - scope-test - 1.0 - test - - - - maven-test-test - scope-runtime - 1.0 - runtime - - - - maven-test-test - scope-compile - 1.0 - compile - - - - - diff --git a/maven-project/src/test/resources/validation/invalid-aggregator-packaging-pom.xml b/maven-project/src/test/resources/validation/invalid-aggregator-packaging-pom.xml deleted file mode 100644 index b050b13230..0000000000 --- a/maven-project/src/test/resources/validation/invalid-aggregator-packaging-pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - 4.0.0 - foo - foo - 99.44 - bleh - - - test-module - - diff --git a/maven-project/src/test/resources/validation/invalid-ids-pom.xml b/maven-project/src/test/resources/validation/invalid-ids-pom.xml deleted file mode 100644 index bbb8e9c841..0000000000 --- a/maven-project/src/test/resources/validation/invalid-ids-pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - 4.0.0 - o/a/m - m$-do$ - 99.44 - bleh - diff --git a/maven-project/src/test/resources/validation/missing-1-pom.xml b/maven-project/src/test/resources/validation/missing-1-pom.xml deleted file mode 100644 index fe297e6e58..0000000000 --- a/maven-project/src/test/resources/validation/missing-1-pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - diff --git a/maven-project/src/test/resources/validation/missing-artifactId-pom.xml b/maven-project/src/test/resources/validation/missing-artifactId-pom.xml deleted file mode 100644 index 39f0d7bcba..0000000000 --- a/maven-project/src/test/resources/validation/missing-artifactId-pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 4.0.0 - foo - 99.44 - bleh - diff --git a/maven-project/src/test/resources/validation/missing-dependency-artifactId-pom.xml b/maven-project/src/test/resources/validation/missing-dependency-artifactId-pom.xml deleted file mode 100644 index 3a5b647990..0000000000 --- a/maven-project/src/test/resources/validation/missing-dependency-artifactId-pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - 4.0.0 - foo - foo - 99.44 - bleh - - - groupId - 1.0 - - - diff --git a/maven-project/src/test/resources/validation/missing-dependency-groupId-pom.xml b/maven-project/src/test/resources/validation/missing-dependency-groupId-pom.xml deleted file mode 100644 index 5799c572cb..0000000000 --- a/maven-project/src/test/resources/validation/missing-dependency-groupId-pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - 4.0.0 - foo - foo - 99.44 - bleh - - - artifactId - 1.0 - - - diff --git a/maven-project/src/test/resources/validation/missing-dependency-mgmt-artifactId-pom.xml b/maven-project/src/test/resources/validation/missing-dependency-mgmt-artifactId-pom.xml deleted file mode 100644 index e050ef43d8..0000000000 --- a/maven-project/src/test/resources/validation/missing-dependency-mgmt-artifactId-pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - foo - foo - 99.44 - bleh - - - - groupId - version - - - - diff --git a/maven-project/src/test/resources/validation/missing-dependency-mgmt-groupId-pom.xml b/maven-project/src/test/resources/validation/missing-dependency-mgmt-groupId-pom.xml deleted file mode 100644 index a012d0f5d9..0000000000 --- a/maven-project/src/test/resources/validation/missing-dependency-mgmt-groupId-pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - foo - foo - 99.44 - bleh - - - - artifactId - version - - - - diff --git a/maven-project/src/test/resources/validation/missing-dependency-mgmt-version-pom.xml b/maven-project/src/test/resources/validation/missing-dependency-mgmt-version-pom.xml deleted file mode 100644 index cc5ff5b3c1..0000000000 --- a/maven-project/src/test/resources/validation/missing-dependency-mgmt-version-pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - 4.0.0 - foo - foo - 99.44 - bleh - - - - artifactId - groupId - - - - diff --git a/maven-project/src/test/resources/validation/missing-dependency-version-pom.xml b/maven-project/src/test/resources/validation/missing-dependency-version-pom.xml deleted file mode 100644 index 217b036d81..0000000000 --- a/maven-project/src/test/resources/validation/missing-dependency-version-pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - 4.0.0 - foo - foo - 99.44 - bleh - - - artifactId - groupId - - - diff --git a/maven-project/src/test/resources/validation/missing-groupId-pom.xml b/maven-project/src/test/resources/validation/missing-groupId-pom.xml deleted file mode 100644 index 528b8b6a19..0000000000 --- a/maven-project/src/test/resources/validation/missing-groupId-pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 4.0.0 - bar - 99.44 - bleh - diff --git a/maven-project/src/test/resources/validation/missing-modelVersion-pom.xml b/maven-project/src/test/resources/validation/missing-modelVersion-pom.xml deleted file mode 100644 index f0273d9e60..0000000000 --- a/maven-project/src/test/resources/validation/missing-modelVersion-pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - foo - foo - 99.44 - bleh - diff --git a/maven-project/src/test/resources/validation/missing-plugin-artifactId-pom.xml b/maven-project/src/test/resources/validation/missing-plugin-artifactId-pom.xml deleted file mode 100644 index a70205f152..0000000000 --- a/maven-project/src/test/resources/validation/missing-plugin-artifactId-pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - 4.0.0 - foo - foo - 99.44 - bleh - - - - - - - - diff --git a/maven-project/src/test/resources/validation/missing-report-artifactId-pom.xml b/maven-project/src/test/resources/validation/missing-report-artifactId-pom.xml deleted file mode 100644 index 4cb5649c1d..0000000000 --- a/maven-project/src/test/resources/validation/missing-report-artifactId-pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - 4.0.0 - foo - foo - 99.44 - bleh - - - - - - - - diff --git a/maven-project/src/test/resources/validation/missing-repository-id-pom.xml b/maven-project/src/test/resources/validation/missing-repository-id-pom.xml deleted file mode 100644 index 1d385f2969..0000000000 --- a/maven-project/src/test/resources/validation/missing-repository-id-pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - foo - foo - 99.44 - bleh - - - - - - - - - - - diff --git a/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml b/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml deleted file mode 100644 index 232db095eb..0000000000 --- a/maven-project/src/test/resources/validation/missing-resource-directory-pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - 4.0.0 - foo - foo - 99.44 - bleh - - - - - - - - - - - - - diff --git a/maven-project/src/test/resources/validation/missing-type-pom.xml b/maven-project/src/test/resources/validation/missing-type-pom.xml deleted file mode 100644 index 663e58add5..0000000000 --- a/maven-project/src/test/resources/validation/missing-type-pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - 4.0.0 - foo - bar - 99.44 - - diff --git a/maven-project/src/test/resources/validation/missing-version-pom.xml b/maven-project/src/test/resources/validation/missing-version-pom.xml deleted file mode 100644 index 2a111f191d..0000000000 --- a/maven-project/src/test/resources/validation/missing-version-pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - 4.0.0 - foo - bar - bleh - diff --git a/pom.xml b/pom.xml index 93529488cb..f84d6a407f 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,6 @@ under the License. apache-maven maven-model maven-plugin-api - maven-project maven-model-builder maven-embedder maven-toolchain @@ -205,11 +204,6 @@ under the License. maven-model ${project.version} - - org.apache.maven - maven-project - ${project.version} - org.apache.maven maven-plugin-api