Commit Graph

1437 Commits

Author SHA1 Message Date
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 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
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 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
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
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
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
Benjamin Bentmann 7a19b6bd5a [MNG-3714] Allow specification of the toolchains.xml location on the command line
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@761401 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 19:43:55 +00:00
Britton Isbell e2b3bace10 [MNG-4107] ser settings can't override properties used for POM interpolation. Cleaned up the interpolation code and the MavenProjectBuilder impl. Building and interpolation is now more clearly separated.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@761104 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 23:05:27 +00:00
Britton Isbell 8e004afe5f Fixed settings profile activation for maven plugins. Cleaned up project builder. Unit Tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@760635 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 21:07:56 +00:00
Britton Isbell 5233029d4e Test for setting profile properties.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@760229 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 23:07:33 +00:00
Britton Isbell 8a31c1a381 Setup test classes for testing of pom construction with settings. Tried to use test-jar type to reuse classes but the causes some lost dependencies in eclipse. Just duping classes for now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@760207 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 22:33:11 +00:00
Benjamin Bentmann aded054d76 [MNG-2387] <active> on <proxy> in settings is misleading
o Merged from r747683

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@759552 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 19:02:38 +00:00
Britton Isbell cf12c1ad52 Added support for hierarchical model inheritance.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@755131 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 06:21:01 +00:00
Benjamin Bentmann 5282fec65d o Fixed resolution of plugin metaversions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@754731 13f79535-47bb-0310-9956-ffa450edef68
2009-03-15 19:28:37 +00:00
Benjamin Bentmann 35c1ff3f4c [MNG-4078] [regression] Plugin metaversion RELEASE no longer resolved
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@753309 13f79535-47bb-0310-9956-ffa450edef68
2009-03-13 16:12:29 +00:00
Benjamin Bentmann 3b26d6bfa6 o Propagated execution id
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@752188 13f79535-47bb-0310-9956-ffa450edef68
2009-03-10 17:51:07 +00:00
Benjamin Bentmann e13ca66b7b o Fixed resolution of system-scope plugin dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@752094 13f79535-47bb-0310-9956-ffa450edef68
2009-03-10 12:40:02 +00:00
Jason van Zyl b68c9f9231 o shortening the interface name for the repository system
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@751196 13f79535-47bb-0310-9956-ffa450edef68
2009-03-07 05:08:43 +00:00
Jason van Zyl 30e6002f40 o push out the artifact repository creation when it's requested in the project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@751159 13f79535-47bb-0310-9956-ffa450edef68
2009-03-07 01:05:17 +00:00
Jason van Zyl 410e6cab4b o reducing the signature size of the repository system some more
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@751104 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 22:14:08 +00:00
Jason van Zyl c04ee12962 o notes for oleg about what's left to remove from the repository interface
o more cleanup 


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@751091 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 21:54:23 +00:00
Jason van Zyl c67176f502 o remove another set of methods from the repository system interface and now ResolutionGroup is gone from Maven internals.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@751083 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 21:37:07 +00:00
Benjamin Bentmann a3a2e77da3 o Fixed NPE due to uninitialized field
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@751046 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 19:30:22 +00:00
Jason van Zyl 5678f17198 o nuke another big chunk of the old code, looking for available versions is used internally and once all the methods are shed we'll supply a pure metadata resolution for clients, like IDEs, that need to nicely show versions. we'll also provide a graph too so people aren't going to have to do all the extra crap to get decent information.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@751036 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 18:57:41 +00:00
Jason van Zyl c586c81065 o remove the build planner from visibility
o fix a method in the project builder to protect against an error coming from the remote resources plugin, it's asking to resolve a POM from a JAR artifact and the old project building code was doing that for whatever not-right reason


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@751021 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 18:20:52 +00:00
Jason van Zyl 1720377f1d o don't need the component descriptor for the PluginRepository as it doesn't exist anymore
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750775 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 05:48:49 +00:00
Jason van Zyl 1ffdc9286a o start the grand plugin refactoring, just putting it all together in addition to putting all the repository/artifact calls
behind the repository system you can see project and plugins being processed an incredible number of times and the recursion
  in the collector is broken causing POMs for plugins to be processed hundreds of times. The bootstrap under profiling reveals
  the xpp3 parser being used almost 30k times which is pure insanity.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750774 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 05:38:48 +00:00
Jason van Zyl b9f9244f5f o fixed mirror code
o more plugin manager wrangling


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750568 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 19:59:06 +00:00
Benjamin Bentmann 650ca3978a o Added debug logging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750493 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 16:19:21 +00:00
Jason van Zyl 4f5efdb3de o get rid of extraneous logging bits
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750395 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 09:15:48 +00:00
Jason van Zyl 7d14e6b520 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750361 13f79535-47bb-0310-9956-ffa450edef68 2009-03-05 07:54:36 +00:00
Jason van Zyl 04998877df git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750354 13f79535-47bb-0310-9956-ffa450edef68 2009-03-05 07:35:00 +00:00
Jason van Zyl 3a2b747af0 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750351 13f79535-47bb-0310-9956-ffa450edef68 2009-03-05 07:19:44 +00:00
Jason van Zyl 3efeef0d89 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750346 13f79535-47bb-0310-9956-ffa450edef68 2009-03-05 07:11:59 +00:00
Jason van Zyl 8e7e771f81 o more plugin manager refactoring
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750343 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 06:56:41 +00:00
Jason van Zyl 74b14a5953 o use the custom settings for now
o pushing everything related to the plugin manager into one package in preparation for replacement with the plexus plugin manager


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750308 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 04:02:23 +00:00
Jason van Zyl 1a05bdac38 o use the repositories passed into the request
o make sure that mirrors are processed correctly in that the mirror that is defined must use the layout and policies of the repository it is mirroring


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750251 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 00:15:56 +00:00
Jason van Zyl 83720e04ca o use the remote repos processed by the request
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750152 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 20:53:37 +00:00
Britton Isbell b746b13a69 Removed report method.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750149 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 20:45:05 +00:00
Britton Isbell 4af4093d4c Remove dup code for profile creation.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750144 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 20:33:54 +00:00
Benjamin Bentmann 96c06c4f1b o Added back some code to actually throw exceptions and abort the normal control flow in case artifact resolution fails
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750029 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 14:51:24 +00:00
Benjamin Bentmann 374ef3a15b o Fixed resolution of project dependencies for plugin execution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749974 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 12:12:45 +00:00
Jason van Zyl beedf0cf7b o restore profile manager location so that the site plugin works ...
o teach the resolution to understand when the root is local with a file present versus retrieving the root as well          


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749924 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 06:58:09 +00:00
Jason van Zyl 3d883f3a9f o inject the logger
o formatting

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749825 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 23:07:51 +00:00