985 Commits

Author SHA1 Message Date
Benjamin Bentmann
fac6b97faf o Generified model/project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744572 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 21:49:23 +00:00
Benjamin Bentmann
90e6b3ecb8 [MNG-4034] dependency version is not inherited from parent dependencyManagement
o Added UT

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744254 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 21:47:45 +00:00
Britton Isbell
9863957196 [MNG-3862] Remove all plugin configuration manipulation from the plugin manager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743225 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 04:56:35 +00:00
Benjamin Bentmann
c303c49d71 [MNG-4027] [regression] Injection of dependencies from profiles crashes project builder
o Added UT

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743083 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 20:20:47 +00:00
Britton Isbell
6032251645 Fixed path problem on unit test.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742760 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 22:00:52 +00:00
Jason van Zyl
1b36ff52dd o last bit i need to in trunk before merging to my branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742684 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 19:16:02 +00:00
Britton Isbell
778f044ed9 [MNG-2174] Profile bug dealing with dependencies : [MNG-3877] Reporting directory base aligned.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742594 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 16:10:48 +00:00
Britton Isbell
2f8742ae19 [MNG-3995] Config property lost
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@741596 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 15:38:08 +00:00
Britton Isbell
247efed735 [MNG-3885] [MNG-4009] : Fixed problem of profile info in parents not being applied.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@741282 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 20:38:37 +00:00
Britton Isbell
a3461e7fb0 [MNG-3803] - System properties in plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@740770 13f79535-47bb-0310-9956-ffa450edef68
2009-02-04 15:33:47 +00:00
Britton Isbell
4267580f46 MNG-4008: Multiple filters.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@740495 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 22:43:53 +00:00
Britton Isbell
5eaab27857 MNG-3976 - Raw Pom Retreival for Mercury.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@740434 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 20:48:07 +00:00
Britton Isbell
adfb3ddeb9 Tests for MNG-1943 - interpolation in parent pom and MNG-3567 - pluginManagement inherited. Added additional methods to maven embedder for querying of plugin configs.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@740395 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 19:50:11 +00:00
Britton Isbell
d1124333ad Merge: sisbell-plugin-manager. MNG-3631 - Get plugin config, including mojo descriptor info.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739970 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 12:02:44 +00:00
Jason van Zyl
ed4f594ac4 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739478 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 01:06:48 +00:00
Jason van Zyl
13fa00ea3f [maven-release-plugin] prepare release maven-3.0-alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739476 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 01:06:37 +00:00
Jason van Zyl
557f0a5373 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738777 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 07:13:04 +00:00
Jason van Zyl
7f54cfff61 [maven-release-plugin] prepare release 3.0-alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738775 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 07:12:48 +00:00
Britton Isbell
650b6775d7 MNG-4013: Identical plugin executions are allowed in pom. This can cause failure in Maven 3 (since there is no longer cloning of maven project) on duplicate attached artifacts.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738374 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 05:44:29 +00:00
Britton Isbell
02c557c132 Minor updates to URI and joins.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738340 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 02:06:27 +00:00
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