Commit Graph

632 Commits

Author SHA1 Message Date
Benjamin Bentmann f4fa9e3838 o Refactored model validator to use problem collector
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800451 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 16:20:06 +00:00
Benjamin Bentmann c612913a70 o Refactored profile selector to use problem collector
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800426 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 15:30:37 +00:00
Benjamin Bentmann 975ac84b45 o Refactored model building listener to use problem collector
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800418 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 15:13:46 +00:00
Benjamin Bentmann 5e36879dd4 o Reworked handling of model problems to allow for easier reusage across all the other model diddling components
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800413 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 14:58:05 +00:00
Benjamin Bentmann 0373dfb46b o Extended lifecycle injector to collect model problems
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800353 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 13:16:41 +00:00
Benjamin Bentmann ea10476bf9 o Fixed extension realm to consider project-level plugin dependencies as well
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@799831 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 11:06:14 +00:00
Benjamin Bentmann c2078c65b1 o Enabled model cache
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@799470 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 23:03:32 +00:00
Benjamin Bentmann 299a4c0843 [MNG-4052] import scope dependencies prefer to download pom rather than find it in the current project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@798221 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 17:09:51 +00:00
Benjamin Bentmann fb0d4c3de9 o Enabled two-phase model building which allows to address inter-model dependencies within a reactor build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@798077 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 08:33:11 +00:00
Benjamin Bentmann 34e1fa627f o Enabled two-phase model building which allows to address inter-model dependencies within a reactor build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797988 13f79535-47bb-0310-9956-ffa450edef68
2009-07-26 20:36:32 +00:00
Benjamin Bentmann 38cec71dcf o Revised API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797968 13f79535-47bb-0310-9956-ffa450edef68
2009-07-26 18:18:47 +00:00
Benjamin Bentmann 70f22200a0 o Moved dependency management importer into package dedicated to mixin composition
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797961 13f79535-47bb-0310-9956-ffa450edef68
2009-07-26 17:43:50 +00:00
Benjamin Bentmann 57f82d7694 o Introduced model cache to avoid repeated building of models that can occur multiple times during a reactor build (e.g. parents and imported POMs)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797959 13f79535-47bb-0310-9956-ffa450edef68
2009-07-26 17:36:59 +00:00
Benjamin Bentmann 6d2b09b14f o Refactored code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797809 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 18:04:24 +00:00
Benjamin Bentmann fe4d70448e o Made model validation fail upon imported POM with classifier (which isn't supported)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797808 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 18:03:13 +00:00
Benjamin Bentmann 4286488981 o Polished API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797477 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 14:23:00 +00:00
Benjamin Bentmann 93b2746fe5 o Added UT for PropertyProfileActivator
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@796912 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 23:36:22 +00:00
Benjamin Bentmann 88216c6532 o Re-introduced distinction between user properties and system properties. We have use cases like interpolation and SUREFIRE-121 where we would like to handle user-specified props specially so a single properties soup is not up to the job. However, I opted not to follow the approach from 2.x where we also collect both system properties and user properties in a combined set called execution properties. Code that embeds Maven and programmatically creates an execution request should be not required to assemble such a mixed properties instance, it would enable bad behavior from Maven by subtle API misuse. Also, for things like the lifecycle participant that wants to inject properties, it should be cristal clear whether it injects a user or a system property, the semantics of something like getExecutionProperties().setProperty() would be unclear however.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@796900 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 22:43:05 +00:00
Benjamin Bentmann fa40714be3 o Revised error handling, API misuse is really not a model/network problem
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@795622 13f79535-47bb-0310-9956-ffa450edef68
2009-07-19 21:24:44 +00:00
Benjamin Bentmann a48742bc1a [MNG-3220] Allow managed dependencies to be imported into other projects
o Restored import scope for 3.x

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@795611 13f79535-47bb-0310-9956-ffa450edef68
2009-07-19 21:14:17 +00:00
Benjamin Bentmann 01f7692db0 o Replaced usage of StringBuffer with StringBuilder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@795584 13f79535-47bb-0310-9956-ffa450edef68
2009-07-19 18:20:09 +00:00
Benjamin Bentmann 70ae109093 o Added method to clone/fork model resolver which is a prerequisite for importing other POMs/mixins during the model building where the model builder basically recurses and we want the resolution processes for these sub POMs to be isolated
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@795227 13f79535-47bb-0310-9956-ffa450edef68
2009-07-17 21:07:11 +00:00
Benjamin Bentmann 1759fb3979 o Consolidated all inputs of the model builder in the building request
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@793891 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 12:54:16 +00:00
Benjamin Bentmann faa082995e o Introduced model building listener
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@793842 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 10:42:34 +00:00
Benjamin Bentmann f3ba964d55 o Refactored management injection to allow for proper extension loading
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@793578 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 13:19:45 +00:00
Benjamin Bentmann abca2a5252 o Moved model builder classes into dedicated package such that o.a.m.model is reserved for the generated Modello classes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@790350 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 20:04:48 +00:00
Benjamin Bentmann 2b44c968f0 o Extended model validator to support more than two validation levels
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@790338 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 19:33:40 +00:00
Benjamin Bentmann 512d83070a [MNG-4173] Remove automatic version resolution for POM plugins
o Reduced validation error to warning because this change seems to cause troubles for many projects out there
o Extended lifecylce executor to take care of non-versioned plugins

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@790202 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 14:55:06 +00:00
Benjamin Bentmann 22516c9fa7 o Extended model validation to support distinction between warnings and errors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@790131 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 11:56:44 +00:00
Benjamin Bentmann b91f837e12 o Distinguished different severity levels of model problems, allowing warnings to be collected but still have the build request succeed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@790109 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 10:45:29 +00:00
Benjamin Bentmann 49acd30848 o Fixed NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@790099 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 10:23:32 +00:00
Benjamin Bentmann e3463be3d1 [MNG-2363] <profile><activation><file><exists/> does not work in a multi-project build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@788334 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 12:03:55 +00:00
Benjamin Bentmann dd635ca490 o Moved super POM retrieval into dedicated component to provide an extension point for integrators like Tycho that need different/further values in the super model
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@788309 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 10:00:21 +00:00
Benjamin Bentmann 262ff7908f [MNG-4214] [regression] Parent POMs cannot be resolved from mirrored repos
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@786910 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 21:22:54 +00:00
Benjamin Bentmann 2260cb2f58 o Fixed buggy anti-pattern
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@786892 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 19:39:56 +00:00
Benjamin Bentmann 4b0c8ac908 o Synced resource directory of super POM with base package of module
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@786855 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 16:52:06 +00:00
Benjamin Bentmann 6a63fb495f o Removed super POM handling from project builder and did a proper call to the model builder instead
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@786853 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 16:40:21 +00:00
Benjamin Bentmann 7f526ca65d o Extended model builder to report the ids of the models from the lineage and used these ids as keys to pull infos from the building result
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@786838 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 15:00:45 +00:00
Benjamin Bentmann fed83d80b8 o Polished documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@786837 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 14:51:45 +00:00
Benjamin Bentmann a51aba1cd6 [MNG-4208] [regression] CLI properties can't override project properties during interpolation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@785752 13f79535-47bb-0310-9956-ffa450edef68
2009-06-17 18:44:19 +00:00
Benjamin Bentmann 3843481a3b o Fixed order of inherited plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@785644 13f79535-47bb-0310-9956-ffa450edef68
2009-06-17 15:00:06 +00:00
Benjamin Bentmann cd9056d1fd o Kept active external and POM profiles separate in model building result
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@784583 13f79535-47bb-0310-9956-ffa450edef68
2009-06-14 16:46:16 +00:00
Benjamin Bentmann 8a43011d41 [MNG-4005] Throw Validation Error if pom contains a dependency with two different versions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@784241 13f79535-47bb-0310-9956-ffa450edef68
2009-06-12 19:22:41 +00:00
Benjamin Bentmann 425f632772 o Restored backward-compat with regard to handling of duplicate dependencies during metadata retrieval
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@784227 13f79535-47bb-0310-9956-ffa450edef68
2009-06-12 18:45:37 +00:00
Benjamin Bentmann b04e3aa641 o Avoided creation of interpolation value sources that only apply to local builds when we have no project directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@783831 13f79535-47bb-0310-9956-ffa450edef68
2009-06-11 16:17:49 +00:00
Benjamin Bentmann e72965d38e [MNG-2562] expose current time as a property for POM interpolation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@783808 13f79535-47bb-0310-9956-ffa450edef68
2009-06-11 15:01:55 +00:00
Benjamin Bentmann 56d0392994 o Took the build timestamp formatting stuff out of the public API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@783777 13f79535-47bb-0310-9956-ffa450edef68
2009-06-11 14:10:33 +00:00
Benjamin Bentmann db5d449c33 o Fixed inheritance of <developers>, <contributors>, <licenses> and <mailingLists>
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@783556 13f79535-47bb-0310-9956-ffa450edef68
2009-06-10 22:30:55 +00:00
Benjamin Bentmann 424b7ef1b0 o Fixed inheritance of <prerequisites>
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@783542 13f79535-47bb-0310-9956-ffa450edef68
2009-06-10 22:02:56 +00:00
Benjamin Bentmann 5cde8bfe4b [MNG-4193] Throw validation error upon multiple repository declarations with the same id
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782796 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 21:38:45 +00:00
Benjamin Bentmann d07123e796 o Fixed model building to account for default values that can't be set in the MDO. The use case we have for this is the scope for dependencies: Setting this in the MDO would cause injection of the default in the raw model and would interfere with the superposition of dependency management. The 2.x code handles this via a side effect of MavenMetadataSource.createArtifact() which doesn't look like a clean way to go.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782376 13f79535-47bb-0310-9956-ffa450edef68
2009-06-07 12:12:54 +00:00
Benjamin Bentmann 04f14b08d8 o Clarified state of internal util class
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782354 13f79535-47bb-0310-9956-ffa450edef68
2009-06-07 09:29:08 +00:00
Benjamin Bentmann bfe55515a0 o Updated profile selector to support collecting activation errors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782293 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 18:09:42 +00:00
Benjamin Bentmann a35801fd1d o Set POM file before validation to provide better source hint for validation problems
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782283 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 17:40:50 +00:00
Benjamin Bentmann b5e672f92b o Revised exception handling of model builder to collect as much as possible in ModelProblem instances that are stored in the ModelBuildingException when it eventually bails out. This should enable IDE integrators to provide more extensive error feedback.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782282 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 17:28:10 +00:00
Benjamin Bentmann 97e57944f8 o Improved propagation of parse errors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782243 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 12:37:34 +00:00
Benjamin Bentmann b273dab333 o Fixed aggregation of remote repositories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782231 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 11:35:57 +00:00
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 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
Benjamin Bentmann 2d7b1977d9 o Used same junit version as in all the other modules
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781172 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 21:13:51 +00:00
Benjamin Bentmann 1e730aa8ad o Minor tweaks to the interpolation post process:
- Excluded it completely if it has nothing to do
  - Switched contains() test to use hash-based lookup rather than linear search

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781168 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 21:06:57 +00:00
Benjamin Bentmann a65f6d71f0 o Polished generics
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781153 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 20:35:15 +00:00
Benjamin Bentmann 1d3df2ed0c o Decoupled model building request from profile activation context
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781144 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 20:07:26 +00:00
Benjamin Bentmann 2b12aab7e1 o Extended API docs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781137 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 19:39:12 +00:00
Benjamin Bentmann 7a2d55b8d1 o Gave each model diddling component access to the building request to easy future extensions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781133 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 19:31:34 +00:00
Benjamin Bentmann a47090cd84 o Added some API docs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781127 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 19:10:40 +00:00
Benjamin Bentmann 99a0a12c46 o Removed utility classes from public API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781123 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 18:53:27 +00:00
Benjamin Bentmann 34dfd48922 o Added some API docs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781120 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 18:49:44 +00:00
Benjamin Bentmann ff62ba92a6 o Used non-deprecated classes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780769 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 18:33:24 +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 0968ba79f3 o Flipped interpolation over to use the in-memory based interpolator from 2.2.x which makes the overall building twice as fast as before
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780749 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 17:49:34 +00:00
Benjamin Bentmann 9501ad8835 o Resurrected the path translator component (on this occasion, splitting it to separate the single path translation from the model translation)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780698 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 15:55:41 +00:00
Benjamin Bentmann bdcb479015 o Fixed resolution of local parents
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780642 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 13:19:20 +00:00
Benjamin Bentmann a28e69ee47 o Polished exceptions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780636 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 12:48:22 +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 48eccf5d3b o Validated repositories upfront as these are required for parent resolution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780622 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 12:09:01 +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 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 421e6ca656 o Added dedicated exception for POM parsing errors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@779299 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 20:28:12 +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
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 89d7b13fd6 o Extended model with fields to track source file and project directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778494 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 20:43:01 +00:00
Benjamin Bentmann 1ace747678 o Guarded against NPE in case no project directory is available as in the case of repo artifacts
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778491 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 20:07:57 +00:00
Benjamin Bentmann f82b30a6a1 o Clarified API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778489 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 20:05:02 +00:00
Benjamin Bentmann f2fad6d4d7 o Decoupled interpolator from DomainModel
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778449 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 16:18:07 +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 a28bb83b54 o Moved profile manager to compat module
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777998 13f79535-47bb-0310-9956-ffa450edef68
2009-05-23 19:44:18 +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 3f59f88d86 o Fixed inheritance to exclude project name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777237 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 19:58:13 +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 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 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
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
Benjamin Bentmann 27afcb3aff o Introduced components to abstract from the Modello generated XPP reader/writer such that we can more easily switch the underlying XML parser
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774057 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 20:03:31 +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 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
Benjamin Bentmann 4fdc5512eb o Deleted processors which have been replaced by mergers. To recap, the mergers operate on two instead of three models which reduces complexity. While the mergers are currently not overly beauty either, the plan is to have them generated by Modello via merge rules that would be annotated to the model classes/associations.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773428 13f79535-47bb-0310-9956-ffa450edef68
2009-05-10 22:29:31 +00:00
Benjamin Bentmann f48503a610 o Moved injection of plugin/dependency management into isolated component and decoupled from processors. The new component resembles the ModelDefaultsInjector from 2.x but explicitly focuses on management information. Other defaults like the lifecycle induced plugins should be handled by another component.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773323 13f79535-47bb-0310-9956-ffa450edef68
2009-05-10 10:46:05 +00:00
Benjamin Bentmann 0c5208ac25 o Fixed merging of plugin executions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773212 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 12:15:26 +00:00
Benjamin Bentmann 4116ac3f0b o Decoupled calculation of child path adjustment from filesystem which would make the effective model depend on the user's environment and breaks with our goal of reproducible builds
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773047 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 17:00:45 +00:00
Benjamin Bentmann d36a4ab8eb o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773031 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 15:19:51 +00:00
Benjamin Bentmann 24cf91d858 o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773019 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 14:58:26 +00:00
Benjamin Bentmann 6e2798f2e9 o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773012 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 14:40:47 +00:00
Benjamin Bentmann c17cfb0076 o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772980 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 13:31:32 +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
Jason van Zyl a73c5abc9c o in the middle of a ReactorArtifactRepository but ben and igor need access so checking in
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772832 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 03:24:55 +00:00
Benjamin Bentmann 51c1cb584c o Re-introduced 2.x like inheritance assembler and profile injector components which mostly delegate to a common model merger class. First of all, the merger only deals with two models at a time, simplifying its logic compared to the current processors, hopefully allowing us to quickly/easily fix the outstanding POM tests. The ultimate goal is to generate the basic ModelMerger automatically with a new Modello plugin which could be programatically customized via a sub class like MavenModelMerger. It will be interesting to find out how much of the merging rules could be generalized via declarative options in the model. This could allow for generated documentation about how inheritance and profile injection alter the model. Last but not least, generating the merger from the MDO would ease addition of new model elements as these would automatically be considered for inheritance and profile injection.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772827 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 01:28:10 +00:00
Benjamin Bentmann 1e26baf0a1 o Changed boolean fiels to String to enable both filtering and three-valued logic for proper merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772758 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 20:06:41 +00:00
Benjamin Bentmann 81006b21aa o Migrated from StAX to XPP to have us focus on a single XML parser for now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772013 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 23:31:09 +00:00
Britton Isbell 383a8b006a Plugin was picking up default plugin groupId, which was causing resolve of plugins to fail.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770433 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 20:26:13 +00:00
Britton Isbell 12ffdd1277 Fixes for merging in plugin config. Needed to do copy of plugins and config.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770395 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 18:55:26 +00:00
Jason van Zyl 36e43b2951 o cleaning up project builder, removed signatures that i've corrected in the RR plugin, moved properties injection up to the main Maven component
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770390 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 18:49:42 +00:00
Britton Isbell 01f79cf31a Cleanup of unused methods.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769953 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 21:46:24 +00:00
Britton Isbell 612db0a8af Moved interp tag to private class (small and only used one place). Added final to fields in ProjectUri. Since this is only used by DefaultInterpolator, don't care if values are inlined during compile
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769945 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 21:30:16 +00:00
Britton Isbell c0306a2ef4 Checking in work on populating plugins configs. Some problem with finding wagon for http protocol is causing build to fail.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769934 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 21:10:03 +00:00
Britton Isbell f27610741f Removed unneeded class.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769868 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 18:39:20 +00:00
Britton Isbell 16fc5b6fd3 Moved the PomInterpolatorTag and Interpolator classes to package scope.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769859 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 18:04:44 +00:00
Britton Isbell 5a7ab7d748 Removed uses of interpolator property from the profiles. This was more of a convenience since InterpolatorProperty was used in multiple places. Not needed anymore.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769856 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 17:59:09 +00:00
Britton Isbell 440b268447 Removed more references to ProjectUri. This is now an internal class in the interpolator package.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769841 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 17:20:47 +00:00
Britton Isbell a6d2ac847a Having a DomainModel interface doesn't makes sense in the current context. We no longer have general transforms.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769836 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 17:12:08 +00:00
Britton Isbell baf09a4148 Cleanup of interpolator, removing references to PomClassicDomainModel, these aren't needed anymore.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769827 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 17:00:17 +00:00
Jason van Zyl be02d72fe6 o only one used interpolator method now, and it's generalized to taking the model and passing in properties so we can make different implementations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769682 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 06:52:50 +00:00
Britton Isbell ae9248e642 Interpolator with properties in method sig.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769666 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 05:25:45 +00:00
Britton Isbell 7d85e92007 Removed hard-coding of plugins. Plugins come into builder with default configs. Need to null these out so that pluginMng will be applied.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769456 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 16:50:21 +00:00
Britton Isbell cb51cfc270 Removed hard-coding of plugins. Plugins come into builder with default configs. Need to null these out so that pluginMng will be applied.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769453 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 16:31:56 +00:00
Britton Isbell 850b047c6d Disabled UTs in maven-project.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769237 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 04:40:54 +00:00
Britton Isbell c3715849bf Default plugins.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769235 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 04:12:32 +00:00
Jason van Zyl 2805dee2cf o trying to merge manually
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@768842 13f79535-47bb-0310-9956-ffa450edef68
2009-04-27 00:43:53 +00:00
Jason van Zyl 5d7758b358 o pull from trunky dunk dunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@767707 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 23:04:06 +00:00