Commit Graph

7398 Commits

Author SHA1 Message Date
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
Benjamin Bentmann 129bcf0e1d o Extended model merger
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773688 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:53:25 +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 4fdc5512eb o Deleted processors which have been replaced by mergers. To recap, the mergers operate on two instead of three models which reduces complexity. While the mergers are currently not overly beauty either, the plan is to have them generated by Modello via merge rules that would be annotated to the model classes/associations.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773428 13f79535-47bb-0310-9956-ffa450edef68
2009-05-10 22:29:31 +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 f48503a610 o Moved injection of plugin/dependency management into isolated component and decoupled from processors. The new component resembles the ModelDefaultsInjector from 2.x but explicitly focuses on management information. Other defaults like the lifecycle induced plugins should be handled by another component.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773323 13f79535-47bb-0310-9956-ffa450edef68
2009-05-10 10:46:05 +00:00
Benjamin Bentmann 1e303faceb o Changed boolean field to String to enable both filtering and three-valued logic for proper merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773283 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 22:58:36 +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 0c5208ac25 o Fixed merging of plugin executions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773212 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 12:15:26 +00:00
Benjamin Bentmann a5cd3ceb08 o Added boolean accessors for inherited field of plugin execution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773198 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 10:47:59 +00:00
Benjamin Bentmann 4116ac3f0b o Decoupled calculation of child path adjustment from filesystem which would make the effective model depend on the user's environment and breaks with our goal of reproducible builds
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773047 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 17:00:45 +00:00
Benjamin Bentmann d36a4ab8eb o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773031 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 15:19:51 +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 ed79ce0099 o Fixed toString() to not return null
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773023 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 15:02:05 +00:00
Benjamin Bentmann 24cf91d858 o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773019 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 14:58:26 +00:00
Benjamin Bentmann 6e2798f2e9 o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773012 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 14:40:47 +00:00
Benjamin Bentmann 49f72c75e4 o Added some more toString()'s to ease debugging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773011 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 14:35:17 +00:00
Benjamin Bentmann c17cfb0076 o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772980 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 13:31:32 +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
Benjamin Bentmann 6b9ddf7bec o Fixed typo and restored proper default value
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772760 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 20:10:38 +00:00
Benjamin Bentmann 1e26baf0a1 o Changed boolean fiels to String to enable both filtering and three-valued logic for proper merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772758 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 20:06:41 +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 838a1c19b0 o restore the functionality that m2eclipse needs to read projects with dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772675 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 15:20:32 +00:00
Jason van Zyl fbe0e563d8 o make sure jxpath doesn't make it into the distro, it's for testing
o don't need plexus-interactivity in the core


git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772241 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 13:31:00 +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
Benjamin Bentmann 81006b21aa o Migrated from StAX to XPP to have us focus on a single XML parser for now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772013 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 23:31:09 +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