1580 Commits

Author SHA1 Message Date
Benjamin Bentmann
06a7b6abec o Updated test setup to account for changed default value
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774061 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 20:18:57 +00:00
Jason van Zyl
5e0dc06c34 o clean up debug in the test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773963 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 16:19:44 +00:00
Jason van Zyl
0b4fc499ed o we only need to setup the hull which holds the mojos per phase to execute, the executions are now constructed properly by the project builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773962 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 16:17:36 +00:00
Jason van Zyl
dd1725b131 o adding components to test wagons
o add method to view supported protocols
o add a note to the test to show the lifecycle plan is getting some repeated elements


git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773926 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 15:08:53 +00:00
Benjamin Bentmann
e6fa6d26b4 o Extended UT to capture MNG-3719 as well
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773870 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 12:48:41 +00:00
Benjamin Bentmann
cff6ab0d02 o Added model normalizer for things like merging duplicate plugin declarations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773869 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 12:40:57 +00:00
Benjamin Bentmann
ea67631690 o Updated test setup
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773856 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 11:08:54 +00:00
Jason van Zyl
55ecfa65d6 o implement the find(Artifact) method in the default local repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773769 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 02:43:26 +00:00
Jason van Zyl
3504931b37 o the newly gutted system bootstraps, i think i'm happy about the state of 3.x now :-)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773740 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 00:35:18 +00:00
Jason van Zyl
096014099e o put the workspace respository impl in earlier so poms can be resolved from the workspace.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773694 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:59:54 +00:00
Benjamin Bentmann
3f08e048a9 o Moved expansion of plugin configuration into component
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773692 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:56:32 +00:00
Jason van Zyl
e3e5cfcf12 o provide a hook or IDE workspace repostiory implementations to insert themselves.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773686 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:51:06 +00:00
Jason van Zyl
e74e31f2a4 o comment out method until working again.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773685 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:50:32 +00:00
Jason van Zyl
0128936e7e o need to implement this method used by the assembly plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773684 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:50:05 +00:00
Jason van Zyl
b8c6c01864 o pushing up the dependency downloading logic into the lifecycle executor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773662 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 19:38:34 +00:00
Jason van Zyl
1379d1dad4 o prepare to bring the project dependency downloading in directly after calculating the build plan
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773646 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 18:32:32 +00:00
Jason van Zyl
4a046065c4 git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773470 13f79535-47bb-0310-9956-ffa450edef68 2009-05-11 05:20:53 +00:00
Jason van Zyl
4446b8dba7 o hack is no longer required to set the project.build.directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773466 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 04:53:55 +00:00
Jason van Zyl
dd16571f67 o maven project cache, integrators can do what they like with project caching
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773460 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 04:42:19 +00:00
Jason van Zyl
4cab749650 o simple plugin classloader cache, i cannot anticipate what client code will need. Igor already proved that it's impossible to generalize for the IDE environment and it's just easier to let IDE folks do what they like.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773457 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 04:10:09 +00:00
Jason van Zyl
3398024a0f o delegating local repository implementation that chains the reactor and user local repository
o removal of more state from the WagonManager and pushing it into the request in an attempt to bridge the way for Mercury



