Commit Graph

1862 Commits

Author SHA1 Message Date
Benjamin Bentmann 73f3c915d1 o Decoupled project building request from model building request
o Moved model resolver into model building request

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782223 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 10:38:42 +00:00
Jason van Zyl f4379a47e8 o missing bits of Igor's patch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782059 13f79535-47bb-0310-9956-ffa450edef68
2009-06-05 16:41:07 +00:00
Jason van Zyl 67297ad557 o missing components from the MNG-4041 commit
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782019 13f79535-47bb-0310-9956-ffa450edef68
2009-06-05 14:02:49 +00:00
Jason van Zyl 09f970f178 MNG-4041: maven core returns stale project state during extended use. this is a patch which provides intelligent caching and yields a very substantial performance improvement.
Submitted by: Igor Fedorenko



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782014 13f79535-47bb-0310-9956-ffa450edef68
2009-06-05 13:49:25 +00:00
Jason van Zyl 1c0892fa04 o moved the RuntimeInformation component to the compat package. The maven-eclipse-plugin is currently using it. But for building your own projects the enforcer plugin is more appropriate for making sure the version intended for the project's use is being used.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781202 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 22:53:47 +00:00
Jason van Zyl 77c240c49e o deal with no pom being used for execution correctly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781197 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 22:43:41 +00:00
Benjamin Bentmann 370660ec9a o Fixed handling of project directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781119 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 18:47:33 +00:00
Benjamin Bentmann 753f4897a3 o Restored original behavior of legacy code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781108 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 18:07:47 +00:00
Benjamin Bentmann c8a5c2d89a o Renamed packages for consistency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780763 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 18:06:17 +00:00
Benjamin Bentmann 6548d31804 o Saved raw model in project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780640 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 13:15:46 +00:00
Benjamin Bentmann 26a35db0c7 o Introduced ModelBuilder component that now hosts most of the logic from the project builder to construct the effective model. With maven-model-builder we now should have a rather slim module that tools can re-use for building models. The project builder is simply layered on top of the model builder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780627 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 12:17:53 +00:00
Benjamin Bentmann 67cf84f5c9 o Made model valid
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780612 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 10:59:19 +00:00
Benjamin Bentmann faf4083cb9 o Moved interface for lifecycle injection into model-builder component
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780524 13f79535-47bb-0310-9956-ffa450edef68
2009-05-31 22:45:30 +00:00
Benjamin Bentmann e55c892fe0 o Renamed package
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780523 13f79535-47bb-0310-9956-ffa450edef68
2009-05-31 22:42:47 +00:00
Olivier Lamy 6717764750 stabilized junit
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780507 13f79535-47bb-0310-9956-ffa450edef68
2009-05-31 21:17:33 +00:00
Olivier Lamy 411169c51f stabilized junit
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780376 13f79535-47bb-0310-9956-ffa450edef68
2009-05-31 07:51:50 +00:00
Benjamin Bentmann 1deef1f1d6 o Fixed dependency resolution for direct goal invocations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780244 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 11:24:35 +00:00
Jason van Zyl 4ce879db0a o remove comment only relevant for the project builder version of this test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780179 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 05:26:12 +00:00
Jason van Zyl ac9e467999 o adding equivalents for it0063, they work fine here but i'm not sure yet why the IT is failing. need to take a look at the it resolution plugin to see where the difference is
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780178 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 05:25:30 +00:00
Jason van Zyl 00c2d5486f o forgot to add the file provided by Igor's patch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780177 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 05:10:23 +00:00
Jason van Zyl 1e2b77c10f o make the project dependencies resolver set the project artifacts
o Allow the artifact exlusions to be altered by injecting delegates with knowledge of client systems (m2eclipse)
  Submitted by: Igor Fedorenko



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780176 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 05:05:00 +00:00
Benjamin Bentmann 4d45d00881 o Fixed name inconsistencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780121 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 22:02:34 +00:00
Benjamin Bentmann 85205e0b57 o Switched tests over to use new interface
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780119 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 21:44:35 +00:00
Benjamin Bentmann ae675f8157 o Made ProjectBuilder use ProjectBuildingRequest for naming consistency within API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780115 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 21:28:45 +00:00
Benjamin Bentmann 8c9c57652e o Introduced new interface ProjectBuilder to supercede MavenProjectBuilder and to draw a clearer line between legacy API and new API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780104 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 20:36:55 +00:00
Jason van Zyl e8ff78292b o if compile time deps are not specified maven will now complain
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780103 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 20:36:34 +00:00
Jason van Zyl 0c021975aa o look for the pom first
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780101 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 20:35:37 +00:00
Benjamin Bentmann 73adb2f34f o Deleted useless test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780098 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 20:26:02 +00:00
Jason van Zyl 3a967a0765 o test projects
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780084 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 20:00:15 +00:00
Jason van Zyl 318943638f o adding a metadata cache
Submitted by: Igor Fedorenko


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780080 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 19:22:03 +00:00
Jason van Zyl 192be4ec01 o right now disabling the setting of the classes directory as this is only done in 2.x in the compiler plugin and causes problems with the integration tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780077 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 19:17:10 +00:00
Benjamin Bentmann 7b9854faa4 o Fixed propagation of validation level to model parser
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780062 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 18:37:42 +00:00
Jason van Zyl bc257a588e o fixes for projects which specify plugins that define system scoped plugin override dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@779825 13f79535-47bb-0310-9956-ffa450edef68
2009-05-29 03:34:22 +00:00
Jason van Zyl 101dd8530e o adding in some changes before moving to the trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@779655 13f79535-47bb-0310-9956-ffa450edef68
2009-05-28 16:43:20 +00:00
Benjamin Bentmann 0e34f1958a o Moved tests for model validator into proper module
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@779307 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 20:48:13 +00:00
Benjamin Bentmann 41e54938d5 o Moved model validator into o.a.m.model and moved old impl into compat module
o Added method to validate raw POM

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@779289 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 19:59:17 +00:00
Jason van Zyl ab43fff631 o make a separate project dependencies downloader where the scope and exclusions can be taken into account
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@779283 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 19:45:32 +00:00
Benjamin Bentmann 02eef1ac38 o Added utility method
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778514 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 21:21:10 +00:00
Benjamin Bentmann 1e2d19ab1a o Deleted DomainModel
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778500 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 20:59:59 +00:00
Benjamin Bentmann 3446be4828 o Decoupled project builder from DomainModel, we will directly use the model to keep track of the bits
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778495 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 20:44:38 +00:00
Benjamin Bentmann bbc97f4eb9 o Removed static processor context and move its remaining bits into the project builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778441 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 15:49:43 +00:00
Benjamin Bentmann 0a5b7985f6 [MNG-4173] Remove automatic version resolution for POM plugins
o Strengthended model validator to bark with a nice error message before down stream code bubbles up with ugly exceptions. The new validation step applies only to local builds and not to dependency resolution via the metadata source to accept existing POMs

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778426 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 14:27:46 +00:00
Benjamin Bentmann b16942f162 o Fixed validation to happen ahead of project construction as this depends on proper repository information
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778411 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 12:43:40 +00:00
Benjamin Bentmann dbe356a8e6 o Generified code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778408 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 12:39:30 +00:00
Benjamin Bentmann 9944592242 o Extended model validator to recognize two different validation levels to account for our different needs during local builds and metadata retrieval
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778404 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 12:22:32 +00:00
Benjamin Bentmann c063424f0a o Fixed repository mirroring
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778386 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 11:02:32 +00:00
Benjamin Bentmann 170eaca464 o Fixed test to account for fixed handling of optional dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778385 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 11:02:02 +00:00
Benjamin Bentmann 1bf3219293 o Removed unused imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778384 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 11:01:26 +00:00
Benjamin Bentmann 0e5b8e2bf3 o Fixed handling of optional dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778344 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 08:10:18 +00:00
Jason van Zyl 5b76c2c495 o created an execution plan which currently contains the mojos that will be executed and the phase of dependency resolution required, if needed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778284 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 05:26:27 +00:00
Benjamin Bentmann c3f3d4c30c o Fixed plugin version resolution to consider plugin management, too
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778242 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 21:47:17 +00:00
Benjamin Bentmann c7461bf048 o Fixed resolution of system dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778223 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 20:41:14 +00:00
Benjamin Bentmann 1e35b2784e [MNG-2097] adding a phase called prepare-package
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778201 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 17:58:44 +00:00
Benjamin Bentmann c8151318c2 o Fixed processing of parameter aliases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778197 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 17:39:34 +00:00
Benjamin Bentmann 88fc18ab6f o Fixed configuration for direct invocation of goals
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778173 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 15:13:55 +00:00
Benjamin Bentmann 9f4dcc0c53 o Fixed plugin validator to consider only the first plugin descriptor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778142 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 13:17:47 +00:00
Benjamin Bentmann ca51f586cd o Improved error message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778138 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 13:14:10 +00:00
Benjamin Bentmann 49b8b62ef1 o Fixed parent resolution from settings' repositories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778127 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 12:12:38 +00:00
Benjamin Bentmann a2170b03c6 o Prevented NPEs in downstream code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778126 13f79535-47bb-0310-9956-ffa450edef68
2009-05-24 12:11:07 +00:00
Benjamin Bentmann 4bd0aad1dc o Deleted old profile matches
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777989 13f79535-47bb-0310-9956-ffa450edef68
2009-05-23 19:05:00 +00:00
Benjamin Bentmann ff7d13487d o Used more descriptive name for component
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777965 13f79535-47bb-0310-9956-ffa450edef68
2009-05-23 17:08:57 +00:00
Benjamin Bentmann c3f9346b47 o Introduced ProfileSelector component which will replace the profile manager (the new component is stateless and focuses on the task to determine the active profiles from a given input collection). The long term goal is to use the project builder configuration as the profile activation context as this holds basically all the bits required for profile activators.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777961 13f79535-47bb-0310-9956-ffa450edef68
2009-05-23 16:52:48 +00:00
Benjamin Bentmann ba57376e69 o Prevented NPEs in downstream code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777957 13f79535-47bb-0310-9956-ffa450edef68
2009-05-23 16:37:46 +00:00
Jason van Zyl 677a6b59d6 o get rid of dead code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777553 13f79535-47bb-0310-9956-ffa450edef68
2009-05-22 14:52:30 +00:00
Jason van Zyl 44c864a463 o workspace tests
Submitted by: Igor Fedorenko

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777301 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 22:41:39 +00:00
Jason van Zyl b54a1b781b o large patch to rework the chained local repository implementations necessary for efficient reactor and IDE workspace resolution
Submitted by: Igor Fedorenko

