Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,968 Commits 85 Branches 96 Tags 107 MiB
Commit Graph

82 Commits

Author SHA1 Message Date
Britton Isbell dd676fd685 Cleanup up some methods. Removed mixins from interfaces. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746288 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-20 16:33:41 +00:00
Britton Isbell c327c94443 Refactored out more uses of modello and moved classes from maven-project to maven-project-builder. Doing this so that maven-mercury will not have direct dependency on modello or maven model. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746002 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-19 21:22:46 +00:00
Britton Isbell 73c0f41e3b Collapased Transformers into one. Extracted out some rules. Removed some references to Maven model in DomainModels to generalize. Removed Plugin mixins, which are no longer needed. Extension loading appears to be broken from refactoring. Need to fix this. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745712 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-19 03:00:52 +00:00
Benjamin Bentmann c53466f406 o Fixed regressions regarding profile de-/activation 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745642 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-18 20:47:42 +00:00
Britton Isbell 360b949e41 Small change to index on model building. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745377 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-18 04:44:59 +00:00
Britton Isbell 7ed4efcec0 Updated profiles with collection information. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745244 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-17 20:30:03 +00:00
Britton Isbell 920e6b7f39 [MNG-4040] - Profile module inheritance. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745219 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-17 19:54:35 +00:00
Britton Isbell fd1d9855df [MNG-4034] - dependency version is not inherited from parent dependencyManagement 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745110 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-17 14:56:24 +00:00
Britton Isbell 247efed735 [MNG-3885] [MNG-4009] : Fixed problem of profile info in parents not being applied. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@741282 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-05 20:38:37 +00:00
Britton Isbell a3461e7fb0 [MNG-3803] - System properties in plugins 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@740770 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-04 15:33:47 +00:00
Britton Isbell 4267580f46 MNG-4008: Multiple filters. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@740495 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-03 22:43:53 +00:00
Britton Isbell d1124333ad Merge: sisbell-plugin-manager. MNG-3631 - Get plugin config, including mojo descriptor info. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739970 13f79535-47bb-0310-9956-ffa450edef68
 2009-02-02 12:02:44 +00:00
