Commit Graph

7903 Commits

Author SHA1 Message Date
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
Jason van Zyl 2fabaa365b o changing signature to say exactly what it's doing
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769849 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 17:35:41 +00:00
Jason van Zyl 38bd51b1a7 o adding lifecycle methods to get the plugin for a packing in all lifecycles, this will interleave with the
project builder which will populate the versions specified in plugin management, and then another method
  will retrieve and populate the default configuration information.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769847 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 17:34:01 +00:00
Jason van Zyl 3412a028c4 o update api, i need the project and local repository for now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769846 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 17:33:05 +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 260db144b1 o formatting and note on where special properties should be injected.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769684 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 06:55:02 +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 a4be625de5 Using props directly for the interpolator.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769675 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 06:21:16 +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 da39be1957 Added in test resources from maven-project.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769664 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 05:20:38 +00:00
Jason van Zyl 54979b07e4 o collapsing maven-project into the core, it is now useless to anyone except maven, the maven-model-builder is now something that can be consumed by the outside world
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769652 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 04:45:20 +00:00
Jason van Zyl 3dea8abfb3 o expose method
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769642 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 03:59:10 +00:00
Jason van Zyl 6d229c8e46 o giving shane a handle on how to grab default plugin information as i've removed all the diddling in the plugin manager itself
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769637 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 03:45:42 +00:00
Jason van Zyl e59d107cf1 o adding exception handling code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769609 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 01:19:19 +00:00
Jason van Zyl d78af4efbe o start of reporting so i can track every last problem
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769585 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 23:13:42 +00:00
Jason van Zyl 0127ba0c14 o exception isn't stored yet
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769582 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 23:10:34 +00:00
Jason van Zyl 49c287754d o pushing my changes back in with shane's
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769580 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 23:04:24 +00:00
Britton Isbell c0d28d2ce4 Verify that plugin has version as precondition in PluginManager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769560 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 21:52:43 +00:00
Britton Isbell d2bbf510f9 Param check in artifact utils.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769557 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 21:46:43 +00:00
Britton Isbell 14b3573e79 Compile exceptions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769552 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 21:34:36 +00:00
Jason van Zyl 00316c6362 o updating test to match
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769548 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 21:20:49 +00:00
Jason van Zyl 6bca21c4f8 o adding in all plugins in all the default lifecycles
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769547 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 21:20:36 +00:00
Britton Isbell d8e77e29b8 Removed references to MavenProject.injectPlugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769467 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 17:09:36 +00:00
Jason van Zyl 1c94e8f911 o take away the merging and leave that to the builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769465 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 17:04:19 +00:00
Jason van Zyl d253679e62 o removing all configuration manipulation as that should be handled by the project builder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769457 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 16:50:23 +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 93e27192b7 o adding method to get a list of plugins that correspond to a lifecycle for configuration merging by the builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769214 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 00:48:53 +00:00
Jason van Zyl e10d95d4e1 o starting the simplification of the error reporting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769193 13f79535-47bb-0310-9956-ffa450edef68
2009-04-27 22:38:19 +00:00
Jason van Zyl a0c50f8554 o restore start time
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769183 13f79535-47bb-0310-9956-ffa450edef68
2009-04-27 22:06:47 +00:00
Britton Isbell bbf61a46f8 Check to see if it is pom before parse.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769177 13f79535-47bb-0310-9956-ffa450edef68
2009-04-27 21:50:00 +00:00
Jason van Zyl 54d0418185 o push in changes to sync up with shane
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769031 13f79535-47bb-0310-9956-ffa450edef68
2009-04-27 15:43:01 +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 10243bb3da git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768839 13f79535-47bb-0310-9956-ffa450edef68 2009-04-27 00:16:42 +00:00
Jason van Zyl aafe040406 git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@768839 13f79535-47bb-0310-9956-ffa450edef68 2009-04-27 00:16:42 +00:00
Jason van Zyl a14dd02e93 o more meshing of trunk and my branch, two tests that are out of sync
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@768832 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 23:51:09 +00:00
Benjamin Bentmann 9bab498a93 o Updated bootstrap due to r768764
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768823 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 22:47:12 +00:00
Jason van Zyl ff4254b879 o jxpath is not needed except for testing in my branch which i will merge shortly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768820 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 22:41:53 +00:00
Jason van Zyl ee101ae58a o remove the plugin manager that required mercury and i'll use the repository system inside maven for new, keep more of the features that creeped in out
o try and remove all traces of mercury and keep them in a branch


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768813 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 22:18:28 +00:00
Herve Boutemy a969cf5316 fixed a typo (merged from 2.1.x branch r768796)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768798 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 21:20:36 +00:00
Herve Boutemy add45acf1e added links to model documentation (merged from 2.1.x branch r768778)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768784 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 20:56:38 +00:00
Jason van Zyl 74845ae89d o git rid of .cd directory, auto provisioning is a feature not discussed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768770 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 20:32:43 +00:00
Herve Boutemy 84e11dcaa2 renamed toolchains Modello descriptor to toolchains.mdo (merged from 2.1.x branch r768762)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768764 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 20:03:30 +00:00
Herve Boutemy 921b31bbdb fixed typos (merged from 2.1.x branch r768751)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768755 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 19:31:44 +00:00
Jason van Zyl a99b21cd78 o remove mercury modules from the parent pom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768753 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 19:31:02 +00:00
Jason van Zyl fd5894dda1 o mercury will be pursued entirely on a branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@768752 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 19:30:15 +00:00