7993 Commits

Author SHA1 Message Date
Britton Isbell
de96ac0502 Fixed NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768365 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 16:49:42 +00:00
Oleg Gusakov
ad1e062754 added UT to test for another broken condition - NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768354 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 16:32:11 +00:00
Britton Isbell
ae4bee951a Fixed to use compile as default scope.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768349 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 16:19:21 +00:00
Oleg Gusakov
11c7032925 changed UT to test for another broken condition - scope
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768344 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 16:06:19 +00:00
Britton Isbell
5988d021d1 Fixed interpolation in maven-mercury.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768140 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 03:18:51 +00:00
Britton Isbell
674acfb0d3 Overwrite scope for dependencies.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768006 13f79535-47bb-0310-9956-ffa450edef68
2009-04-23 18:23:36 +00:00
Oleg Gusakov
5ce3ee0a53 adjusted the usage of -D to be a jvmarg
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@767751 13f79535-47bb-0310-9956-ffa450edef68
2009-04-23 01:07:09 +00:00
Jason van Zyl
5d7758b358 o pull from trunky dunk dunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@767707 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 23:04:06 +00:00
Britton Isbell
034562a96f [MNG-2318] - resolution of parent pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@767640 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 20:03:43 +00:00
Britton Isbell
b401496dca Fix for IT-21. When we had multiple profiles with dependencies would only include dependencies from last profile.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@767633 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 19:39:18 +00:00
Jason van Zyl
822f348c93 o making sure everything is in before merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@767358 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 03:34:00 +00:00
Britton Isbell
fcce49ff78 [MNG-3983, 2068, 836] - the plugin repositories from settings files were not being picked up.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@767327 13f79535-47bb-0310-9956-ffa450edef68
2009-04-21 23:11:40 +00:00
Britton Isbell
f53cbd5fbd [MNG-0731] - The distribution mng layout element was not being copied in the model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@767294 13f79535-47bb-0310-9956-ffa450edef68
2009-04-21 21:09:06 +00:00
Britton Isbell
d470d0c812 [MNG-0051] - This test was broken due to an unrelated issue on plugin management inheritance. Fixed it and added some unit tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@767266 13f79535-47bb-0310-9956-ffa450edef68
2009-04-21 19:49:19 +00:00
Herve Boutemy
07d018d78d renamed tokens used during bootstrap to better understand their role
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@766862 13f79535-47bb-0310-9956-ffa450edef68
2009-04-20 20:43:20 +00:00
Britton Isbell
65ff7cb4e5 Support for specifying pom file on command line. The builder now checks (in order): 1) top-level maven project from config matches build pom parent; 2) relative path pom; 2) repository pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@766833 13f79535-47bb-0310-9956-ffa450edef68
2009-04-20 19:51:57 +00:00
Britton Isbell
94b6e39dcb Added back in pom formatting changes. Just a missed start-end tag.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@766729 13f79535-47bb-0310-9956-ffa450edef68
2009-04-20 15:30:39 +00:00
Britton Isbell
d1c1f30313 Reverting out pom changes. The poms look fine but ant build file is barfing on the comment syntax and mercury bootstrap is not picking up doxia into its classpath. I've branched this to look into the issue.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@766701 13f79535-47bb-0310-9956-ffa450edef68
2009-04-20 14:10:18 +00:00
Herve Boutemy
8a119ce695 reformatted poms according to our conventions (merged from 2.1.x branch r766523)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@766535 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 22:25:38 +00:00
Britton Isbell
8d1be44456 Renamed the maven.project packages to maven.model.*. Broke out processors into subpackage.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@766094 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 17:32:45 +00:00
Britton Isbell
635a30a36f Moved interpolator classes into their own package.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@766088 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 17:16:55 +00:00
Britton Isbell
fa462e6893 Change all references of maven-project-builder to maven-model-builder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@766081 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 16:48:47 +00:00
Britton Isbell
cc52bc3a7a Renamed maven-project-builder to maven-model-builder (more appropriate).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@765807 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 23:50:24 +00:00
Britton Isbell
f117208e6b Moved over the profile code to maven-project-builder. Centralizing more of the model building.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@765802 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 23:41:31 +00:00
Britton Isbell
554927a598 Default interpolator annotated.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@765796 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 22:59:12 +00:00
Britton Isbell
7014f578e9 Moved over interpolation into it's own class.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@765793 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 22:29:52 +00:00
Britton Isbell
57756314e2 Support for build extensions. Updated maven-mercury to use latest project builder code. Dumped all references to model-builder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@765684 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 16:50:46 +00:00
Jason van Zyl
c2c3134b34 o localizing mercury into the mercury repository implementation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@765273 13f79535-47bb-0310-9956-ffa450edef68
2009-04-15 17:24:22 +00:00
Benjamin Bentmann
e203f0c5d3 o Fixed detection of default profiles
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764944 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 20:37:34 +00:00
Benjamin Bentmann
2bc43b618a o Added generics
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764943 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 20:36:38 +00:00
Benjamin Bentmann
c236be0b5a o Fixed basedir alignment
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764913 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 18:23:39 +00:00
Britton Isbell
100a91456b Use model directly for aligning paths.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764846 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 15:50:16 +00:00
Britton Isbell
c4af0fcde1 Moved interpolation package into builder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764788 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 14:25:47 +00:00
Britton Isbell
58886bc0e8 Lazy loading of model input stream.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764661 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 01:50:15 +00:00
Britton Isbell
6db2a155ec Centralized usage of model properties into processor context. Moved usage from domain model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764626 13f79535-47bb-0310-9956-ffa450edef68
2009-04-13 21:43:52 +00:00
Britton Isbell
1c2bb80d5c Perf optimizations through direct use of model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764617 13f79535-47bb-0310-9956-ffa450edef68
2009-04-13 21:28:43 +00:00
Britton Isbell
3650a2c5c8 Removed model-builder dependency.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764582 13f79535-47bb-0310-9956-ffa450edef68
2009-04-13 19:41:38 +00:00
Britton Isbell
ae476bf2fa Moved legacy builder code to maven-mercury. Moved over interpolator code from model-builder to maven-project-builder to reduce the dependencies. Reduce the amount of parsing to and from model properties.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764568 13f79535-47bb-0310-9956-ffa450edef68
2009-04-13 19:14:44 +00:00
Paul Gier
bd45522faf [MNG-3834] Improve missing version error message.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764552 13f79535-47bb-0310-9956-ffa450edef68
2009-04-13 18:35:55 +00:00
Benjamin Bentmann
d3f76d80c0 o Fixed plugin management injection
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764226 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 18:05:46 +00:00
Britton Isbell
e8e1d53e14 Fixed problem where repo count int MavenProject was increasing.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763966 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 16:05:31 +00:00
Oleg Gusakov
3a049c8b5b removing bootstrap debugging option ..
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763460 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 23:25:59 +00:00
Oleg Gusakov
3bdb1951c5 removing bootstrap debugging option ..
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763456 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 23:13:22 +00:00
Oleg Gusakov
a309c4022d switched to mercury-alpha-7-SN dependency to enable managed version maps, the lifecycle UTs pass
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763438 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 22:40:24 +00:00
Oleg Gusakov
419248d61f added a getter to IncludesArtifactFilter to enable interrogation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763378 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 20:29:17 +00:00
Britton Isbell
9a4e614d86 [MNG-1995] - interpolation of boolean values.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763351 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 19:00:11 +00:00
Britton Isbell
15ef04371b [MNG-1957] jdk activation for profiles.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763291 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 15:52:32 +00:00
Britton Isbell
85ad173dba [MNG-1412,4027] - dependency order from profile.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763150 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 09:08:03 +00:00
Britton Isbell
2cb49a84ac [MNG-3843] - inheritance of pom description.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763117 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 06:01:06 +00:00
Oleg Gusakov
9c56369edd intermediate commit to revert lagacy repo system to default status
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763103 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 04:45:36 +00:00