Jason van Zyl ed4f594ac4 [maven-release-plugin] prepare for next development iteration 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739478 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-31 01:06:48 +00:00
Jason van Zyl 13fa00ea3f [maven-release-plugin] prepare release maven-3.0-alpha-2 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739476 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-31 01:06:37 +00:00
Jason van Zyl 557f0a5373 [maven-release-plugin] prepare for next development iteration 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738777 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-29 07:13:04 +00:00
Jason van Zyl 7f54cfff61 [maven-release-plugin] prepare release 3.0-alpha-2 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738775 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-29 07:12:48 +00:00
Britton Isbell 02c557c132 Minor updates to URI and joins. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738340 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-28 02:06:27 +00:00
Britton Isbell 93ec09c8a5 MNG-4010: Remove duplicate dependency exclusions. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738256 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-27 21:48:22 +00:00
Benjamin Bentmann 3850e36381 o Removed final modifiers 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738169 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-27 17:56:33 +00:00
Benjamin Bentmann 3e6bc31a03 [MNG-4008] [regression] Build filters are collapsed 
o Created UT from IT
o Started attempt to fix but apparently #set isn't enough to get the merging right

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738088 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-27 13:32:47 +00:00
Benjamin Bentmann ea2773c5eb [MNG-4007] [regression] Effective model contains paths with non-normalized file separators 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738074 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-27 12:39:03 +00:00
Britton Isbell 702ed0b0dd Fixed various ordering of element problems during plugin management joins. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737812 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-26 20:22:20 +00:00
Britton Isbell 1c2b979977 MNG-3887: order of plugin executions, MNG-3864: plugin configs are collapsed, MNG-4000: Plugin executions without id are lost 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737633 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-26 03:29:07 +00:00
Britton Isbell 379f614660 Fixed regression on MNG-3821. Should not add any subcontainers to the Model Container Info list, which is the one that the ModelTransformerContext uses. This will match ids for subcontainers from different parent containers. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737622 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-26 01:40:40 +00:00
Britton Isbell dc27facb7e Updated unit tests with assertions. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737619 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-26 01:23:25 +00:00
Britton Isbell 2d5cb58fe9 MNG-3998: Loss of execution configuration. MNG-3886: Goals order. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737156 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-23 19:24:27 +00:00
Britton Isbell 34aceea2eb Added #set to URI configurations. Fixed problem where execution rule was joining all collections, not just goals. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736578 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-22 06:53:25 +00:00
Britton Isbell 496d8ffcb4 MNG-3997: If one ModelProperty property URI starts with another ModelProperty URI and both are empty and both are consecutive in the pom, then the first tag was not being closed on unmarshalling to XML. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736541 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-22 03:18:20 +00:00
Britton Isbell 15f10579d7 Fix: MNG-3965 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736386 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-21 19:31:48 +00:00
Britton Isbell 68d8ce9d34 MNG-3979. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736252 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-21 07:35:33 +00:00
Britton Isbell 01f81a5d11 MNG-3821 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736246 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-21 06:51:52 +00:00
Britton Isbell 036d5932e1 MNG-3937 - goals inheritance. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736233 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-21 05:58:52 +00:00
Britton Isbell a457427433 Fix: Different types of ID Model containers were being joined if their ids matched. Now we have one ID model container factory instance per type. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733637 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-12 07:00:09 +00:00
Britton Isbell e3385f5e0e Added #collection to repositories/pluginRepositories URI's to allow more than one in the pom. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733632 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-12 06:12:02 +00:00
Britton Isbell e3bde472f9 Fix: MNG-3978 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733133 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-09 19:44:19 +00:00
Britton Isbell 647a0112cc Fix: MNG-3943 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733036 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-09 13:42:37 +00:00
Britton Isbell f3c978e962 Fix: MNG-3938 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732344 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-07 14:03:06 +00:00
Jason van Zyl 481cde5756 [maven-release-plugin] prepare for next development iteration 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731333 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-04 18:59:28 +00:00
Jason van Zyl 6991c79e34 [maven-release-plugin] prepare release maven-3.0-alpha-1 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731331 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-04 18:59:05 +00:00
Jason van Zyl cc38a455f7 [maven-release-plugin] prepare for next development iteration 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731271 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-04 15:29:07 +00:00
Jason van Zyl bab3480d4b [maven-release-plugin] prepare release 3.0-alpha-1 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731269 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-04 15:28:42 +00:00
Britton Isbell f39ec410da Reverted back changes for MNG-3821. Broke bootstrap. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728871 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-23 04:57:42 +00:00
Britton Isbell e253e09019 We are no longer using IdModelContainerFactory to create the Plugin Execution ID model containers. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728742 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-22 19:00:10 +00:00
Britton Isbell b6d3fe1cde Fix: MNG-3821 - We can't feed containers of containers into the ModelTransformerContext. Merging of subcontainers needs to be handled in the ModelTransformer implementation. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728739 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-22 18:32:56 +00:00
Britton Isbell e24f7564f7 Fix: there was a problem with pom construction if there were two or more plugins with dependencies elements. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727855 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-18 23:35:31 +00:00
Jason van Zyl 2560c1e0bb o don't let inherited executions from plugin management containers be appended, they need to be overridden if there is no execution id 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727623 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-18 03:16:52 +00:00
Britton Isbell 61a5d19c4e Artifacts containers now will inherit versions. This will occur before management rules are applied. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727614 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-18 01:45:13 +00:00
Jason van Zyl 9002e05de5 MNG-3916: fixing the joining of executions in plugin containers. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727516 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-17 21:25:46 +00:00
Jason van Zyl 7d3040a73e o collapsing more of the project builder, trying to turn it back into one component -- we have the old and the new with the old wrapper the new -- so that I can have an interface for compatibility and then all our new stuff in another component. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727299 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-17 06:27:16 +00:00
Jason van Zyl c03100b344 o keep a single copy of the super pom here, this can be shared outside of maven more easily 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727292 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-17 05:40:56 +00:00