I've asked Igor to fill out and send in a CLA and I will put him on the Sonatype CCLA



git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777298 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 22:35:29 +00:00
Benjamin Bentmann 503cc60cc5 o Fixed explicit profile deactivation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777246 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 20:34:33 +00:00
Benjamin Bentmann 40f654d529 o Added generics
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777242 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 20:26:51 +00:00
Benjamin Bentmann b2a3374ac6 o Added note about need to tighten model validator with regard to plugin version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777240 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 20:14:26 +00:00
Jason van Zyl 48eb55f658 o project with plugin level configuration only
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777239 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 20:14:22 +00:00
Jason van Zyl e4d52d6c28 o missing classes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777234 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 19:54:27 +00:00
Jason van Zyl a06ce9250d o fix for testitMNG4091_InvalidDescriptor(org.apache.maven.it.MavenITmng4091BadPluginDescriptorTest)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777230 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 19:42:11 +00:00
Benjamin Bentmann 6fe1debb60 o Fixed NPE in case of direct goal invocations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777228 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 19:24:32 +00:00
Benjamin Bentmann efb59873a5 [MNG-4129] Execution's inherited is not working as expected.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777205 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 18:19:22 +00:00
Jason van Zyl aaf01a7495 o another point about merging in the default plugin configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777175 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 16:58:51 +00:00
Jason van Zyl b6cc908615 o notes on dealing with CLI invocations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777173 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 16:56:35 +00:00
Jason van Zyl fde34e8384 o get rid of extraneous goal matching
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777171 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 16:46:19 +00:00
Benjamin Bentmann b6d356acab o Removed dead code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777167 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 16:25:27 +00:00
Jason van Zyl 9af145d0a7 o take the plugin update registry out of the lifecycle mapping for plugins
o change the way mojo executions are processed and match up the executions when extracting configuration
o give mojo executions originating from the CLI the "default-<goal>" execution id