git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773456 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 04:08:29 +00:00
Benjamin Bentmann
a08fffa609 o Decoupled from processor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773422 13f79535-47bb-0310-9956-ffa450edef68
2009-05-10 22:08:50 +00:00
Benjamin Bentmann
4e73077311 o Tweaked API to express in-situ injection of default mojo configuration values
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773411 13f79535-47bb-0310-9956-ffa450edef68
2009-05-10 21:31:02 +00:00
Benjamin Bentmann
f1f44eb281 o Moved injection of default plugin executions defined by lifecycle bindings into dedicated component and decoupled from processors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773402 13f79535-47bb-0310-9956-ffa450edef68
2009-05-10 20:36:21 +00:00
Benjamin Bentmann
e8a45c2ce3 o Fixed scope handling during transitive dependency resolution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773258 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 18:33:08 +00:00
Benjamin Bentmann
7000c68391 o Added some logging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773226 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 14:48:50 +00:00
Benjamin Bentmann
12714fa650 o Excluded POM artifact from dependency artifacts
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773221 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 13:19:11 +00:00
Benjamin Bentmann
2e111caad4 o Excluded POM artifact from dependency artifacts
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773219 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 13:02:06 +00:00
Benjamin Bentmann
2637a1e5d1 o Fixed resolution of project dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773213 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 12:17:06 +00:00
Benjamin Bentmann
8c9c235744 o Fixed profile handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773030 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 15:14:02 +00:00
Benjamin Bentmann
f6401b60b5 o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772964 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 13:10:51 +00:00
Benjamin Bentmann
cb247842f6 o Removed duplicate test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772946 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 11:34:47 +00:00
Jason van Zyl
a73c5abc9c o in the middle of a ReactorArtifactRepository but ben and igor need access so checking in
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772832 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 03:24:55 +00:00
Benjamin Bentmann
51c1cb584c o Re-introduced 2.x like inheritance assembler and profile injector components which mostly delegate to a common model merger class. First of all, the merger only deals with two models at a time, simplifying its logic compared to the current processors, hopefully allowing us to quickly/easily fix the outstanding POM tests. The ultimate goal is to generate the basic ModelMerger automatically with a new Modello plugin which could be programatically customized via a sub class like MavenModelMerger. It will be interesting to find out how much of the merging rules could be generalized via declarative options in the model. This could allow for generated documentation about how inheritance and profile injection alter the model. Last but not least, generating the merger from the MDO would ease addition of new model elements as these would automatically be considered for inheritance and profile injection.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772827 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 01:28:10 +00:00
Jason van Zyl
e4205f145a o starting to collapse the methods in the project builder
o rebuilder the maven metadata source 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772728 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 17:58:15 +00:00
Jason van Zyl
c6a8b20cba o get rid of the reactor manager to make way for a real reactor that can be a local repository implementation which will prevent the pollution in the metadata source for dealing with projects that are in the current build
o clean up the project sorter
o push the information that was in the reactor manager into the session


git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772039 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 03:09:22 +00:00
Jason van Zyl
5d077ce8e5 o slight lifecycle mixup with executions, temporary fix but the bootstrap works
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771991 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 22:22:06 +00:00
Benjamin Bentmann
5ec5c90c89 o Decoupled POM tests from plugin mananger and repository system (these tests were originally written without merging of default configuration in mind)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771971 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 19:18:41 +00:00
Benjamin Bentmann
97d3c99dc8 o Fixed POM to be valid
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771965 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 18:50:45 +00:00
Benjamin Bentmann
2b2b7e19f7 o Added debug dump of entire build plan
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771760 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 14:51:56 +00:00
Jason van Zyl
826881819b o don't filter out the plexus-interpolation
o show the project for which the mojo is executing


git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771751 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 14:41:08 +00:00
Benjamin Bentmann
3659cbd249 o Fixed propagation of POM-level plugin dependencies to the plugin manager
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771481 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 22:41:22 +00:00
Jason van Zyl
6a43c3b683 o disable the tests in the bootstrap so ben and i can go all the way through to the embedder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771334 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 15:32:10 +00:00
Jason van Zyl
0337bdb19c o comment out debug output
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771299 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 13:22:57 +00:00
Benjamin Bentmann
4ff21e67bd o Filtered non-applicable parameters when converting from plugin execution to mojo execution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771298 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 13:16:45 +00:00
Jason van Zyl
bdc2d8c7e3 o taking into account the common case where configuration is specified for many goal in a single configuration element which needs to be accounted for.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771297 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 13:09:06 +00:00
Benjamin Bentmann
c3c878fa94 o Fixed merging of lifecycle plugins that contribute more than one execution
o Fixed conversion of default value for plugin configuration

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771154 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 01:08:40 +00:00
Benjamin Bentmann
4279de6540 o Fixed order of plugin configuration merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771151 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 23:47:56 +00:00
Benjamin Bentmann
ba35f36fbd o Fixed conversion of default value for plugin configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771143 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 23:02:14 +00:00
Jason van Zyl
2f686027a4 o more step by step notes about what the lifecycle executor is doing
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771122 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 20:29:00 +00:00