865 Commits

Author SHA1 Message Date
Britton Isbell
93ec09c8a5 MNG-4010: Remove duplicate dependency exclusions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738256 13f79535-47bb-0310-9956-ffa450edef68
2009-01-27 21:48:22 +00:00
Benjamin Bentmann
5888994149 [MNG-3853] [regression] Distribution Management injected by profile is not reflected by MavenProject
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738128 13f79535-47bb-0310-9956-ffa450edef68
2009-01-27 16:18:32 +00:00
Benjamin Bentmann
3e6bc31a03 [MNG-4008] [regression] Build filters are collapsed
o Created UT from IT
o Started attempt to fix but apparently #set isn't enough to get the merging right

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738088 13f79535-47bb-0310-9956-ffa450edef68
2009-01-27 13:32:47 +00:00
Benjamin Bentmann
ea2773c5eb [MNG-4007] [regression] Effective model contains paths with non-normalized file separators
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738074 13f79535-47bb-0310-9956-ffa450edef68
2009-01-27 12:39:03 +00:00
Benjamin Bentmann
eb08946492 [MNG-4003] Failed Unit Test on Building Plexus Velocity Component
o Added UT

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737894 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 22:11:15 +00:00
Britton Isbell
d93227ad4a Plugin order unit test.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737813 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 20:23:15 +00:00
Britton Isbell
702ed0b0dd Fixed various ordering of element problems during plugin management joins.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737812 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 20:22:20 +00:00
Britton Isbell
1c2b979977 MNG-3887: order of plugin executions, MNG-3864: plugin configs are collapsed, MNG-4000: Plugin executions without id are lost
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737633 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 03:29:07 +00:00
Britton Isbell
379f614660 Fixed regression on MNG-3821. Should not add any subcontainers to the Model Container Info list, which is the one that the ModelTransformerContext uses. This will match ids for subcontainers from different parent containers.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737622 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 01:40:40 +00:00
Britton Isbell
dc27facb7e Updated unit tests with assertions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737619 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 01:23:25 +00:00
Benjamin Bentmann
46ca604411 o Created UT for MNG-4000
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737172 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 20:11:45 +00:00
Britton Isbell
2d5cb58fe9 MNG-3998: Loss of execution configuration. MNG-3886: Goals order.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737156 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 19:24:27 +00:00
Benjamin Bentmann
8bc517009b o Created UT for MNG-2591
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737078 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 16:44:14 +00:00
Benjamin Bentmann
67c93459cc o Created UT for MNG-3836
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737071 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 16:28:48 +00:00
Benjamin Bentmann
2e4285f616 o Created UT for MNG-3864
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737066 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 16:06:37 +00:00
Benjamin Bentmann
04a020ea5a o Created UT for MNG-3827
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737056 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 15:35:43 +00:00
Britton Isbell
34aceea2eb Added #set to URI configurations. Fixed problem where execution rule was joining all collections, not just goals.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736578 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 06:53:25 +00:00
Britton Isbell
496d8ffcb4 MNG-3997: If one ModelProperty property URI starts with another ModelProperty URI and both are empty and both are consecutive in the pom, then the first tag was not being closed on unmarshalling to XML.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736541 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 03:18:20 +00:00
Britton Isbell
15f10579d7 Fix: MNG-3965
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736386 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 19:31:48 +00:00
Britton Isbell
01e602351c Unit test for MNG-3965
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736373 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 18:53:00 +00:00
Britton Isbell
b77af2e2e6 MNG-3985
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736294 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 11:58:50 +00:00
Britton Isbell
68d8ce9d34 MNG-3979.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736252 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 07:35:33 +00:00
Britton Isbell
04833ce768 MNG-3984
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736236 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 06:20:34 +00:00
Britton Isbell
036d5932e1 MNG-3937 - goals inheritance.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736233 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 05:58:52 +00:00
Benjamin Bentmann
27d2e3c058 [MNG-2605] Profiles in profiles.xml are active by default
o Merged from r734803

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@734810 13f79535-47bb-0310-9956-ffa450edef68
2009-01-15 20:30:50 +00:00
Benjamin Bentmann
62e2d40504 [MNG-3988] [regression] Profiles.xml is not processed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@734142 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 14:33:39 +00:00
Britton Isbell
192af339c6 Final fix for the problem where snapshot plugin repositories from external profiles were not being used. Added code for setting remote repos to MavenProject, after profile injection.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733655 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 09:02:50 +00:00
Britton Isbell
9c67a22ddc Profile Injector was missing injecting of plugin repositories from settings file. Fixes this.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733648 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 08:22:15 +00:00
Britton Isbell
a457427433 Fix: Different types of ID Model containers were being joined if their ids matched. Now we have one ID model container factory instance per type.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733637 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 07:00:09 +00:00
Benjamin Bentmann
8e3adc631c o Created UT for MNG-3979
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733262 13f79535-47bb-0310-9956-ffa450edef68
2009-01-10 10:46:00 +00:00
Britton Isbell
e3bde472f9 Fix: MNG-3978
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733133 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 19:44:19 +00:00
Britton Isbell
647a0112cc Fix: MNG-3943
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733036 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 13:42:37 +00:00
Jason van Zyl
fe6d32bd6c MNG-3961: reverted the addition and we'll deal with this later properly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732936 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 06:06:32 +00:00
Jason van Zyl
cfbcba22a8 MNG-3586: system scope is working again, the IT does not appear to work on OS/X. Both 2.0.9 and this snapshot fail the first test of the IT. Brian helped me verify and on Windows with 2.0.9 and this snapshot both tests pass.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732929 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 05:34:14 +00:00
Britton Isbell
c4782c4a38 Fix: 3944 - we can just use the existence of the project directory to determine whether it is in the build. This will be a contract of the setProjectDirectory method
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732683 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 11:12:11 +00:00
Britton Isbell
f3c978e962 Fix: MNG-3938
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732344 13f79535-47bb-0310-9956-ffa450edef68
2009-01-07 14:03:06 +00:00
Jason van Zyl
481cde5756 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731333 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:28 +00:00
Jason van Zyl
6991c79e34 [maven-release-plugin] prepare release maven-3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731331 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:05 +00:00
Jason van Zyl
cc38a455f7 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731271 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:29:07 +00:00
Jason van Zyl
bab3480d4b [maven-release-plugin] prepare release 3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731269 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:28:42 +00:00
Benjamin Bentmann
970065b4bd [MNG-3424] Respect ordering of elements as given in POM
o Merged from r708871

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730079 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 09:33:02 +00:00
Britton Isbell
269c07916e Removing final from class. Tycho has a case where it needs to extend.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729996 13f79535-47bb-0310-9956-ffa450edef68
2008-12-29 21:04:50 +00:00
Benjamin Bentmann
da66dd9fd4 [MNG-3933] Profiles.xml does not pickup OS family
Submitted by: Pawel Paprota

o Merged from r729785

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729787 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 22:09:20 +00:00
Benjamin Bentmann
d639132f0b o Fixed file checks
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729517 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 17:55:13 +00:00
Benjamin Bentmann
4cc361f4ff o Created UT from MNG-3944
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729514 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 17:22:22 +00:00
Benjamin Bentmann
8d845eaa55 o Created UT from MNG-3822
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729511 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 16:56:31 +00:00
Benjamin Bentmann
fd68f59250 o Created UT from MNG-3831
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729508 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 16:48:36 +00:00
Benjamin Bentmann
85cf2d029e o Created UT from MNG-3833
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729507 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 16:40:57 +00:00
Benjamin Bentmann
be34e915c8 o Created UT from MNG-3839
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729506 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 16:32:30 +00:00
Benjamin Bentmann
abc85c68f4 o Created UT from MNG-3845
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729505 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 16:24:20 +00:00