git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777166 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 16:18:53 +00:00
Benjamin Bentmann cad43e6b56 o Fixed precedence of plugin groups (request > settings > defaults)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777165 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 16:17:15 +00:00
Benjamin Bentmann 5eb52b5dee o Prevented duplicates
o Made execution request more robust with regard to NPEs


git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777163 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 16:04:57 +00:00
Benjamin Bentmann add87f5f56 o Ensured we eventually work with absolute paths
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777134 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 14:37:03 +00:00
Jason van Zyl 9aae6eaa67 o using mojo executions as the placeholders in the lifecycle instead of string representations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777120 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 14:00:34 +00:00
Benjamin Bentmann a7cbcb7b39 o Fixed ClassCastException
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777112 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 13:25:41 +00:00
Jason van Zyl 9024112b87 o adding test with multiple executions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777100 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 12:56:07 +00:00
Jason van Zyl 9efd21d0c9 o restoring several backward compat fixes all the way back to 2.0 ...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@776895 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 23:28:39 +00:00
Jason van Zyl 397dc841a7 o have the build plan take into consideration multiple tasks, so the calculation of the build plan can take in any number lifecycle phases, or individual goals and you will get the fully fleshed out configurations
o one thing that's apparent is that it is not possible to only collect the metadata about the plugins that will execute. if the plugin.xml files were actually available in the repository outside of the plugin's JAR then the calculation could be made without having to crack open the JAR. i can't have a real plan per se when i have to grab the plugin JAR anywhere to open it and get the metadata. ideally someone should be able to see the build plan and optimize it and if plugins were removed they those will never have a requirement of being downloaded. Deploying the plugin metadata along side the plugin as an attached artifact or indexing the information and made available for querying would be very useful.

