diff --git a/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml new file mode 100644 index 0000000000..e9fcd5ba57 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/basedir-aligned-interpolation/pom.xml @@ -0,0 +1,60 @@ + + + + + + 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-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml b/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml new file mode 100644 index 0000000000..4f055a3784 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/basedir-interpolation/pom-with-unusual-name.xml @@ -0,0 +1,39 @@ + + + + + + 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-core/src/test/resources-project-builder/baseurl-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/baseurl-interpolation/pom.xml new file mode 100644 index 0000000000..206a54ccc6 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/baseurl-interpolation/pom.xml @@ -0,0 +1,38 @@ + + + + + + 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-core/src/test/resources-project-builder/boolean-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml new file mode 100644 index 0000000000..98dc8ef0fb --- /dev/null +++ b/maven-core/src/test/resources-project-builder/boolean-interpolation/pom.xml @@ -0,0 +1,82 @@ + + + + + + 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-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml new file mode 100644 index 0000000000..2d95cb1c5d --- /dev/null +++ b/maven-core/src/test/resources-project-builder/build-extension-inheritance/pom.xml @@ -0,0 +1,49 @@ + + + + + + 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-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml new file mode 100644 index 0000000000..4411b8929f --- /dev/null +++ b/maven-core/src/test/resources-project-builder/build-extension-inheritance/sub/pom.xml @@ -0,0 +1,75 @@ + + + + + + 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-core/src/test/resources-project-builder/complete-model/w-parent/pom.xml b/maven-core/src/test/resources-project-builder/complete-model/w-parent/pom.xml new file mode 100644 index 0000000000..ebcd7d1ee9 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/complete-model/w-parent/pom.xml @@ -0,0 +1,31 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng + parent + 0.1 + pom + + + diff --git a/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml b/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml new file mode 100644 index 0000000000..2fe674abb6 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/complete-model/w-parent/sub/pom.xml @@ -0,0 +1,319 @@ + + + + + + 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-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml b/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml new file mode 100644 index 0000000000..72dd787276 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/complete-model/wo-parent/pom.xml @@ -0,0 +1,313 @@ + + + + + + 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-core/src/test/resources-project-builder/config-with-plugin-mng/pom.xml b/maven-core/src/test/resources-project-builder/config-with-plugin-mng/pom.xml new file mode 100644 index 0000000000..e13c8a89b3 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/config-with-plugin-mng/pom.xml @@ -0,0 +1,39 @@ + + 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-core/src/test/resources-project-builder/consecutive_empty_elements/pom.xml b/maven-core/src/test/resources-project-builder/consecutive_empty_elements/pom.xml new file mode 100644 index 0000000000..16d1968fa3 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/consecutive_empty_elements/pom.xml @@ -0,0 +1,14 @@ + + 4.0.0 + test + artifact + 1.0 + + + + + + + + + diff --git a/maven-core/src/test/resources-project-builder/dependencies-different-versions/pom.xml b/maven-core/src/test/resources-project-builder/dependencies-different-versions/pom.xml new file mode 100644 index 0000000000..60ceaf728c --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dependencies-different-versions/pom.xml @@ -0,0 +1,18 @@ + + 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-core/src/test/resources-project-builder/dependencies-with-different-versions/pom.xml b/maven-core/src/test/resources-project-builder/dependencies-with-different-versions/pom.xml new file mode 100644 index 0000000000..8d4631935c --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dependencies-with-different-versions/pom.xml @@ -0,0 +1,19 @@ + + + 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-core/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml b/maven-core/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml new file mode 100644 index 0000000000..6d642626c3 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dependency-inheritance/maven-parent.xml @@ -0,0 +1,31 @@ + + + + + + 4.0.0 + + org.apache.maven + maven-parent + 11 + pom + + Apache Maven + diff --git a/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml new file mode 100644 index 0000000000..c2c061c327 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dependency-inheritance/pom.xml @@ -0,0 +1,48 @@ + + + + + + 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-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml new file mode 100644 index 0000000000..116e5bd051 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dependency-inheritance/sub/pom.xml @@ -0,0 +1,34 @@ + + + + + + + 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-core/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml new file mode 100644 index 0000000000..49ffab5a50 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dependency-management-with-interpolation/pom.xml @@ -0,0 +1,19 @@ + + 4.0.0 + + asm-parent + asm + 3.0 + pom + + + + + asm-util + ${project.groupId} + ${project.version} + + + + + diff --git a/maven-core/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml b/maven-core/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml new file mode 100644 index 0000000000..2423568ef8 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dependency-management-with-interpolation/sub/pom.xml @@ -0,0 +1,17 @@ + + + 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-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml new file mode 100644 index 0000000000..97407e9b84 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dependency-order/w-plugin-mngt/pom.xml @@ -0,0 +1,68 @@ + + + + + + 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-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml new file mode 100644 index 0000000000..29a37eab00 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dependency-order/wo-plugin-mngt/pom.xml @@ -0,0 +1,66 @@ + + + + + + 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-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml new file mode 100644 index 0000000000..bac6164c1c --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/pom.xml @@ -0,0 +1,15 @@ + + 4.0.0 + p0 + maven + 1.0 + + + + maven-test + 1.0 + a + test + + + \ No newline at end of file diff --git a/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml new file mode 100644 index 0000000000..80c5570cf0 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dependency-scope-inheritance/sub/pom.xml @@ -0,0 +1,19 @@ + + + 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-core/src/test/resources-project-builder/dependency-scope/pom.xml b/maven-core/src/test/resources-project-builder/dependency-scope/pom.xml new file mode 100644 index 0000000000..0f9ae5c6fd --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dependency-scope/pom.xml @@ -0,0 +1,18 @@ + + 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-core/src/test/resources-project-builder/dependency-scope/sub/pom.xml b/maven-core/src/test/resources-project-builder/dependency-scope/sub/pom.xml new file mode 100644 index 0000000000..8cec33d1a0 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dependency-scope/sub/pom.xml @@ -0,0 +1,24 @@ + + + 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-core/src/test/resources-project-builder/distribution-management/pom.xml b/maven-core/src/test/resources-project-builder/distribution-management/pom.xml new file mode 100644 index 0000000000..0c98793eca --- /dev/null +++ b/maven-core/src/test/resources-project-builder/distribution-management/pom.xml @@ -0,0 +1,39 @@ + + + + + + 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-core/src/test/resources-project-builder/dual-execution-ids/pom.xml b/maven-core/src/test/resources-project-builder/dual-execution-ids/pom.xml new file mode 100644 index 0000000000..a7983550d9 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dual-execution-ids/pom.xml @@ -0,0 +1,27 @@ + + + 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-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml b/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml new file mode 100644 index 0000000000..fde9e14965 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/dual-execution-ids/sub/pom.xml @@ -0,0 +1,43 @@ + + + + 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-core/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml b/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml new file mode 100644 index 0000000000..cf695cb38d --- /dev/null +++ b/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/nexus-parent.xml @@ -0,0 +1,34 @@ + + 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-core/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml b/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml new file mode 100644 index 0000000000..b12db4f084 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/pom.xml @@ -0,0 +1,33 @@ + + 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-core/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml b/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml new file mode 100644 index 0000000000..37b166d197 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/duplicate-exclusions-dependency/sub/pom.xml @@ -0,0 +1,16 @@ + + + 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-core/src/test/resources-project-builder/empty-distMng-repo-url/pom.xml b/maven-core/src/test/resources-project-builder/empty-distMng-repo-url/pom.xml new file mode 100644 index 0000000000..91ce38dfa7 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/empty-distMng-repo-url/pom.xml @@ -0,0 +1,15 @@ + + 4.0.0 + org.apache.commons + commons-parent + pom + 11 + + + + dummy + Dummy to avoid accidental deploys + + + + diff --git a/maven-core/src/test/resources-project-builder/empty-scm/pom.xml b/maven-core/src/test/resources-project-builder/empty-scm/pom.xml new file mode 100644 index 0000000000..a0462ddd95 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/empty-scm/pom.xml @@ -0,0 +1,58 @@ + + + + + + 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-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml b/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml new file mode 100644 index 0000000000..d24d4e1f3d --- /dev/null +++ b/maven-core/src/test/resources-project-builder/equal-plugin-deps/pom.xml @@ -0,0 +1,64 @@ + + + + + + 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-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml b/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml new file mode 100644 index 0000000000..d0ef617779 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/equal-plugin-exec-ids/pom.xml @@ -0,0 +1,83 @@ + + + + + + 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-core/src/test/resources-project-builder/execution-configuration-join/pom.xml b/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml new file mode 100644 index 0000000000..be09b0614c --- /dev/null +++ b/maven-core/src/test/resources-project-builder/execution-configuration-join/pom.xml @@ -0,0 +1,35 @@ + + 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-core/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml b/maven-core/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml new file mode 100644 index 0000000000..5b65ea6501 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml @@ -0,0 +1,41 @@ + + 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-core/src/test/resources-project-builder/execution-configuration/pom.xml b/maven-core/src/test/resources-project-builder/execution-configuration/pom.xml new file mode 100644 index 0000000000..130174d5c4 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/execution-configuration/pom.xml @@ -0,0 +1,58 @@ + + 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-core/src/test/resources-project-builder/foo/sub/pom.xml b/maven-core/src/test/resources-project-builder/foo/sub/pom.xml new file mode 100644 index 0000000000..c5e3d9a62f --- /dev/null +++ b/maven-core/src/test/resources-project-builder/foo/sub/pom.xml @@ -0,0 +1,418 @@ + + + 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-core/src/test/resources-project-builder/full-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml new file mode 100644 index 0000000000..08080b3045 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/full-interpolation/pom.xml @@ -0,0 +1,66 @@ + + + + + + 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-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml new file mode 100644 index 0000000000..ed95efb09d --- /dev/null +++ b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/pom.xml @@ -0,0 +1,97 @@ + + + + + + 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-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml new file mode 100644 index 0000000000..9bd61d0f62 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/id-container-joining-with-empty-elements/sub/pom.xml @@ -0,0 +1,84 @@ + + + + + + 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-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml b/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml new file mode 100644 index 0000000000..640cf2881c --- /dev/null +++ b/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml @@ -0,0 +1,50 @@ + + + + + + 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-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml b/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml new file mode 100644 index 0000000000..2aa40dedd7 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml @@ -0,0 +1,54 @@ + + + + + + 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-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml b/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml new file mode 100644 index 0000000000..3e11a6d63c --- /dev/null +++ b/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/pom.xml @@ -0,0 +1,41 @@ + + + + + + 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-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml b/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml new file mode 100644 index 0000000000..49c8fd21e3 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/inherited-properties-interpolation/no-profile/sub/pom.xml @@ -0,0 +1,45 @@ + + + + + + 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-core/src/test/resources-project-builder/jdk-activation/pom.xml b/maven-core/src/test/resources-project-builder/jdk-activation/pom.xml new file mode 100644 index 0000000000..c0431f5807 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/jdk-activation/pom.xml @@ -0,0 +1,105 @@ + + + + + + 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-core/src/test/resources-project-builder/join-different-containers-same-id/pom.xml b/maven-core/src/test/resources-project-builder/join-different-containers-same-id/pom.xml new file mode 100644 index 0000000000..b3f48caa3a --- /dev/null +++ b/maven-core/src/test/resources-project-builder/join-different-containers-same-id/pom.xml @@ -0,0 +1,66 @@ + + + + + + 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-core/src/test/resources-project-builder/limited-inheritance/child/pom.xml b/maven-core/src/test/resources-project-builder/limited-inheritance/child/pom.xml new file mode 100644 index 0000000000..8e9e62376a --- /dev/null +++ b/maven-core/src/test/resources-project-builder/limited-inheritance/child/pom.xml @@ -0,0 +1,61 @@ + + + + + + 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-core/src/test/resources-project-builder/limited-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml new file mode 100644 index 0000000000..bd7b4588a0 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/limited-inheritance/pom.xml @@ -0,0 +1,87 @@ + + + + + + 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-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml b/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml new file mode 100644 index 0000000000..b3305c76bd --- /dev/null +++ b/maven-core/src/test/resources-project-builder/managed-profile-dependency/pom.xml @@ -0,0 +1,55 @@ + + + + + + 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-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml b/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml new file mode 100644 index 0000000000..706e748a62 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml @@ -0,0 +1,55 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-filter-order/pom.xml b/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml new file mode 100644 index 0000000000..bd15b7774f --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-filter-order/pom.xml @@ -0,0 +1,44 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml new file mode 100644 index 0000000000..2d7444f4b8 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-filter-order/sub/pom.xml @@ -0,0 +1,49 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml new file mode 100644 index 0000000000..6c4b186677 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/pom.xml @@ -0,0 +1,64 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml new file mode 100644 index 0000000000..85cc818847 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/w-plugin-mngt/sub/pom.xml @@ -0,0 +1,64 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml new file mode 100644 index 0000000000..d4dcf657e2 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/pom.xml @@ -0,0 +1,62 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml new file mode 100644 index 0000000000..85cc818847 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-plugin-class-path-order/wo-plugin-mngt/sub/pom.xml @@ -0,0 +1,64 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml new file mode 100644 index 0000000000..97fc9c4793 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/pom.xml @@ -0,0 +1,59 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml new file mode 100644 index 0000000000..b21f6a9227 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/w-plugin-mngt/sub/pom.xml @@ -0,0 +1,59 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml new file mode 100644 index 0000000000..b56a7a028c --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/pom.xml @@ -0,0 +1,57 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml new file mode 100644 index 0000000000..8da0710c47 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-goals-order/wo-plugin-mngt/sub/pom.xml @@ -0,0 +1,59 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml new file mode 100644 index 0000000000..cd5383cede --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/pom.xml @@ -0,0 +1,71 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml new file mode 100644 index 0000000000..c14f8e37a4 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/w-plugin-mngt/sub/pom.xml @@ -0,0 +1,71 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml new file mode 100644 index 0000000000..90d2bef8e4 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/pom.xml @@ -0,0 +1,69 @@ + + + + + + 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-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml new file mode 100644 index 0000000000..c14f8e37a4 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/merged-plugin-exec-order/wo-plugin-mngt/sub/pom.xml @@ -0,0 +1,71 @@ + + + + + + 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-core/src/test/resources-project-builder/micromailer/pom.xml b/maven-core/src/test/resources-project-builder/micromailer/pom.xml new file mode 100644 index 0000000000..57f85dd801 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/micromailer/pom.xml @@ -0,0 +1,124 @@ + + + 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-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom b/maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom new file mode 100644 index 0000000000..695c3c93c0 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/micromailer/spice-parent-9.pom @@ -0,0 +1,103 @@ + + 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-core/src/test/resources-project-builder/multiple-filters/pom.xml b/maven-core/src/test/resources-project-builder/multiple-filters/pom.xml new file mode 100644 index 0000000000..1141efb5a7 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/multiple-filters/pom.xml @@ -0,0 +1,17 @@ + + + 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-core/src/test/resources-project-builder/multiple-repos/pom.xml b/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml new file mode 100644 index 0000000000..6c14fcd035 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/multiple-repos/pom.xml @@ -0,0 +1,43 @@ + + + + + + 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-core/src/test/resources-project-builder/multiple-repos/sub/pom.xml b/maven-core/src/test/resources-project-builder/multiple-repos/sub/pom.xml new file mode 100644 index 0000000000..d7b210201a --- /dev/null +++ b/maven-core/src/test/resources-project-builder/multiple-repos/sub/pom.xml @@ -0,0 +1,45 @@ + + + + + + 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-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml new file mode 100644 index 0000000000..d3c5cc1f69 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/nested-build-dir-interpolation/pom.xml @@ -0,0 +1,55 @@ + + + + + + 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-core/src/test/resources-project-builder/parent-inheritance/child3.xml b/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml new file mode 100644 index 0000000000..54f9b29daf --- /dev/null +++ b/maven-core/src/test/resources-project-builder/parent-inheritance/child3.xml @@ -0,0 +1,6 @@ + + gid + child-3 + 1.0 + 4.0.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml new file mode 100644 index 0000000000..3dc28738a3 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/parent-inheritance/pom.xml @@ -0,0 +1,10 @@ + + + gid + child-3 + 1.0 + child3.xml + + 4.0.0 + child-2 + \ No newline at end of file diff --git a/maven-core/src/test/resources-project-builder/parent-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/parent-inheritance/sub/pom.xml new file mode 100644 index 0000000000..2d4671ed9f --- /dev/null +++ b/maven-core/src/test/resources-project-builder/parent-inheritance/sub/pom.xml @@ -0,0 +1,9 @@ + + + gid + child-2 + 1.0 + + 4.0.0 + child-1 + \ No newline at end of file diff --git a/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml new file mode 100644 index 0000000000..7414d0234e --- /dev/null +++ b/maven-core/src/test/resources-project-builder/parent-interpolation/pom.xml @@ -0,0 +1,15 @@ + + 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-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml b/maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml new file mode 100644 index 0000000000..752852b1b1 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/parent-interpolation/sub/pom.xml @@ -0,0 +1,9 @@ + + + org.sonatype.nexus + nexus + 1.3.0-SNAPSHOT + + 4.0.0 + a + \ No newline at end of file diff --git a/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml b/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml new file mode 100644 index 0000000000..a5bea4848e --- /dev/null +++ b/maven-core/src/test/resources-project-builder/platform-file-separator/pom.xml @@ -0,0 +1,40 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml new file mode 100644 index 0000000000..52fb468dc2 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/pom.xml @@ -0,0 +1,80 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml new file mode 100644 index 0000000000..cef53d32f4 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-config-append/no-profile/subproject/pom.xml @@ -0,0 +1,70 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml new file mode 100644 index 0000000000..48a8d393ba --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/pom.xml @@ -0,0 +1,90 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml new file mode 100644 index 0000000000..7023503089 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-config-append/with-profile/subproject/pom.xml @@ -0,0 +1,80 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml new file mode 100644 index 0000000000..cfe425b631 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-plugin-mngt/pom.xml @@ -0,0 +1,62 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml new file mode 100644 index 0000000000..f22a18190e --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-config-attributes/w-profile/pom.xml @@ -0,0 +1,74 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml new file mode 100644 index 0000000000..49e2452d87 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-config-attributes/wo-plugin-mngt/pom.xml @@ -0,0 +1,53 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml new file mode 100644 index 0000000000..dd5fe00885 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-config-merging/child/pom.xml @@ -0,0 +1,76 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-config-merging/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml new file mode 100644 index 0000000000..e96d6e1534 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-config-merging/pom.xml @@ -0,0 +1,72 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml new file mode 100644 index 0000000000..2b3fd71d03 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-config-order/w-plugin-mngt/pom.xml @@ -0,0 +1,68 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml new file mode 100644 index 0000000000..22a2b810f6 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-config-order/wo-plugin-mngt/pom.xml @@ -0,0 +1,59 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-config-properties/pom.xml b/maven-core/src/test/resources-project-builder/plugin-config-properties/pom.xml new file mode 100644 index 0000000000..e56603919b --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-config-properties/pom.xml @@ -0,0 +1,30 @@ + + + 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-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml new file mode 100644 index 0000000000..a5ecf1ba6f --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/w-plugin-mngt/pom.xml @@ -0,0 +1,78 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml new file mode 100644 index 0000000000..5a5f4c726b --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-config-order/wo-plugin-mngt/pom.xml @@ -0,0 +1,69 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml new file mode 100644 index 0000000000..07450ca28f --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/w-plugin-mngt/pom.xml @@ -0,0 +1,66 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml new file mode 100644 index 0000000000..51660135fb --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-goals-order/wo-plugin-mngt/pom.xml @@ -0,0 +1,57 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml new file mode 100644 index 0000000000..b64af3ae4a --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml @@ -0,0 +1,56 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml new file mode 100644 index 0000000000..f96116adfb --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml @@ -0,0 +1,59 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml new file mode 100644 index 0000000000..e243cfd054 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml @@ -0,0 +1,55 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml new file mode 100644 index 0000000000..bdeb76e105 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml @@ -0,0 +1,58 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml new file mode 100644 index 0000000000..e04c7b1e23 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml @@ -0,0 +1,58 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml new file mode 100644 index 0000000000..827b907535 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml @@ -0,0 +1,59 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml new file mode 100644 index 0000000000..e0055d0032 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml @@ -0,0 +1,56 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml new file mode 100644 index 0000000000..827b907535 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml @@ -0,0 +1,59 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml new file mode 100644 index 0000000000..a8b031f2f7 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml @@ -0,0 +1,76 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml new file mode 100644 index 0000000000..c226262c5c --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml @@ -0,0 +1,67 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml new file mode 100644 index 0000000000..4cbab22e5b --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml @@ -0,0 +1,72 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml new file mode 100644 index 0000000000..9fcf91b16d --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml @@ -0,0 +1,64 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml b/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml new file mode 100644 index 0000000000..37e004440c --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/pom.xml @@ -0,0 +1,16 @@ + + 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-core/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml new file mode 100644 index 0000000000..f6ed4dd499 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-inheritance-simple/sub/pom.xml @@ -0,0 +1,20 @@ + + + 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-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml b/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml new file mode 100644 index 0000000000..4df7cc6fb9 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-management-dependencies/pom.xml @@ -0,0 +1,24 @@ + + 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-core/src/test/resources-project-builder/plugin-management-dependencies/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-management-dependencies/sub/pom.xml new file mode 100644 index 0000000000..7f73423e5e --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-management-dependencies/sub/pom.xml @@ -0,0 +1,25 @@ + + + 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-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml b/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml new file mode 100644 index 0000000000..b59e68befb --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-management-duplicate/pom.xml @@ -0,0 +1,37 @@ + + + + + + + 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-core/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml b/maven-core/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml new file mode 100644 index 0000000000..5e844b7987 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml @@ -0,0 +1,64 @@ + + + + + + + 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-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml new file mode 100644 index 0000000000..ac4da04b86 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-management-inheritance/pom.xml @@ -0,0 +1,64 @@ + + + + + + 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-core/src/test/resources-project-builder/plugin-merge-simple/pom.xml b/maven-core/src/test/resources-project-builder/plugin-merge-simple/pom.xml new file mode 100644 index 0000000000..10eac25fd4 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-merge-simple/pom.xml @@ -0,0 +1,17 @@ + + 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-core/src/test/resources-project-builder/plugin-order/nexus-parent.xml b/maven-core/src/test/resources-project-builder/plugin-order/nexus-parent.xml new file mode 100644 index 0000000000..64851f9e2c --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-order/nexus-parent.xml @@ -0,0 +1,18 @@ + + 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-core/src/test/resources-project-builder/plugin-order/pom.xml b/maven-core/src/test/resources-project-builder/plugin-order/pom.xml new file mode 100644 index 0000000000..22594e52b4 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/plugin-order/pom.xml @@ -0,0 +1,27 @@ + + 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-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml b/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml new file mode 100644 index 0000000000..65560c0763 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/pom.xml @@ -0,0 +1,17 @@ + + 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-core/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml b/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml new file mode 100644 index 0000000000..319e6adbf0 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/pluginmanagement-inherited/sub/pom.xml @@ -0,0 +1,17 @@ + + + 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-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml b/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml new file mode 100644 index 0000000000..aaa433e443 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/pom-encoding/latin-1/pom.xml @@ -0,0 +1,36 @@ + + + + + + + + 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-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml b/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml new file mode 100644 index 0000000000..07b892466b --- /dev/null +++ b/maven-core/src/test/resources-project-builder/pom-encoding/utf-8/pom.xml @@ -0,0 +1,36 @@ + + + + + + + + 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-core/src/test/resources-project-builder/pom-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml new file mode 100644 index 0000000000..59cef1d8dc --- /dev/null +++ b/maven-core/src/test/resources-project-builder/pom-inheritance/pom.xml @@ -0,0 +1,188 @@ + + + + + + 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-core/src/test/resources-project-builder/pom-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/pom-inheritance/sub/pom.xml new file mode 100644 index 0000000000..ae74902875 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/pom-inheritance/sub/pom.xml @@ -0,0 +1,36 @@ + + + + + + 4.0.0 + + + + + org.apache.maven.its.mng3843 + parent-1 + 0.1 + + + child-1 + diff --git a/maven-core/src/test/resources-project-builder/profile-default-deactivation/pom.xml b/maven-core/src/test/resources-project-builder/profile-default-deactivation/pom.xml new file mode 100644 index 0000000000..dfe19253f8 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/profile-default-deactivation/pom.xml @@ -0,0 +1,35 @@ + + 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-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml b/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml new file mode 100644 index 0000000000..2828fd1789 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/profile-dependencies-multiple-profiles/pom.xml @@ -0,0 +1,81 @@ + + + + + + 4.0.0 + + org.apache.maven.its.it0021 + test + 1.0-SNAPSHOT + + Maven Integration Test :: it0021 + + Test pom-level profile inclusion (this one is activated by system property). + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + + test + validate + + compile + + + + + + + + + + profile-1 + + + includeProfile + + + + + org.apache.maven.its.it0021 + a + 0.1 + + + + + profile-2 + + + + org.apache.maven.its.it0021 + b + 0.1 + + + + + diff --git a/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml b/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml new file mode 100644 index 0000000000..fc7fab955b --- /dev/null +++ b/maven-core/src/test/resources-project-builder/profile-injected-dependencies/pom.xml @@ -0,0 +1,75 @@ + + + + + + 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-core/src/test/resources-project-builder/profile-injection-order/pom.xml b/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml new file mode 100644 index 0000000000..784996de5f --- /dev/null +++ b/maven-core/src/test/resources-project-builder/profile-injection-order/pom.xml @@ -0,0 +1,68 @@ + + + + + + 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-core/src/test/resources-project-builder/profile-module-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/profile-module-inheritance/pom.xml new file mode 100644 index 0000000000..4e4c40b216 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/profile-module-inheritance/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + org.ops4j.pax + construct + 1.0 + pom + + + + dist + + maven-inherit-plugin + maven-pax-plugin + + + + + diff --git a/maven-core/src/test/resources-project-builder/profile-module-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/profile-module-inheritance/sub/pom.xml new file mode 100644 index 0000000000..60f057cce3 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/profile-module-inheritance/sub/pom.xml @@ -0,0 +1,12 @@ + + + org.ops4j.pax + construct + 1.0 + + + 4.0.0 + org.ops4j + maven-inherit-plugin + 1.1 + diff --git a/maven-core/src/test/resources-project-builder/profile-module/pom.xml b/maven-core/src/test/resources-project-builder/profile-module/pom.xml new file mode 100644 index 0000000000..b6336fd48c --- /dev/null +++ b/maven-core/src/test/resources-project-builder/profile-module/pom.xml @@ -0,0 +1,24 @@ + + 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-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml b/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml new file mode 100644 index 0000000000..118861a34a --- /dev/null +++ b/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/pom.xml @@ -0,0 +1,77 @@ + + + + + + 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-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml b/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml new file mode 100644 index 0000000000..9c06879520 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/profile-plugin-mng-dependencies/sub/pom.xml @@ -0,0 +1,62 @@ + + + + + + 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-core/src/test/resources-project-builder/profile-plugins/pom.xml b/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml new file mode 100644 index 0000000000..cc305f9788 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/profile-plugins/pom.xml @@ -0,0 +1,50 @@ + + + + + + 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-core/src/test/resources-project-builder/profile-properties-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/profile-properties-interpolation/pom.xml new file mode 100644 index 0000000000..a95e253b63 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/profile-properties-interpolation/pom.xml @@ -0,0 +1,54 @@ + + + + + + 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-core/src/test/resources-project-builder/properties-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/properties-inheritance/pom.xml new file mode 100644 index 0000000000..6d17dd3a0a --- /dev/null +++ b/maven-core/src/test/resources-project-builder/properties-inheritance/pom.xml @@ -0,0 +1,34 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng3843 + parent-1 + 0.1 + pom + + + parent-property + parent-property + + diff --git a/maven-core/src/test/resources-project-builder/properties-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/properties-inheritance/sub/pom.xml new file mode 100644 index 0000000000..c5394df5c3 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/properties-inheritance/sub/pom.xml @@ -0,0 +1,40 @@ + + + + + + 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-core/src/test/resources-project-builder/properties-no-duplication/pom.xml b/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml new file mode 100644 index 0000000000..ebdb8b1cc1 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/properties-no-duplication/pom.xml @@ -0,0 +1,11 @@ + + + 4.0.0 + org.apache.maven.its + test-parent + 1.0-SNAPSHOT + + parent + + diff --git a/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml b/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml new file mode 100644 index 0000000000..9241b8bb76 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/properties-no-duplication/sub/pom.xml @@ -0,0 +1,17 @@ + + + 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-core/src/test/resources-project-builder/repo-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml new file mode 100644 index 0000000000..67f9ee6fc9 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/repo-inheritance/pom.xml @@ -0,0 +1,64 @@ + + + + + + 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-core/src/test/resources-project-builder/reporting-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/reporting-interpolation/pom.xml new file mode 100644 index 0000000000..49df00a8bb --- /dev/null +++ b/maven-core/src/test/resources-project-builder/reporting-interpolation/pom.xml @@ -0,0 +1,6 @@ + + 4.0.0 + gid + aid + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources-project-builder/reporting-plugin-config/pom.xml b/maven-core/src/test/resources-project-builder/reporting-plugin-config/pom.xml new file mode 100644 index 0000000000..fdb455a090 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/reporting-plugin-config/pom.xml @@ -0,0 +1,51 @@ + + + + + + 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-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml b/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml new file mode 100644 index 0000000000..e6018dd604 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml @@ -0,0 +1,47 @@ + + + + + + 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-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml b/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml new file mode 100644 index 0000000000..6a60a8eb94 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml @@ -0,0 +1,37 @@ + + 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-core/src/test/resources-project-builder/single-configuration-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/single-configuration-inheritance/pom.xml new file mode 100644 index 0000000000..695ffaff0c --- /dev/null +++ b/maven-core/src/test/resources-project-builder/single-configuration-inheritance/pom.xml @@ -0,0 +1,41 @@ + + 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-core/src/test/resources-project-builder/unc-path/pom.xml b/maven-core/src/test/resources-project-builder/unc-path/pom.xml new file mode 100644 index 0000000000..1e9035c487 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/unc-path/pom.xml @@ -0,0 +1,41 @@ + + + + + + 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-core/src/test/resources-project-builder/unc-path/sub/pom.xml b/maven-core/src/test/resources-project-builder/unc-path/sub/pom.xml new file mode 100644 index 0000000000..fddd8723bd --- /dev/null +++ b/maven-core/src/test/resources-project-builder/unc-path/sub/pom.xml @@ -0,0 +1,57 @@ + + + + + + 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-core/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml b/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml new file mode 100644 index 0000000000..5081a6cf38 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml @@ -0,0 +1,104 @@ + + + + + + 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-core/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml new file mode 100644 index 0000000000..d5c76696e7 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml @@ -0,0 +1,36 @@ + + + + + + 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-core/src/test/resources-project-builder/url-append/child/pom.xml b/maven-core/src/test/resources-project-builder/url-append/child/pom.xml new file mode 100644 index 0000000000..1f377df1ff --- /dev/null +++ b/maven-core/src/test/resources-project-builder/url-append/child/pom.xml @@ -0,0 +1,64 @@ + + + + + + 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-core/src/test/resources-project-builder/url-append/parent/pom.xml b/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml new file mode 100644 index 0000000000..00a4a349b3 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/url-append/parent/pom.xml @@ -0,0 +1,53 @@ + + + + + + 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-core/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml b/maven-core/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml new file mode 100644 index 0000000000..463772feb2 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/url-inheritance/another-parent/pom.xml @@ -0,0 +1,36 @@ + + + + + + 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-core/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml b/maven-core/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml new file mode 100644 index 0000000000..128e63d12e --- /dev/null +++ b/maven-core/src/test/resources-project-builder/url-inheritance/another-parent/sub/pom.xml @@ -0,0 +1,35 @@ + + + + + + 4.0.0 + + + + + org.apache.maven.its.mng3846 + ap + 0.1 + + + child + Child Project + diff --git a/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml b/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml new file mode 100644 index 0000000000..138cb6942d --- /dev/null +++ b/maven-core/src/test/resources-project-builder/url-inheritance/pom.xml @@ -0,0 +1,74 @@ + + + + + + 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-core/src/test/resources-project-builder/url-inheritance/sub/pom.xml b/maven-core/src/test/resources-project-builder/url-inheritance/sub/pom.xml new file mode 100644 index 0000000000..c8e9c108d3 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/url-inheritance/sub/pom.xml @@ -0,0 +1,35 @@ + + + + + + 4.0.0 + + + + + org.apache.maven.its.mng3846 + parent + 0.1 + + + child + Child Project + diff --git a/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml b/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml new file mode 100644 index 0000000000..5b92e23ed9 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/url-no-decoding/pom.xml @@ -0,0 +1,64 @@ + + + + + + 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-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml b/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml new file mode 100644 index 0000000000..f7742fd72e --- /dev/null +++ b/maven-core/src/test/resources-project-builder/xml-coalesce-text/pom.xml @@ -0,0 +1,567 @@ + + + + + + 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-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml b/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml new file mode 100644 index 0000000000..aec8b6cbc3 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/xml-markup-interpolation/pom.xml @@ -0,0 +1,41 @@ + + + + + + 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-core/src/test/resources-project-builder/xml-whitespace/pom.xml b/maven-core/src/test/resources-project-builder/xml-whitespace/pom.xml new file mode 100644 index 0000000000..433dd522c8 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/xml-whitespace/pom.xml @@ -0,0 +1,43 @@ + + + + + + 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-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml b/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml new file mode 100644 index 0000000000..858a82d6a6 --- /dev/null +++ b/maven-core/src/test/resources-project-builder/xml-whitespace/sub/pom.xml @@ -0,0 +1,49 @@ + + + + + + 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-core/src/test/resources/canonical-pom.xml b/maven-core/src/test/resources/canonical-pom.xml new file mode 100644 index 0000000000..cccbf7fdf5 --- /dev/null +++ b/maven-core/src/test/resources/canonical-pom.xml @@ -0,0 +1,51 @@ + + + + + + 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-core/src/test/resources/dependencyManagement-pom.xml b/maven-core/src/test/resources/dependencyManagement-pom.xml new file mode 100644 index 0000000000..0ac9b461d7 --- /dev/null +++ b/maven-core/src/test/resources/dependencyManagement-pom.xml @@ -0,0 +1,41 @@ + + + + 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-core/src/test/resources/distributionManagement-pom.xml b/maven-core/src/test/resources/distributionManagement-pom.xml new file mode 100644 index 0000000000..772998601b --- /dev/null +++ b/maven-core/src/test/resources/distributionManagement-pom.xml @@ -0,0 +1,40 @@ + + + + + + 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-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-a-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-b-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-c-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/jars/maven-test-d-1.2.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom new file mode 100644 index 0000000000..93fc0d0b3e --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.0.pom @@ -0,0 +1,14 @@ + + 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-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom new file mode 100644 index 0000000000..a08308610b --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-a-1.1.pom @@ -0,0 +1,14 @@ + + 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-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom new file mode 100644 index 0000000000..c173c663de --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + maven-test-b + jar + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom new file mode 100644 index 0000000000..fff241a19b --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-b-1.1.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + maven-test-b + jar + 1.1 + \ No newline at end of file diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom new file mode 100644 index 0000000000..1f0497860f --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + maven-test-c + jar + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom new file mode 100644 index 0000000000..8bd52514ce --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-c-1.1.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + maven-test-c + jar + 1.1 + \ No newline at end of file diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom new file mode 100644 index 0000000000..ac6ef12ec5 --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + maven-test-d + jar + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom new file mode 100644 index 0000000000..6e22f6083e --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.1.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + maven-test-d + jar + 1.1 + \ No newline at end of file diff --git a/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom new file mode 100644 index 0000000000..16f8d90515 --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/maven-test/poms/maven-test-d-1.2.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + maven-test-d + jar + 1.2 + \ No newline at end of file diff --git a/maven-core/src/test/resources/imports-repo/t01/p0/p1/pom.xml b/maven-core/src/test/resources/imports-repo/t01/p0/p1/pom.xml new file mode 100644 index 0000000000..7bfca34249 --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/p0/p1/pom.xml @@ -0,0 +1,45 @@ + + + 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-core/src/test/resources/imports-repo/t01/p0/p2/pom.xml b/maven-core/src/test/resources/imports-repo/t01/p0/p2/pom.xml new file mode 100644 index 0000000000..b45ce9c618 --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/p0/p2/pom.xml @@ -0,0 +1,56 @@ + + + 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-core/src/test/resources/imports-repo/t01/p0/p3/pom.xml b/maven-core/src/test/resources/imports-repo/t01/p0/p3/pom.xml new file mode 100644 index 0000000000..e9648e393d --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/p0/p3/pom.xml @@ -0,0 +1,59 @@ + + + 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-core/src/test/resources/imports-repo/t01/p0/p4/pom.xml b/maven-core/src/test/resources/imports-repo/t01/p0/p4/pom.xml new file mode 100644 index 0000000000..7ffef9d727 --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/p0/p4/pom.xml @@ -0,0 +1,67 @@ + + + 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-core/src/test/resources/imports-repo/t01/p0/pom.xml b/maven-core/src/test/resources/imports-repo/t01/p0/pom.xml new file mode 100644 index 0000000000..3ccf7e6336 --- /dev/null +++ b/maven-core/src/test/resources/imports-repo/t01/p0/pom.xml @@ -0,0 +1,26 @@ + + 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-core/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom new file mode 100644 index 0000000000..92c9f41d22 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom @@ -0,0 +1,11 @@ + + 4.0.0 + maven + p0 + pom + p0 + 1.0 + + Codehaus + + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom new file mode 100644 index 0000000000..6038a806a4 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom @@ -0,0 +1,16 @@ + + + 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-core/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom new file mode 100644 index 0000000000..9ac112ac46 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom @@ -0,0 +1,18 @@ + + + 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-core/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom new file mode 100644 index 0000000000..d40684e970 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom @@ -0,0 +1,14 @@ + + + p2 + maven + 1.0 + + 4.0.0 + maven + p3 + pom + p3 + 1.0 + 2000 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom new file mode 100644 index 0000000000..dc9a273529 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom @@ -0,0 +1,13 @@ + + + p3 + maven + 1.0 + + 4.0.0 + maven + p4 + jar + p4 + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom new file mode 100644 index 0000000000..9df2582d66 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p0-1.0.pom @@ -0,0 +1,11 @@ + + 4.0.0 + maven.t01 + p0 + pom + p0 + 1.0 + + p0-org + + diff --git a/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom new file mode 100644 index 0000000000..4fc81d8338 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p1-1.0.pom @@ -0,0 +1,16 @@ + + + p0 + maven.t01 + 1.0 + + 4.0.0 + maven.t01 + p1 + pom + p1 + 1.0 + + p1-org + + diff --git a/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom new file mode 100644 index 0000000000..8032cf2fb1 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p2-1.0.pom @@ -0,0 +1,16 @@ + + + p1 + maven.t01 + 1.0 + + 4.0.0 + maven.t01 + p2 + pom + p2 + 1.0 + + p2-org + + diff --git a/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom new file mode 100644 index 0000000000..6ed58569fc --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p3-1.0.pom @@ -0,0 +1,16 @@ + + + p2 + maven.t01 + 1.0 + + 4.0.0 + maven.t01 + p3 + pom + p3 + 1.0 + + p3-org + + diff --git a/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom new file mode 100644 index 0000000000..1739333a82 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t01/maven.t01/poms/p4-1.0.pom @@ -0,0 +1,16 @@ + + + p3 + maven.t01 + 1.0 + + 4.0.0 + maven.t01 + p4 + jar + p4 + 1.0 + + p4-org + + diff --git a/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml b/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml new file mode 100644 index 0000000000..93d1d72f64 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/p5/pom.xml @@ -0,0 +1,32 @@ + + + + + p4 + maven.t02 + 1.0 + + 4.0.0 + maven.t02 + p5 + jar + p5 + 1.0 + diff --git a/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml b/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml new file mode 100644 index 0000000000..123341b31c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/p4/pom.xml @@ -0,0 +1,32 @@ + + + + + p3 + maven.t02 + 1.0 + + 4.0.0 + maven.t02 + p4 + jar + p4 + 1.0 + diff --git a/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml b/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml new file mode 100644 index 0000000000..d83de976d1 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/p3/pom.xml @@ -0,0 +1,33 @@ + + + + + p2 + maven.t02 + 1.0 + + 4.0.0 + maven.t02 + p3 + pom + p3 + 1.0 + 2000 + diff --git a/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml b/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml new file mode 100644 index 0000000000..c2b7d7153e --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/p2/pom.xml @@ -0,0 +1,37 @@ + + + + + p1 + maven.t02 + 1.0 + + 4.0.0 + maven.t02 + p2 + pom + p2 + 1.0 + + + mailing-list + + + diff --git a/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml b/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml new file mode 100644 index 0000000000..af2d92ede4 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t02/p0/p1/pom.xml @@ -0,0 +1,51 @@ + + + + + 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-core/src/test/resources/inheritance-repo/t02/p0/pom.xml b/maven-core/src/test/resources/inheritance-repo/t02/p0/pom.xml new file mode 100644 index 0000000000..3643fe49f3 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t02/p0/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + maven.t02 + p0 + pom + p0 + 1.0 + + Codehaus + + diff --git a/maven-core/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml b/maven-core/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml new file mode 100644 index 0000000000..69fe6a1dce --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t03/p0/p1/pom.xml @@ -0,0 +1,45 @@ + + + + + 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-core/src/test/resources/inheritance-repo/t03/p0/pom.xml b/maven-core/src/test/resources/inheritance-repo/t03/p0/pom.xml new file mode 100644 index 0000000000..476ffdfbdd --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t03/p0/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + maven.t03 + p0 + pom + p0 + 1.0 + + Codehaus + + diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-b-2.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/jars/t04-c-2.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom new file mode 100644 index 0000000000..5ca34c3a2e --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-a-1.0.pom @@ -0,0 +1,21 @@ + + 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-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom new file mode 100644 index 0000000000..4c311ab133 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t04-b + jar + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom new file mode 100644 index 0000000000..d24e3bc1f5 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-b-2.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t04-b + jar + 2.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom new file mode 100644 index 0000000000..bef2488ba4 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t04-c + jar + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom new file mode 100644 index 0000000000..d24e3bc1f5 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t04/maven-test/poms/t04-c-2.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t04-b + jar + 2.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml b/maven-core/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml new file mode 100644 index 0000000000..c25fc3e738 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t04/p0/p1/pom.xml @@ -0,0 +1,41 @@ + + + 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-core/src/test/resources/inheritance-repo/t04/p0/pom.xml b/maven-core/src/test/resources/inheritance-repo/t04/p0/pom.xml new file mode 100644 index 0000000000..1b02dc2c0c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t04/p0/pom.xml @@ -0,0 +1,37 @@ + + 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-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-a-2.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-b-2.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/jars/t05-d-1.2.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom new file mode 100644 index 0000000000..a1b8cb9b11 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-1.0.pom @@ -0,0 +1,23 @@ + + 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-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom new file mode 100644 index 0000000000..097101e81f --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-a-2.0.pom @@ -0,0 +1,23 @@ + + 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-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom new file mode 100644 index 0000000000..e0490ff73b --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.0.pom @@ -0,0 +1,24 @@ + + 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-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom new file mode 100644 index 0000000000..ff59f5d2b7 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-1.1.pom @@ -0,0 +1,24 @@ + + 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-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom new file mode 100644 index 0000000000..79370ec4f0 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-b-2.0.pom @@ -0,0 +1,24 @@ + + 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-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom new file mode 100644 index 0000000000..0edc3ddd6f --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-c-1.0.pom @@ -0,0 +1,17 @@ + + 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-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom new file mode 100644 index 0000000000..9290b033d5 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t05-d + jar + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom new file mode 100644 index 0000000000..b4af4b2cdb --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.1.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t05-d + jar + 1.1 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom new file mode 100644 index 0000000000..09e1d9470c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/maven-test/poms/t05-d-1.2.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t05-d + jar + 1.2 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml b/maven-core/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml new file mode 100644 index 0000000000..d9c2d52bba --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/p0/p1/pom.xml @@ -0,0 +1,54 @@ + + + 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-core/src/test/resources/inheritance-repo/t05/p0/pom.xml b/maven-core/src/test/resources/inheritance-repo/t05/p0/pom.xml new file mode 100644 index 0000000000..6c93838b93 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t05/p0/pom.xml @@ -0,0 +1,36 @@ + + 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-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-b-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/jars/t06-d-1.2.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom new file mode 100644 index 0000000000..21aa5f556b --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-a-1.0.pom @@ -0,0 +1,23 @@ + + 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-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom new file mode 100644 index 0000000000..a9af131cba --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.0.pom @@ -0,0 +1,24 @@ + + 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-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom new file mode 100644 index 0000000000..a9af131cba --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-b-1.1.pom @@ -0,0 +1,24 @@ + + 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-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom new file mode 100644 index 0000000000..80272114a8 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-c-1.0.pom @@ -0,0 +1,17 @@ + + 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-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom new file mode 100644 index 0000000000..e4531ab4a7 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t06-d + jar + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom new file mode 100644 index 0000000000..c146cb89a6 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.1.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t06-d + jar + 1.1 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom new file mode 100644 index 0000000000..ff91f975ae --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/maven-test/poms/t06-d-1.2.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t06-d + jar + 1.2 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml b/maven-core/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml new file mode 100644 index 0000000000..468621901e --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/p0/p1/pom.xml @@ -0,0 +1,54 @@ + + + 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-core/src/test/resources/inheritance-repo/t06/p0/pom.xml b/maven-core/src/test/resources/inheritance-repo/t06/p0/pom.xml new file mode 100644 index 0000000000..60c540ca12 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t06/p0/pom.xml @@ -0,0 +1,37 @@ + + 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-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-b-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/jars/t07-d-1.2.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom new file mode 100644 index 0000000000..05665a9c27 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-a-1.0.pom @@ -0,0 +1,23 @@ + + 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-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom new file mode 100644 index 0000000000..8ce6751c93 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.0.pom @@ -0,0 +1,24 @@ + + 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-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom new file mode 100644 index 0000000000..689ad055ed --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-b-1.1.pom @@ -0,0 +1,24 @@ + + 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-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom new file mode 100644 index 0000000000..494470c49b --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-c-1.0.pom @@ -0,0 +1,17 @@ + + 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-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom new file mode 100644 index 0000000000..5761d51547 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t07-d + jar + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom new file mode 100644 index 0000000000..08fc179c17 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.1.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t07-d + jar + 1.1 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom new file mode 100644 index 0000000000..544ccc59a0 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/maven-test/poms/t07-d-1.2.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t07-d + jar + 1.2 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml b/maven-core/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml new file mode 100644 index 0000000000..6f700429a0 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/p0/p1/pom.xml @@ -0,0 +1,54 @@ + + + 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-core/src/test/resources/inheritance-repo/t07/p0/pom.xml b/maven-core/src/test/resources/inheritance-repo/t07/p0/pom.xml new file mode 100644 index 0000000000..b500ee0e58 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t07/p0/pom.xml @@ -0,0 +1,37 @@ + + 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-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-b-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.1.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/jars/t08-d-1.2.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom new file mode 100644 index 0000000000..186c2d89f1 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-a-1.0.pom @@ -0,0 +1,23 @@ + + 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-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom new file mode 100644 index 0000000000..d866ab3556 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.0.pom @@ -0,0 +1,24 @@ + + 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-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom new file mode 100644 index 0000000000..d402466e9f --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-b-1.1.pom @@ -0,0 +1,24 @@ + + 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-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom new file mode 100644 index 0000000000..d8250528e2 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-c-1.0.pom @@ -0,0 +1,17 @@ + + 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-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom new file mode 100644 index 0000000000..f453045880 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t08-d + jar + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom new file mode 100644 index 0000000000..c7703b02db --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.1.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t08-d + jar + 1.1 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom new file mode 100644 index 0000000000..e341be534d --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/maven-test/poms/t08-d-1.2.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t08-d + jar + 1.2 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml b/maven-core/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml new file mode 100644 index 0000000000..331996d87e --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/p0/p1/pom.xml @@ -0,0 +1,59 @@ + + + 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-core/src/test/resources/inheritance-repo/t08/p0/pom.xml b/maven-core/src/test/resources/inheritance-repo/t08/p0/pom.xml new file mode 100644 index 0000000000..a18ab853d1 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t08/p0/pom.xml @@ -0,0 +1,37 @@ + + 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-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/jars/t09-d-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom new file mode 100644 index 0000000000..54cf647b2b --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-a-1.0.pom @@ -0,0 +1,24 @@ + + 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-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom new file mode 100644 index 0000000000..ce001c2f30 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-b-1.0.pom @@ -0,0 +1,17 @@ + + 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-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom new file mode 100644 index 0000000000..da7bc34946 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-c-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t09-c + jar + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom new file mode 100644 index 0000000000..862274728a --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t09/maven-test/poms/t09-d-1.0.pom @@ -0,0 +1,17 @@ + + 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-core/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml b/maven-core/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml new file mode 100644 index 0000000000..ae4358436d --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t09/p0/p1/pom.xml @@ -0,0 +1,36 @@ + + + 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-core/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml b/maven-core/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml new file mode 100644 index 0000000000..4681c2efe8 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t09/p0/p2/pom.xml @@ -0,0 +1,42 @@ + + + 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-core/src/test/resources/inheritance-repo/t09/p0/pom.xml b/maven-core/src/test/resources/inheritance-repo/t09/p0/pom.xml new file mode 100644 index 0000000000..a93746d281 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t09/p0/pom.xml @@ -0,0 +1,38 @@ + + 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-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar b/maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t10/maven-test/jars/t10-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom new file mode 100644 index 0000000000..1fc2a2216a --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-a-1.0.pom @@ -0,0 +1,24 @@ + + 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-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom new file mode 100644 index 0000000000..64b5f97a0c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-b-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t10-b + jar + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom new file mode 100644 index 0000000000..6548ab3006 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t10/maven-test/poms/t10-c-1.0.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + t10-c + jar + 1.0 + \ No newline at end of file diff --git a/maven-core/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml b/maven-core/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml new file mode 100644 index 0000000000..ed82ae1344 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t10/p0/p1/pom.xml @@ -0,0 +1,42 @@ + + + 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-core/src/test/resources/inheritance-repo/t10/p0/pom.xml b/maven-core/src/test/resources/inheritance-repo/t10/p0/pom.xml new file mode 100644 index 0000000000..853af40df2 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t10/p0/pom.xml @@ -0,0 +1,41 @@ + + 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-core/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml b/maven-core/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml new file mode 100644 index 0000000000..e4c79be457 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t11/p0/p1/pom.xml @@ -0,0 +1,16 @@ + + + p0 + maven + 1.0 + + 4.0.0 + maven + p1 + jar + p1 + 1.0 + + scm-url + + diff --git a/maven-core/src/test/resources/inheritance-repo/t11/p0/pom.xml b/maven-core/src/test/resources/inheritance-repo/t11/p0/pom.xml new file mode 100644 index 0000000000..23b07e2c0a --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t11/p0/pom.xml @@ -0,0 +1,27 @@ + + 4.0.0 + maven + p0 + pom + p0 + 1.0 + + Codehaus + + + + + + + + maven + p1 + 1.0 + test + + + + + + + diff --git a/maven-core/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml b/maven-core/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml new file mode 100644 index 0000000000..c97995654e --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml @@ -0,0 +1,29 @@ + + + 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-core/src/test/resources/inheritance-repo/t12/p0/pom.xml b/maven-core/src/test/resources/inheritance-repo/t12/p0/pom.xml new file mode 100644 index 0000000000..54356618b5 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t12/p0/pom.xml @@ -0,0 +1,30 @@ + + 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-core/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom new file mode 100644 index 0000000000..97bf7ccc22 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t12scm/maven/p0/1.0/p0-1.0.pom @@ -0,0 +1,18 @@ + + 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-core/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom b/maven-core/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom new file mode 100644 index 0000000000..e9ddf0d78c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t12scm/maven/p1/1.0/p1-1.0.pom @@ -0,0 +1,11 @@ + + + p0 + maven + 1.0 + ../../pom.xml + + 4.0.0 + p1 + + diff --git a/maven-core/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml b/maven-core/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml new file mode 100644 index 0000000000..e9ddf0d78c --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml @@ -0,0 +1,11 @@ + + + p0 + maven + 1.0 + ../../pom.xml + + 4.0.0 + p1 + + diff --git a/maven-core/src/test/resources/inheritance-repo/t12scm/p0/pom.xml b/maven-core/src/test/resources/inheritance-repo/t12scm/p0/pom.xml new file mode 100644 index 0000000000..97bf7ccc22 --- /dev/null +++ b/maven-core/src/test/resources/inheritance-repo/t12scm/p0/pom.xml @@ -0,0 +1,18 @@ + + 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-core/src/test/resources/local-repo/marker.txt b/maven-core/src/test/resources/local-repo/marker.txt new file mode 100644 index 0000000000..d9bab060dd --- /dev/null +++ b/maven-core/src/test/resources/local-repo/marker.txt @@ -0,0 +1 @@ +this is just a marker file. \ No newline at end of file diff --git a/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar b/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-a-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar b/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-b-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar b/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-c-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar b/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/maven-core/src/test/resources/local-repo/maven-test/jars/maven-test-d-1.0.jar @@ -0,0 +1 @@ +foo diff --git a/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom b/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom new file mode 100644 index 0000000000..6905f6c8de --- /dev/null +++ b/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-a-1.0.pom @@ -0,0 +1,23 @@ + + 4.0.0 + maven-test + maven-test-a + jar + 1.0 + + + central + Fake Maven Central Repository + file://dummy + + + + + maven-test + maven-test-b + 1.0 + jar + compile + + + \ No newline at end of file diff --git a/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom b/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom new file mode 100644 index 0000000000..e814951a0d --- /dev/null +++ b/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-b-1.0.pom @@ -0,0 +1,23 @@ + + 4.0.0 + maven-test + maven-test-b + jar + 1.0 + + + maven-test + maven-test-c + 1.0 + jar + compile + + + maven-test + maven-test-d + 1.1 + jar + compile + + + \ No newline at end of file diff --git a/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom b/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom new file mode 100644 index 0000000000..4631b88f3c --- /dev/null +++ b/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-c-1.0.pom @@ -0,0 +1,16 @@ + + 4.0.0 + maven-test + maven-test-c + jar + 1.0 + + + maven-test + maven-test-d + 1.2 + jar + compile + + + \ No newline at end of file diff --git a/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom b/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom new file mode 100644 index 0000000000..6e22f6083e --- /dev/null +++ b/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.1.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + maven-test-d + jar + 1.1 + \ No newline at end of file diff --git a/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom b/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom new file mode 100644 index 0000000000..6e22f6083e --- /dev/null +++ b/maven-core/src/test/resources/local-repo/maven-test/poms/maven-test-d-1.2.pom @@ -0,0 +1,7 @@ + + 4.0.0 + maven-test + maven-test-d + jar + 1.1 + \ No newline at end of file diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar b/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar new file mode 100644 index 0000000000..c2c027fec1 --- /dev/null +++ b/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar @@ -0,0 +1 @@ +local \ No newline at end of file diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version b/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version new file mode 100644 index 0000000000..09f9180ff2 --- /dev/null +++ b/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-a-1.0-SNAPSHOT.jar.snapshot-version @@ -0,0 +1 @@ +20040101.101010 \ No newline at end of file diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar b/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar new file mode 100644 index 0000000000..c2c027fec1 --- /dev/null +++ b/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar @@ -0,0 +1 @@ +local \ No newline at end of file diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version b/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version new file mode 100644 index 0000000000..09f9180ff2 --- /dev/null +++ b/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-b-1.0-SNAPSHOT.jar.snapshot-version @@ -0,0 +1 @@ +20040101.101010 \ No newline at end of file diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar b/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar new file mode 100644 index 0000000000..c2c027fec1 --- /dev/null +++ b/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar @@ -0,0 +1 @@ +local \ No newline at end of file diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version b/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version new file mode 100644 index 0000000000..09f9180ff2 --- /dev/null +++ b/maven-core/src/test/resources/local-repo/snapshot-test/jars/maven-snapshot-e-1.0-SNAPSHOT.jar.snapshot-version @@ -0,0 +1 @@ +20040101.101010 \ No newline at end of file diff --git a/maven-core/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom b/maven-core/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom new file mode 100644 index 0000000000..64a075f4e9 --- /dev/null +++ b/maven-core/src/test/resources/local-repo/snapshot-test/poms/maven-test-snapshot-resolving-1.0.pom @@ -0,0 +1,49 @@ + + snapshot-test + maven-test-snapshot-resolving + jar + + + central + Fake Maven Central Repository + file://dummy + + + + + snapshot-test + maven-snapshot-a + 1.0-SNAPSHOT + jar + compile + + + snapshot-test + maven-snapshot-b + 1.0-SNAPSHOT + jar + compile + + + snapshot-test + maven-snapshot-c + 1.0-SNAPSHOT + jar + compile + + + snapshot-test + maven-snapshot-d + 1.0-SNAPSHOT + jar + compile + + + snapshot-test + maven-snapshot-e + 1.0-SNAPSHOT + jar + compile + + + \ No newline at end of file diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml new file mode 100644 index 0000000000..45dc77d2a9 --- /dev/null +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromFile/pom.xml @@ -0,0 +1,8 @@ + + 4.0.0 + + org.apache.maven.tests + build-from-file + 1 + + \ No newline at end of file diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom new file mode 100644 index 0000000000..d42117656a --- /dev/null +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom @@ -0,0 +1,8 @@ + + 4.0.0 + + tests + project-caching + 1 + + \ No newline at end of file diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/maven-metadata-local.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/maven-metadata-local.xml new file mode 100644 index 0000000000..a608b4f81d --- /dev/null +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/maven-metadata-local.xml @@ -0,0 +1,11 @@ + + tests + project-caching + + 1 + 1 + + 1 + + + \ No newline at end of file diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml new file mode 100644 index 0000000000..5c62a787cc --- /dev/null +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildModelLineage/pom.xml @@ -0,0 +1,7 @@ + + 4.0.0 + + tests + build-model-lineage + 1 + \ No newline at end of file diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml new file mode 100644 index 0000000000..5953c32e2f --- /dev/null +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/child/pom.xml @@ -0,0 +1,10 @@ + + 4.0.0 + + tests + childAndParent-parent + 1 + + + childAndParent-child + \ No newline at end of file diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml new file mode 100644 index 0000000000..365ec18388 --- /dev/null +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/childAndParent/pom.xml @@ -0,0 +1,7 @@ + + 4.0.0 + + tests + childAndParent-parent + 1 + \ No newline at end of file diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml new file mode 100644 index 0000000000..e0eec3a2b0 --- /dev/null +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/resolveParentPom/pom.xml @@ -0,0 +1,10 @@ + + 4.0.0 + + tests + resolve-parent-pom-parent + 1 + + + resolve-parent-pom + \ No newline at end of file diff --git a/maven-core/src/test/resources/project-dynamism/plugin-level-dep.pom.xml b/maven-core/src/test/resources/project-dynamism/plugin-level-dep.pom.xml new file mode 100644 index 0000000000..988736751a --- /dev/null +++ b/maven-core/src/test/resources/project-dynamism/plugin-level-dep.pom.xml @@ -0,0 +1,24 @@ + + 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-core/src/test/resources/project-dynamism/pom-interp.xml b/maven-core/src/test/resources/project-dynamism/pom-interp.xml new file mode 100644 index 0000000000..2ad098aab3 --- /dev/null +++ b/maven-core/src/test/resources/project-dynamism/pom-interp.xml @@ -0,0 +1,28 @@ + + + + 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-core/src/test/resources/project-dynamism/pom-relative.xml b/maven-core/src/test/resources/project-dynamism/pom-relative.xml new file mode 100644 index 0000000000..a24aebe68e --- /dev/null +++ b/maven-core/src/test/resources/project-dynamism/pom-relative.xml @@ -0,0 +1,36 @@ + + + + 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-core/src/test/resources/project-dynamism/pom.xml b/maven-core/src/test/resources/project-dynamism/pom.xml new file mode 100644 index 0000000000..02bbed08f0 --- /dev/null +++ b/maven-core/src/test/resources/project-dynamism/pom.xml @@ -0,0 +1,36 @@ + + + + 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-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml b/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml new file mode 100644 index 0000000000..ee2207ee4e --- /dev/null +++ b/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment-child.xml @@ -0,0 +1,33 @@ + + + + + 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-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml b/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml new file mode 100644 index 0000000000..cefbcb0417 --- /dev/null +++ b/maven-core/src/test/resources/projects/base-directory-alignment/project-which-needs-directory-alignment.xml @@ -0,0 +1,135 @@ + + + + + + 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-core/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml b/maven-core/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml new file mode 100644 index 0000000000..68775efc56 --- /dev/null +++ b/maven-core/src/test/resources/projects/base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml @@ -0,0 +1,29 @@ + + + + + ../project-which-needs-directory-alignment.xml + + + maven + project-which-needs-directory-alignment + 1.0-beta-9 + + diff --git a/maven-core/src/test/resources/projects/build-path-expression-pom.xml b/maven-core/src/test/resources/projects/build-path-expression-pom.xml new file mode 100644 index 0000000000..d7e296f483 --- /dev/null +++ b/maven-core/src/test/resources/projects/build-path-expression-pom.xml @@ -0,0 +1,14 @@ + + 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-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml b/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml new file mode 100644 index 0000000000..9cbbd12df8 --- /dev/null +++ b/maven-core/src/test/resources/projects/duplicate-plugins-merged-pom.xml @@ -0,0 +1,32 @@ + + 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-core/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml b/maven-core/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml new file mode 100644 index 0000000000..56bed2c938 --- /dev/null +++ b/maven-core/src/test/resources/projects/grandchild-check/child/grandchild/pom.xml @@ -0,0 +1,10 @@ + + 4.0.0 + + grandchildtest + child + 1 + + grandchild + + diff --git a/maven-core/src/test/resources/projects/grandchild-check/child/pom.xml b/maven-core/src/test/resources/projects/grandchild-check/child/pom.xml new file mode 100644 index 0000000000..0858c6d141 --- /dev/null +++ b/maven-core/src/test/resources/projects/grandchild-check/child/pom.xml @@ -0,0 +1,13 @@ + + 4.0.0 + + grandchildtest + root-pom + 1 + + child + pom + + grandchild + + diff --git a/maven-core/src/test/resources/projects/grandchild-check/pom.xml b/maven-core/src/test/resources/projects/grandchild-check/pom.xml new file mode 100644 index 0000000000..3b1ebd0ea8 --- /dev/null +++ b/maven-core/src/test/resources/projects/grandchild-check/pom.xml @@ -0,0 +1,7 @@ + + 4.0.0 + grandchildtest + root-pom + 1 + pom + diff --git a/maven-core/src/test/resources/projects/scope/project-with-scoped-dependencies.xml b/maven-core/src/test/resources/projects/scope/project-with-scoped-dependencies.xml new file mode 100644 index 0000000000..c706250170 --- /dev/null +++ b/maven-core/src/test/resources/projects/scope/project-with-scoped-dependencies.xml @@ -0,0 +1,99 @@ + + + + + + 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-core/src/test/resources/projects/scope/transitive-compile-dep.xml b/maven-core/src/test/resources/projects/scope/transitive-compile-dep.xml new file mode 100644 index 0000000000..0ef804c042 --- /dev/null +++ b/maven-core/src/test/resources/projects/scope/transitive-compile-dep.xml @@ -0,0 +1,56 @@ + + + + + + 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-core/src/test/resources/projects/scope/transitive-default-dep.xml b/maven-core/src/test/resources/projects/scope/transitive-default-dep.xml new file mode 100644 index 0000000000..187016b14b --- /dev/null +++ b/maven-core/src/test/resources/projects/scope/transitive-default-dep.xml @@ -0,0 +1,57 @@ + + + + + + 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-core/src/test/resources/projects/scope/transitive-provided-dep.xml b/maven-core/src/test/resources/projects/scope/transitive-provided-dep.xml new file mode 100644 index 0000000000..f36d00f599 --- /dev/null +++ b/maven-core/src/test/resources/projects/scope/transitive-provided-dep.xml @@ -0,0 +1,56 @@ + + + + + + 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-core/src/test/resources/projects/scope/transitive-runtime-dep.xml b/maven-core/src/test/resources/projects/scope/transitive-runtime-dep.xml new file mode 100644 index 0000000000..2f8b1ab039 --- /dev/null +++ b/maven-core/src/test/resources/projects/scope/transitive-runtime-dep.xml @@ -0,0 +1,57 @@ + + + + + + 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-core/src/test/resources/projects/scope/transitive-test-dep.xml b/maven-core/src/test/resources/projects/scope/transitive-test-dep.xml new file mode 100644 index 0000000000..79b1441247 --- /dev/null +++ b/maven-core/src/test/resources/projects/scope/transitive-test-dep.xml @@ -0,0 +1,57 @@ + + + + + + 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-core/src/test/resources/validation/invalid-aggregator-packaging-pom.xml b/maven-core/src/test/resources/validation/invalid-aggregator-packaging-pom.xml new file mode 100644 index 0000000000..b050b13230 --- /dev/null +++ b/maven-core/src/test/resources/validation/invalid-aggregator-packaging-pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + foo + foo + 99.44 + bleh + + + test-module + + diff --git a/maven-core/src/test/resources/validation/invalid-ids-pom.xml b/maven-core/src/test/resources/validation/invalid-ids-pom.xml new file mode 100644 index 0000000000..bbb8e9c841 --- /dev/null +++ b/maven-core/src/test/resources/validation/invalid-ids-pom.xml @@ -0,0 +1,26 @@ + + + + 4.0.0 + o/a/m + m$-do$ + 99.44 + bleh + diff --git a/maven-core/src/test/resources/validation/missing-1-pom.xml b/maven-core/src/test/resources/validation/missing-1-pom.xml new file mode 100644 index 0000000000..fe297e6e58 --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-1-pom.xml @@ -0,0 +1,21 @@ + + + + diff --git a/maven-core/src/test/resources/validation/missing-artifactId-pom.xml b/maven-core/src/test/resources/validation/missing-artifactId-pom.xml new file mode 100644 index 0000000000..39f0d7bcba --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-artifactId-pom.xml @@ -0,0 +1,25 @@ + + + + 4.0.0 + foo + 99.44 + bleh + diff --git a/maven-core/src/test/resources/validation/missing-dependency-artifactId-pom.xml b/maven-core/src/test/resources/validation/missing-dependency-artifactId-pom.xml new file mode 100644 index 0000000000..3a5b647990 --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-dependency-artifactId-pom.xml @@ -0,0 +1,32 @@ + + + + 4.0.0 + foo + foo + 99.44 + bleh + + + groupId + 1.0 + + + diff --git a/maven-core/src/test/resources/validation/missing-dependency-groupId-pom.xml b/maven-core/src/test/resources/validation/missing-dependency-groupId-pom.xml new file mode 100644 index 0000000000..5799c572cb --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-dependency-groupId-pom.xml @@ -0,0 +1,32 @@ + + + + 4.0.0 + foo + foo + 99.44 + bleh + + + artifactId + 1.0 + + + diff --git a/maven-core/src/test/resources/validation/missing-dependency-mgmt-artifactId-pom.xml b/maven-core/src/test/resources/validation/missing-dependency-mgmt-artifactId-pom.xml new file mode 100644 index 0000000000..e050ef43d8 --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-dependency-mgmt-artifactId-pom.xml @@ -0,0 +1,34 @@ + + + + 4.0.0 + foo + foo + 99.44 + bleh + + + + groupId + version + + + + diff --git a/maven-core/src/test/resources/validation/missing-dependency-mgmt-groupId-pom.xml b/maven-core/src/test/resources/validation/missing-dependency-mgmt-groupId-pom.xml new file mode 100644 index 0000000000..a012d0f5d9 --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-dependency-mgmt-groupId-pom.xml @@ -0,0 +1,34 @@ + + + + 4.0.0 + foo + foo + 99.44 + bleh + + + + artifactId + version + + + + diff --git a/maven-core/src/test/resources/validation/missing-dependency-mgmt-version-pom.xml b/maven-core/src/test/resources/validation/missing-dependency-mgmt-version-pom.xml new file mode 100644 index 0000000000..cc5ff5b3c1 --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-dependency-mgmt-version-pom.xml @@ -0,0 +1,34 @@ + + + + 4.0.0 + foo + foo + 99.44 + bleh + + + + artifactId + groupId + + + + diff --git a/maven-core/src/test/resources/validation/missing-dependency-version-pom.xml b/maven-core/src/test/resources/validation/missing-dependency-version-pom.xml new file mode 100644 index 0000000000..217b036d81 --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-dependency-version-pom.xml @@ -0,0 +1,32 @@ + + + + 4.0.0 + foo + foo + 99.44 + bleh + + + artifactId + groupId + + + diff --git a/maven-core/src/test/resources/validation/missing-groupId-pom.xml b/maven-core/src/test/resources/validation/missing-groupId-pom.xml new file mode 100644 index 0000000000..528b8b6a19 --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-groupId-pom.xml @@ -0,0 +1,25 @@ + + + + 4.0.0 + bar + 99.44 + bleh + diff --git a/maven-core/src/test/resources/validation/missing-modelVersion-pom.xml b/maven-core/src/test/resources/validation/missing-modelVersion-pom.xml new file mode 100644 index 0000000000..f0273d9e60 --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-modelVersion-pom.xml @@ -0,0 +1,25 @@ + + + + foo + foo + 99.44 + bleh + diff --git a/maven-core/src/test/resources/validation/missing-plugin-artifactId-pom.xml b/maven-core/src/test/resources/validation/missing-plugin-artifactId-pom.xml new file mode 100644 index 0000000000..a70205f152 --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-plugin-artifactId-pom.xml @@ -0,0 +1,33 @@ + + + + 4.0.0 + foo + foo + 99.44 + bleh + + + + + + + + diff --git a/maven-core/src/test/resources/validation/missing-report-artifactId-pom.xml b/maven-core/src/test/resources/validation/missing-report-artifactId-pom.xml new file mode 100644 index 0000000000..4cb5649c1d --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-report-artifactId-pom.xml @@ -0,0 +1,33 @@ + + + + 4.0.0 + foo + foo + 99.44 + bleh + + + + + + + + diff --git a/maven-core/src/test/resources/validation/missing-repository-id-pom.xml b/maven-core/src/test/resources/validation/missing-repository-id-pom.xml new file mode 100644 index 0000000000..1d385f2969 --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-repository-id-pom.xml @@ -0,0 +1,36 @@ + + + + 4.0.0 + foo + foo + 99.44 + bleh + + + + + + + + + + + diff --git a/maven-core/src/test/resources/validation/missing-resource-directory-pom.xml b/maven-core/src/test/resources/validation/missing-resource-directory-pom.xml new file mode 100644 index 0000000000..232db095eb --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-resource-directory-pom.xml @@ -0,0 +1,38 @@ + + + + 4.0.0 + foo + foo + 99.44 + bleh + + + + + + + + + + + + + diff --git a/maven-core/src/test/resources/validation/missing-type-pom.xml b/maven-core/src/test/resources/validation/missing-type-pom.xml new file mode 100644 index 0000000000..663e58add5 --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-type-pom.xml @@ -0,0 +1,26 @@ + + + + 4.0.0 + foo + bar + 99.44 + + diff --git a/maven-core/src/test/resources/validation/missing-version-pom.xml b/maven-core/src/test/resources/validation/missing-version-pom.xml new file mode 100644 index 0000000000..2a111f191d --- /dev/null +++ b/maven-core/src/test/resources/validation/missing-version-pom.xml @@ -0,0 +1,25 @@ + + + + 4.0.0 + foo + bar + bleh +