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 |
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 |