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

474 Commits

Author SHA1 Message Date
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 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
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
Britton Isbell 383a8b006a Plugin was picking up default plugin groupId, which was causing resolve of plugins to fail. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770433 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-30 20:26:13 +00:00
Britton Isbell 12ffdd1277 Fixes for merging in plugin config. Needed to do copy of plugins and config. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770395 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-30 18:55:26 +00:00
Jason van Zyl 36e43b2951 o cleaning up project builder, removed signatures that i've corrected in the RR plugin, moved properties injection up to the main Maven component 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770390 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-30 18:49:42 +00:00
Britton Isbell 01f79cf31a Cleanup of unused methods. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769953 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-29 21:46:24 +00:00
Britton Isbell 612db0a8af Moved interp tag to private class (small and only used one place). Added final to fields in ProjectUri. Since this is only used by DefaultInterpolator, don't care if values are inlined during compile 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769945 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-29 21:30:16 +00:00
Britton Isbell c0306a2ef4 Checking in work on populating plugins configs. Some problem with finding wagon for http protocol is causing build to fail. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769934 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-29 21:10:03 +00:00
Britton Isbell f27610741f Removed unneeded class. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769868 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-29 18:39:20 +00:00
Britton Isbell 16fc5b6fd3 Moved the PomInterpolatorTag and Interpolator classes to package scope. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769859 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-29 18:04:44 +00:00
Britton Isbell 5a7ab7d748 Removed uses of interpolator property from the profiles. This was more of a convenience since InterpolatorProperty was used in multiple places. Not needed anymore. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769856 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-29 17:59:09 +00:00
Britton Isbell 440b268447 Removed more references to ProjectUri. This is now an internal class in the interpolator package. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769841 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-29 17:20:47 +00:00
Britton Isbell a6d2ac847a Having a DomainModel interface doesn't makes sense in the current context. We no longer have general transforms. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769836 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-29 17:12:08 +00:00
Britton Isbell baf09a4148 Cleanup of interpolator, removing references to PomClassicDomainModel, these aren't needed anymore. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769827 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-29 17:00:17 +00:00
Jason van Zyl be02d72fe6 o only one used interpolator method now, and it's generalized to taking the model and passing in properties so we can make different implementations 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769682 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-29 06:52:50 +00:00
Britton Isbell ae9248e642 Interpolator with properties in method sig. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769666 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-29 05:25:45 +00:00
Britton Isbell 7d85e92007 Removed hard-coding of plugins. Plugins come into builder with default configs. Need to null these out so that pluginMng will be applied. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769456 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-28 16:50:21 +00:00
Britton Isbell cb51cfc270 Removed hard-coding of plugins. Plugins come into builder with default configs. Need to null these out so that pluginMng will be applied. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769453 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-28 16:31:56 +00:00
Britton Isbell 850b047c6d Disabled UTs in maven-project. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769237 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-28 04:40:54 +00:00
Britton Isbell c3715849bf Default plugins. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769235 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-28 04:12:32 +00:00
Jason van Zyl 2805dee2cf o trying to merge manually 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@768842 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-27 00:43:53 +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