o now that the build plan is calculated and the project dependencies downloading has been decoupled from the plugin manager i can make a proper analysis of all he dependencies for all the project and start making optimized requests for downloading



git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@776690 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 13:23:56 +00:00
Jason van Zyl 8637701384 o don't need to store plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@776561 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 05:27:18 +00:00
Jason van Zyl d5459955f5 o put the plugin groups in the front-end request populator, the magic plugin groups are no longer buried in the core. could still be
moved from the code in the populator to a configuration file in the maven installation.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@776556 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 05:16:09 +00:00
Jason van Zyl 9dfca575c7 o clean lifecycle is handled by defaults populator
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@776540 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 04:25:59 +00:00
Jason van Zyl ed8dbbdc8d o test component implementations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@776531 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 03:29:03 +00:00
Jason van Zyl 9be598d351 o injecting the metadata sources results in having to do some trickery to break the circular dependency between the components, this
is visible now in the metadata source which shows we need to do some work there as circular deps are pretty sure sign of poor design
o the ProjectClasspathTest has little stub components so I'm not even sure if it's a decent test but it requires a bunch of custom
  implementations as i tried to get rid of the hand written descriptor and have only annotated tests implementations but somewhere
  an incorrect implementations is being injected.

I'll work on breaking the circular dependency and we need a nicer way to inject test implementations, the way the Module works in
Guice is the way to go. We'll bridge the gap until we can switch over to Guice.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@776529 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 03:26:51 +00:00
Jason van Zyl 3a65c9fd76 o moving version resolution when not specified to the lifecycle executor, what goes into the plugin manager will be completely
and entirely resolved.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@776494 13f79535-47bb-0310-9956-ffa450edef68
2009-05-19 23:07:08 +00:00
Jason van Zyl e0298b7c97 o first pass at setting up error handling for each possible error condition
- this resulted in cleaning up some exceptions in plexus so that they might message could be surfaced in Maven
o move the plugin prefix searching to the lifecycle executor and get it out of the plugin manager
o add capability to the RepositorySystem to get plain resources from a repository. I'm going simple with the repository group
  metadata and I will just get the file directly as the only implementation is the plugin group metadata. the system is 
  not easily or generally extensible so i'll just take what I need



git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@776412 13f79535-47bb-0310-9956-ffa450edef68
2009-05-19 18:53:07 +00:00
Benjamin Bentmann 59224daa9e o Fixed interpolation of system properties
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@776073 13f79535-47bb-0310-9956-ffa450edef68
2009-05-18 20:10:06 +00:00
Benjamin Bentmann b4df2f1bb3 o Fixed injection of repos from settings.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775626 13f79535-47bb-0310-9956-ffa450edef68
2009-05-17 11:13:32 +00:00
Benjamin Bentmann 7afb4637c8 o Fixed resolution of project dependencies (regardless whether we want to resolve the root, the metadata source needs to resolve the root's POM so we better point it at the one we're interested in)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775350 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 21:26:55 +00:00
Benjamin Bentmann 7612c0e020 o Added toString() to ease debugging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775311 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 20:20:32 +00:00
Benjamin Bentmann d616f1d873 o Made project cache sensitive to file modifications
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775307 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 20:13:08 +00:00
Benjamin Bentmann 6f57526dfd o Saved clients from NPEs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775303 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 19:51:27 +00:00
Benjamin Bentmann b81a59ba3a o Added clear() method to project cache
o Added license headers

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775290 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 19:17:32 +00:00
Jason van Zyl 392d49db54 o pass the active profile ids and profiles pass into the request
o clean up constructors for project builder configuration


