Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,296 Commits 83 Branches 96 Tags 108 MiB
Commit Graph

110 Commits

Author SHA1 Message Date
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
Jason van Zyl 15da8b59b0 o move the path translator to the maven-compat package 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726744 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-15 17:48:53 +00:00
Jason van Zyl a89e664905 o update dep on model-builder 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726585 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-15 00:20:25 +00:00
Jason van Zyl 6d5eab14f6 o remove aspectj 
o update compat log with CLI changes
o update everything to release versions, we have no snapshots anymore


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726521 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-14 19:51:59 +00:00
Jason van Zyl ea43792cf2 MNG-3905 First pass at collecting all the repository related code and started to decouple from maven-artifact 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726383 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-14 06:24:01 +00:00
Jason van Zyl 9068bf5915 o merge back in the transform plugin management 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726361 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-14 05:04:54 +00:00
Jason van Zyl 24cfa6f927 o fix typo, it's pluginContainer not dependencyContainer 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726358 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-14 04:34:36 +00:00
Britton Isbell 32d7501b6f Remove out statements. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721983 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-01 06:42:16 +00:00
Benjamin Bentmann 4f4358ee02 o Updated method signatures due to r721715 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721716 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-29 20:54:28 +00:00
Britton Isbell 281f1c8a28 Unit test. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721609 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-29 01:42:14 +00:00
Britton Isbell 4d84546f7b Fix for problems with modello plugin. Builder was not properly inheriting the goals. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721608 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-29 01:41:35 +00:00
Britton Isbell 5ae9e19a16 Small fix to URI 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721576 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-28 22:13:05 +00:00
Britton Isbell 6982b056ac Merging out 721278. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721335 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-28 04:23:42 +00:00
Britton Isbell 252065d9b4 Readded fix for MNG-3863. Also included default group id for profiles. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721329 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-28 03:31:06 +00:00
Britton Isbell 7b85810d0d Some work toward fixing multiple goals for plugin management. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721278 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-27 21:07:57 +00:00
Britton Isbell d9d59f09cf Updated unit test to test for contents of two containers. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721109 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-27 07:25:44 +00:00
Britton Isbell 33962fbf54 Unit test for dependency management with scope and classifier. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721102 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-27 06:50:12 +00:00
Jason van Zyl 337021834b git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721081 13f79535-47bb-0310-9956-ffa450edef68 2008-11-27 05:17:27 +00:00
Jason van Zyl dac9668fbd git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721080 13f79535-47bb-0310-9956-ffa450edef68 2008-11-27 05:16:20 +00:00
Jason van Zyl 1f06b73d66 o sample project for testing depMap calcs 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721065 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-27 02:00:04 +00:00
Britton Isbell cca34331f3 Reduced duplicate code between PomTransformer and PomClassicTransformer. The PomTrasnformer is now a concrete base class. The PomClassicTransformer extends it, overriding how interpolation is done, to handle interpolation of values related to project directories. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720292 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-24 21:08:35 +00:00
Britton Isbell 0b4c2c9222 PomClassicTransformer now inheriting from PomTransformer. Removed some of the duplicate methods. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720281 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-24 20:35:39 +00:00
Benjamin Bentmann 1e3c9689c9 o Added task tag to outcommented code 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719928 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-22 22:04:19 +00:00
Benjamin Bentmann b82addba9d o Set svn:eol-style=native 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719861 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-22 15:21:42 +00:00
Benjamin Bentmann f07453ad19 o Removed svn:executable 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719859 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-22 15:19:16 +00:00
Jason van Zyl dc699a5296 o i have moved the listener up to the core as i need to pass in values from the execution request 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719707 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-21 20:52:47 +00:00
Britton Isbell d78042d0d2 More syncs between PomClassicTransformer and PomTransformer 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719494 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-21 06:11:22 +00:00
Britton Isbell 443d49730e Added in listeners to PomTransformers. Fixed a couple of rules. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719487 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-21 05:54:01 +00:00
Britton Isbell 5400908c56 Updated URIs for transformer. fixed NPE on preprocess. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719485 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-21 05:47:29 +00:00
Britton Isbell dae9c8fdb7 Import of maven-project-builder. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719474 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-21 04:52:08 +00:00
Britton Isbell e96229a165 Reverting back changes. It's building locally but breaking on Hudson. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@706231 13f79535-47bb-0310-9956-ffa450edef68
 2008-10-20 11:06:03 +00:00
Britton Isbell d733885e54 Hooked up maven-project-builder into build. Updated classes. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@706143 13f79535-47bb-0310-9956-ffa450edef68
 2008-10-20 07:57:44 +00:00
Britton Isbell 3412160ab7 Copied over some of the builder classes to new module. These are Maven extensions to the shared builder but they have no Maven trunk dependencies. There will be extensions to these classes to support Mercury. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@706133 13f79535-47bb-0310-9956-ffa450edef68
 2008-10-20 07:00:14 +00:00