Commit Graph

7331 Commits

Author SHA1 Message Date
Jason van Zyl d0778cc82d o debugging configuration merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771096 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 18:08:54 +00:00
Jason van Zyl 3fad6dd633 o version and configuration of plugin goal being executed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770464 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 22:00:28 +00:00
Jason van Zyl 962586d6a6 o restoring method in model builder, i can't fix them all in old plugins because there are 3.x classes i won't backport
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770460 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 21:53:23 +00:00
Britton Isbell 93cff78fbf Need to override lifecycle plugin versions if there is a pluginMng entry for it.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770454 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 21:32:48 +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
Jason van Zyl 85d0d0d310 o fix signatures of tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770024 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 00:54:26 +00:00
Jason van Zyl 31e849eb5f o pushing in configurations for plugins for shane to check
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770005 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 23:43:08 +00:00
Jason van Zyl d993c66b23 o resolving dependencies of a root artifact is now the job of ... the artifact resolver!
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769969 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 22:22:57 +00:00
Britton Isbell abec748f23 Removed unused methods from ProjectBuilderConfig. Since we collapsed maven-project into maven-core, method not needed.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769957 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 21:52:56 +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
Jason van Zyl c89d8d495b o more notes and waiting for shane to try this with the project builder decoupled
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769910 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 20:20:21 +00:00
Jason van Zyl 06c392092d o remove the project builder from the plugin manager
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769906 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 20:08:15 +00:00
Jason van Zyl b18a2fe51f o the repository builder checks for the existence of that field but will fail gracefully
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769904 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 20:01:56 +00:00
Britton Isbell a630ff99e2 Added in LifecycleExecutor to DefaultMavenProjectBuilder. This cause cyclical component dep.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769896 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 19:44:52 +00:00
Jason van Zyl 7c9cdbc071 o remove unrequired code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769877 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 19:03:24 +00:00
Jason van Zyl 942b1a3dc6 git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769869 13f79535-47bb-0310-9956-ffa450edef68 2009-04-29 18:40:45 +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
Jason van Zyl 0d5dc4b4a3 o comment out plugin configuration merging code, this should all be handled by the pom builder now. none of this can happen in the plugin manager as its responsibility is purely executing plugins for the framework
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769860 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 18:06:28 +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
Jason van Zyl 10317e7c7c o remove completed todos
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769858 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 18:00:57 +00:00
Jason van Zyl 453c10ac9f o removing some more dead code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769857 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 18:00:15 +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
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