git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775284 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 18:45:48 +00:00
Jason van Zyl 01a13a3ffd o remove the profile manager and profile activation context from public view
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775281 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 18:32:59 +00:00
Jason van Zyl 6fbd31302f o deal with classifiers, igor needs this and I will unify the method later.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775278 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 18:27:20 +00:00
Jason van Zyl bd4515d9f4 git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775207 13f79535-47bb-0310-9956-ffa450edef68 2009-05-15 16:02:03 +00:00
Jason van Zyl 8f7f0ce1dd o note about signature removal in the project builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775181 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 15:10:24 +00:00
Jason van Zyl 107b03a1f7 o getting rid of some dead code in the project builder in preparation for trying to group more of the profile handling code as a test is failing in the embedder related to profiles while everything in the pom construction test is working correctly.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775141 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 14:08:43 +00:00
Jason van Zyl 49a8b628b3 o remove dead method
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775101 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 12:23:18 +00:00
Benjamin Bentmann c456055883 o Restored basedir alignment
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774925 13f79535-47bb-0310-9956-ffa450edef68
2009-05-14 21:02:10 +00:00
Benjamin Bentmann f60ebacbd4 o Fixed parsing of lifecycle mappings
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774886 13f79535-47bb-0310-9956-ffa450edef68
2009-05-14 19:14:25 +00:00
Benjamin Bentmann 3e287c47bb o Made plugin manager bail out if requested mojo can't be loaded to save clients from NPEs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774885 13f79535-47bb-0310-9956-ffa450edef68
2009-05-14 19:13:45 +00:00
Jason van Zyl 7ccc3d878e o fixinga bunch of embedder tests, 8 left to fix
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774768 13f79535-47bb-0310-9956-ffa450edef68
2009-05-14 13:52:03 +00:00
Jason van Zyl 060c6d9784 o all core tests pass again, on to ITs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774620 13f79535-47bb-0310-9956-ffa450edef68
2009-05-14 02:47:02 +00:00
Benjamin Bentmann 5d20be91e3 o Fixed resolution of project dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774522 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 20:44:43 +00:00
Jason van Zyl dcfc099be4 o removing duplicate tear down
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774518 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 20:33:31 +00:00
Jason van Zyl de46f2a5fa o bunch more patches from Igor to keep the heap down. junit is just not letting go.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774515 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 20:27:13 +00:00
Benjamin Bentmann 2e08d8136a o Restored deleted methods for backward-compat with existing plugins like javadoc
o Deprecated similar methods for other scopes

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774509 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 20:18:24 +00:00
Jason van Zyl af6c8da5f0 o tear down to keep the heap down
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774505 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 20:08:44 +00:00
Jason van Zyl e4ad3f01d5 o fix by igor to keep the heap down.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774502 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 19:56:25 +00:00
Jason van Zyl 5300bd94f5 o classloaders are now managed by the plugin manager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774488 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 18:45:07 +00:00
Jason van Zyl a2ac490107 o another pass the the plugin manager
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774487 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 18:42:56 +00:00
Jason van Zyl 73fc3f1b0c o add a check for the fake session used in testing.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774451 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 17:58:59 +00:00
Jason van Zyl 177d3d54d5 o change constructor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774442 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 17:24:37 +00:00
Jason van Zyl 97f00265c8 o change signatures to match the changes in the plugin manager
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774404 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 15:32:42 +00:00
Jason van Zyl d13f1295b7 o removing MavenProject from the public signature of the plugin manager to enforce the concern of the plugin manager which is simply to execute plugins. all configuration and processing of configuration happens before the plugin manager. the only thing left is the expression evaluator which has the mixed concern of configuration and componnent injection.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774361 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 13:41:06 +00:00
Jason van Zyl 26e3763a58 o add necessary component
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774344 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 13:21:40 +00:00
Jason van Zyl 9e33c65eec o reduce the number of constructors
o deprecate access to the container

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774341 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 13:20:30 +00:00
Jason van Zyl 835c8f14ef o use the one way of creating an artifact resolution request.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774335 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 13:18:59 +00:00
Jason van Zyl 267ec868f2 o remove the resolve plugin version, this logic will all be handled by building up the project model, and there will be no magical plugin version diddling. you must set the version of the plugins you're using.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774327 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 13:15:48 +00:00
Jason van Zyl dba032a96f o disable a test until the new RR plugin is released.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774187 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 04:14:28 +00:00
Jason van Zyl b4251c3e16 git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774079 13f79535-47bb-0310-9956-ffa450edef68 2009-05-12 20:50:52 +00:00
Jason van Zyl b6ee917be9 o getting the project dependencies now does not require two passes and we now always resolve from the root artifact. we no longer have to set the dependency artifacts either. with chained local repositories everything will be found in a repository so you don't have to make a distinction between what you have in a reactor/workspace/repo. the artifact will be found.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774078 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 20:50:04 +00:00
Benjamin Bentmann 06a7b6abec o Updated test setup to account for changed default value
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774061 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 20:18:57 +00:00
Jason van Zyl 5e0dc06c34 o clean up debug in the test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773963 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 16:19:44 +00:00
Jason van Zyl 0b4fc499ed o we only need to setup the hull which holds the mojos per phase to execute, the executions are now constructed properly by the project builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773962 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 16:17:36 +00:00
Jason van Zyl dd1725b131 o adding components to test wagons
o add method to view supported protocols
o add a note to the test to show the lifecycle plan is getting some repeated elements


