Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,381 Commits 84 Branches 96 Tags 107 MiB
Commit Graph

7381 Commits

Author SHA1 Message Date
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
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 69e044cd5f o Set svn:eol-style=native 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771959 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-05 18:45:04 +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
Jason van Zyl 91f871a2e5 o changing version of classworld which integrates more of the exports/osgi like classloading 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771711 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-05 13:17:45 +00:00
Benjamin Bentmann 7fcb2f820c o Exposed maven.test.skip as a property of Ant build to more easily switch around 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771668 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-05 11:22:04 +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
Benjamin Bentmann 31061189b0 o Fixed creation of default remote repo (e.g. no snapshots from central) 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771441 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-04 21:05:28 +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
Benjamin Bentmann 9ac26fc3a2 o Restored original default value for enabled flag of repository 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771316 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-04 14:28:27 +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