Commit Graph

736 Commits

Author SHA1 Message Date
Jason van Zyl c418d12814 o primarily refactoring in part for the preparation making room for mercury and processing events from maven-shared-model
o add plexus component descriptor generation to the bootstrap so we can start removing the hand-written descriptors and start
  using annotations everywhere



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720432 13f79535-47bb-0310-9956-ffa450edef68
2008-11-25 07:11:35 +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
Britton Isbell f312012e8a PomClassicTransformer now using a factory to create domain model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720277 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 20:25:40 +00:00
Benjamin Bentmann 39d13c66a6 [MNG-3845] Unintended inheritance of parent elements overriden by children
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719930 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 22:10:36 +00:00
Benjamin Bentmann 83440b7c01 [MNG-3843] Main/test resources are not properly inherited
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719921 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 21:18:23 +00:00
Britton Isbell 1c2df46402 Removed reference to listener.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719726 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 21:55:47 +00:00
Britton Isbell 7368eb1216 Moved out specialized methods from PomClassicTransformer to ProjectBuilder. Did this refactoring to make it easier to merge PomTransformer and PomClassicTransfomer.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719724 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 21:50:31 +00:00
Britton Isbell c26b2d69cd Merge of sisbell-maven-3.0-mercury branch to trunk. Includes maven-project-builder component, which breaks out some of the independent project builder classes, so that Mercury does not need to pull in the entire trunk.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719472 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 04:49:46 +00:00
Britton Isbell 95929cf502 Some of the hard-coded URIs for profiles were outdated. This would cause improper matching of profile elements. Fixed this to use ProjectUri, which is always in sync.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719411 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 22:34:51 +00:00
Britton Isbell 6a1f04705c Moved PathTranslator back to project module to fix class reference issue with the enforcer plugin. Added a preprocess method on the ModelTransformer to allow processing of plugin config elements. Need to add information about which elements are collections so they are not lost during a sort.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719406 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 22:19:34 +00:00
Britton Isbell 1f5a668726 Simplified nested if-rules for model container action.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719293 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 17:17:23 +00:00
Benjamin Bentmann d12af86b03 [MNG-3863] Maven erroneously assumes "org.apache.maven.plugins" for dependencies without groupId
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719253 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 15:25:01 +00:00
Britton Isbell e046650597 If DependencyManagement section gave a dependency a scope of provided, then it would not join with a dependency with a scope of compile, causing Nexus build to fail. Fixed this rule for scopes of provided and compile to be treated as same type for purpose of joining.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719151 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 01:31:24 +00:00
Britton Isbell 9982d6b8c7 A number of URIs were missing the #collection element. Fixed this.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719142 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 00:31:14 +00:00
Jason van Zyl f88b524249 o using thread local lookup setting the realm to null once it's done its work with the plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718656 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 17:17:26 +00:00
Britton Isbell d9a4b136c4 Rule: Don't inherit parent relativePath
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718479 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 03:45:09 +00:00
Britton Isbell 00a0f513b1 Fix: interpolator - mavenVersion and maven.version are implicitly set.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718472 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 03:04:29 +00:00
Britton Isbell ed4083c93f Problem in merging artifact containers, where one container specified a default type value (jar) and the other did not. They were treated as different types. Fixed this.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718375 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 20:59:05 +00:00
Britton Isbell 629c12ae80 Configured build extension listener to only fire on poms within the build.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718176 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 06:23:46 +00:00
Jason van Zyl eec6ed1e2c o adding new logic to process build extensions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718165 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 03:23:35 +00:00
Jason van Zyl 56986ca004 o use the class lookup method which will now automatically partition lookups based on the class
submitted by: Dain Sundstrom



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@717964 13f79535-47bb-0310-9956-ffa450edef68
2008-11-16 02:38:13 +00:00
Benjamin Bentmann 0d28d1719a [MNG-3846] Inherited URLs are not automatically extended with the child's artifactId
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@717941 13f79535-47bb-0310-9956-ffa450edef68
2008-11-15 22:35:14 +00:00
Britton Isbell 7de89c1ee9 Checked in support for plugin extension listener. Not using a configurable plexus component yet. The listener is added directly to the transform.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@714122 13f79535-47bb-0310-9956-ffa450edef68
2008-11-14 20:10:52 +00:00
Britton Isbell 1a9ef5d0e0 Added in Project Event Listeners. Still need to hook up a plexus component and a model container factory for configuring listeners.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@714109 13f79535-47bb-0310-9956-ffa450edef68
2008-11-14 19:18:09 +00:00
Britton Isbell 2881df1046 Reversing fix for MNG-3827. This causes regression in MNG-3679.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713525 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 21:51:15 +00:00
Britton Isbell c46e4fd97c Fix for mng-3259.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713483 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 20:01:20 +00:00
Britton Isbell bf5d38a186 Fix for IT 3827. On joins between model containers during the applying of plugin management, transform rule was reversing the plugin config element order. Now do a reverse sort prior to join, so elements end up in correct order.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713429 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 17:31:07 +00:00
Benjamin Bentmann 07fb543422 [MNG-3831] Expressions without project/pom prefix are no longer interpolated with model values
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713052 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 14:44:19 +00:00
Benjamin Bentmann cd04c1d85a o Set svn:eol-style=native
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713049 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 14:35:30 +00:00
Britton Isbell 1249c89962 Fix for it0141
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@712680 13f79535-47bb-0310-9956-ffa450edef68
2008-11-10 15:44:37 +00:00
Britton Isbell 6468b08bda Fix for IT 3821.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@712621 13f79535-47bb-0310-9956-ffa450edef68
2008-11-10 07:23:45 +00:00
Britton Isbell 9929e8101d Add collection notation to reportSets.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@712619 13f79535-47bb-0310-9956-ffa450edef68
2008-11-10 07:05:45 +00:00
Britton Isbell 4256e417b9 If DistributionManagement site url contains a property, build was failing. This is a quick fix and will still not return the correct URL. The problem is that interpolation occurs after inheritance and resolving URLs based on a parent is an inheritance issue.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@711888 13f79535-47bb-0310-9956-ffa450edef68
2008-11-06 16:12:17 +00:00
Britton Isbell 3d85fa7874 Fix for IT 2695. Two plugins with different executions that had same id were merging. Created a different container for execution ids, so that they can be queried per plugin, rather than globally.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@711743 13f79535-47bb-0310-9956-ffa450edef68
2008-11-05 23:42:32 +00:00
Britton Isbell 824e2eefe7 Fix for IT 3134.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@711707 13f79535-47bb-0310-9956-ffa450edef68
2008-11-05 21:46:12 +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 360954e6bc Fix: IT0141
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@705183 13f79535-47bb-0310-9956-ffa450edef68
2008-10-16 09:16:15 +00:00
Britton Isbell bedc1d7a2b Fix: IT0469 - Rule: join configs of build/plugins/plugin and reporting/plugins/plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@705167 13f79535-47bb-0310-9956-ffa450edef68
2008-10-16 08:06:38 +00:00
Britton Isbell 655cda05dc Fix for IT100. During interpolation, something with 'parent.' needs to be aliased: 'project.parent.' I'm not sure that this is good behavior, given that someone may use 'parent. in their own context.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@704423 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 09:56:13 +00:00
Jason van Zyl 779680fe7f o silence more of the logging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700873 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 19:10:12 +00:00
Jason van Zyl 50828967ee o silence more of the logging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700869 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 19:03:46 +00:00
Jason van Zyl db4675e4bf o get rid of warning and make it debug
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700862 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 18:40:50 +00:00
Britton Isbell 53f0a723c1 Remove println of pom on validation error.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700857 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 18:21:59 +00:00
Britton Isbell a20f8ffee8 Fix: MNG-3392
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700837 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 16:55:35 +00:00
Britton Isbell 2efd58f1cd Missed these classes when I merged out changes related to repository helper.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700820 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 16:10:39 +00:00
Britton Isbell d7ae13be90 Put back in repository helper due to problems of building with clean repo.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700813 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 15:33:08 +00:00
Jason van Zyl e8bf60f962 o start a little caching component that does nothing special now but we need to build it out after the multiple instance problem is corrected, and we decide on the interactions between the metadata layer, project building, the reactor, and workspaces in IDEs.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700758 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 13:07:26 +00:00
Britton Isbell 5fb228063a Much better performance by making the cache static, probably due to multiple instances of ProjectBuilder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700337 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 05:12:33 +00:00