git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773926 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 15:08:53 +00:00
Benjamin Bentmann e6fa6d26b4 o Extended UT to capture MNG-3719 as well
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773870 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 12:48:41 +00:00
Benjamin Bentmann cff6ab0d02 o Added model normalizer for things like merging duplicate plugin declarations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773869 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 12:40:57 +00:00
Benjamin Bentmann ea67631690 o Updated test setup
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773856 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 11:08:54 +00:00
Jason van Zyl 55ecfa65d6 o implement the find(Artifact) method in the default local repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773769 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 02:43:26 +00:00
Jason van Zyl 3504931b37 o the newly gutted system bootstraps, i think i'm happy about the state of 3.x now :-)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773740 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 00:35:18 +00:00
Jason van Zyl 096014099e o put the workspace respository impl in earlier so poms can be resolved from the workspace.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773694 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:59:54 +00:00
Benjamin Bentmann 3f08e048a9 o Moved expansion of plugin configuration into component
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773692 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:56:32 +00:00
Jason van Zyl e3e5cfcf12 o provide a hook or IDE workspace repostiory implementations to insert themselves.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773686 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:51:06 +00:00
Jason van Zyl e74e31f2a4 o comment out method until working again.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773685 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:50:32 +00:00
Jason van Zyl 0128936e7e o need to implement this method used by the assembly plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773684 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:50:05 +00:00
Jason van Zyl b8c6c01864 o pushing up the dependency downloading logic into the lifecycle executor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773662 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 19:38:34 +00:00
Jason van Zyl 1379d1dad4 o prepare to bring the project dependency downloading in directly after calculating the build plan
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773646 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 18:32:32 +00:00
Jason van Zyl 4a046065c4 git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773470 13f79535-47bb-0310-9956-ffa450edef68 2009-05-11 05:20:53 +00:00
Jason van Zyl 4446b8dba7 o hack is no longer required to set the project.build.directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773466 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 04:53:55 +00:00
Jason van Zyl dd16571f67 o maven project cache, integrators can do what they like with project caching
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773460 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 04:42:19 +00:00
Jason van Zyl 4cab749650 o simple plugin classloader cache, i cannot anticipate what client code will need. Igor already proved that it's impossible to generalize for the IDE environment and it's just easier to let IDE folks do what they like.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773457 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 04:10:09 +00:00
Jason van Zyl 3398024a0f o delegating local repository implementation that chains the reactor and user local repository
o removal of more state from the WagonManager and pushing it into the request in an attempt to bridge the way for Mercury



git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773456 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 04:08:29 +00:00
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 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 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 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
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 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
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 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
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
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
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 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