Commit Graph

211 Commits

Author SHA1 Message Date
Jason van Zyl 988566e2a0 o some notes and example configuration for this IT which is now failing due to some changes in 2.1. once this is fixed we can start
pumping out alphas


git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560763 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 17:22:00 +00:00
Jason van Zyl 1f695dbbad fix typo preventing parsing
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560498 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 05:00:49 +00:00
Jason van Zyl c75995fdd7 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560475 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:45:00 +00:00
Jason van Zyl e614615617 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560473 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:38:48 +00:00
Jason van Zyl 536d222b00 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560472 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:35:56 +00:00
Jason van Zyl 0fc51cd85a o remove the <model> element and use the <project> element which is actually valid'
-This line, and those below, will be ignored--

M    resources/it0030/child-hierarchy/project1/pom.xml
M    resources/it0030/child-hierarchy/project2/pom.xml
M    resources/it0030/child-hierarchy/pom.xml
M    resources/it0031/pom.xml
M    resources/it0032/pom.xml
M    resources/it0033/pom.xml
M    resources/it0034/pom.xml
M    resources/it0035/pom.xml
M    resources/it0036/release-pom.xml
M    resources/it0036/pom.xml
M    resources/it0037/pom.xml
M    resources/it0037/pom2.xml


git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560469 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:31:04 +00:00
Jason van Zyl e99be78565 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560467 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:26:10 +00:00
Jason van Zyl f27caf00ff o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560466 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:25:54 +00:00
Jason van Zyl cec284138d o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560465 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:25:47 +00:00
Jason van Zyl 3fda26ba0e o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560464 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:25:14 +00:00
Jason van Zyl 980d8def2e o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560463 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:24:53 +00:00
Jason van Zyl 774d8a5b0c o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560462 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:24:44 +00:00
Jason van Zyl 84fbe07684 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560461 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:24:37 +00:00
Jason van Zyl ad02b658ca o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560460 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:24:28 +00:00
Jason van Zyl 75bbb3c31d o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560459 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:24:13 +00:00
Jason van Zyl 0d107e60f5 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560458 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:24:06 +00:00
Jason van Zyl 30fe5814b9 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560457 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:23:59 +00:00
Jason van Zyl fdc48549c2 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560456 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:23:52 +00:00
Jason van Zyl b924aa4acd o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560455 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:23:44 +00:00
Jason van Zyl 992f8b0ba6 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560454 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:23:19 +00:00
Jason van Zyl 021f239b7a o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560453 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:23:14 +00:00
Jason van Zyl f9fb49eccf o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560452 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:23:04 +00:00
Jason van Zyl ead720aeeb o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560451 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:22:31 +00:00
Jason van Zyl 496932cbe3 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560450 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:22:23 +00:00
Jason van Zyl db53d7cd95 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560449 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:21:45 +00:00
Jason van Zyl 7dbec9ff45 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560448 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:21:35 +00:00
Jason van Zyl b563a797cb o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560447 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:21:21 +00:00
Jason van Zyl 2abe20a95b o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560446 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:21:10 +00:00
Jason van Zyl 0773b66b82 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560445 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:20:55 +00:00
Jason van Zyl 7aec3fced4 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560444 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:20:45 +00:00
Jason van Zyl 8cb4f242d2 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560443 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:20:33 +00:00
Jason van Zyl c1093066b2 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560442 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:20:00 +00:00
Jason van Zyl d51bcabc77 o remove the <model> element and use the <project> element which is actually valid
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@560441 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 02:19:30 +00:00
Brian E Fox 51d66b92e6 changes to sample to make it generic and self documenting
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@558915 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 02:20:12 +00:00
Brian E Fox 82415445e6 extend maven parent and deploy snapshot for archetype
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@558907 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 01:29:04 +00:00
Jason van Zyl 957ef7b986 o removed by mistake while separating out the base class
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@553516 13f79535-47bb-0310-9956-ffa450edef68
2007-07-05 14:22:38 +00:00
Mark Hobson bb2c64121d o Commented-out unfixed it0123
o Added issue references to it0123 and it0124


git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551841 13f79535-47bb-0310-9956-ffa450edef68
2007-06-29 10:08:22 +00:00
Mark Hobson c7c850d84e [MNG-612] implement conflict resolution techniques
o Added it0125 to verify newest-wins conflict resolver configuration (currently commented-out)


git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551840 13f79535-47bb-0310-9956-ffa450edef68
2007-06-29 10:01:57 +00:00
Jason van Zyl aae6dbf4a3 o helper has been separated and now used in the IT archteype
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551806 13f79535-47bb-0310-9956-ffa450edef68
2007-06-29 06:01:25 +00:00
Jason van Zyl 59ebc673c0 o separation of the base integration test. this can now be used in the IT suite we run and used in the archetype.
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551804 13f79535-47bb-0310-9956-ffa450edef68
2007-06-29 05:55:49 +00:00
Jason van Zyl 26e34411b8 o artifactId = maven-integration-test
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551802 13f79535-47bb-0310-9956-ffa450edef68
2007-06-29 05:35:49 +00:00
Jason van Zyl 1a075924b3 o aptly name the integration test
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551800 13f79535-47bb-0310-9956-ffa450edef68
2007-06-29 05:35:15 +00:00
Jason van Zyl 5419e61f63 o i realize what this is for but any grid attempting to run the integration tests would be updating the sources, having to rebuild the entire JAR for minor corrections to re-execute the suite would be extremely inefficient
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551684 13f79535-47bb-0310-9956-ffa450edef68
2007-06-28 19:49:47 +00:00
Jason van Zyl 582e200d79 o i need Junit for the base integration test class we will export for general use in the archteype
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551683 13f79535-47bb-0310-9956-ffa450edef68
2007-06-28 19:47:19 +00:00
Jason van Zyl 46cc0f0d3f o the suite remains with us
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551681 13f79535-47bb-0310-9956-ffa450edef68
2007-06-28 19:40:45 +00:00
Jason van Zyl 5ea675b943 git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551680 13f79535-47bb-0310-9956-ffa450edef68 2007-06-28 19:40:16 +00:00
Jason van Zyl 9d880a8e8f o the archetype should be generated from the project pushing //!! lines replacing what is below it so that we can still build/test this project while still allowing variable interpolation into the project that will be created from the archteype.
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551679 13f79535-47bb-0310-9956-ffa450edef68
2007-06-28 19:35:09 +00:00
Jason van Zyl 4210f182ed o For a single integration test we can will use the fork once option which is the default
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551675 13f79535-47bb-0310-9956-ffa450edef68
2007-06-28 19:31:23 +00:00
Jason van Zyl ca9ad95695 o the maven it generated should stand on its own
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551663 13f79535-47bb-0310-9956-ffa450edef68
2007-06-28 19:12:30 +00:00
Jason van Zyl da7208d212 o change the artifact id so that the archetype create is maven-it-archetype
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@551657 13f79535-47bb-0310-9956-ffa450edef68
2007-06-28 18:51:31 +00:00