Commit Graph

6545 Commits

Author SHA1 Message Date
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 a461aa6137 o turning this test off as the much stricter lookups require this be adjusted. it's a feature no one uses in this way yet.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718850 13f79535-47bb-0310-9956-ffa450edef68
2008-11-19 03:21:07 +00:00
Jason van Zyl 17d68dbce5 o adding some patches for changes in plexus
submitted by: Dain Sundstrom


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718845 13f79535-47bb-0310-9956-ffa450edef68
2008-11-19 02:31:49 +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 50bfa25053 Modello pom parser fails if it contains an '&'. Put these in a CDATA.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718451 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 00:45:39 +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 3fb0c8514f Fixed pom to correct snaphost dependency version.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718303 13f79535-47bb-0310-9956-ffa450edef68
2008-11-17 18:00:22 +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 3164c0088f o fixing component-metadata version. Thanks Benjamin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718055 13f79535-47bb-0310-9956-ffa450edef68
2008-11-16 16:23:54 +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
Benjamin Bentmann 378ee24d22 [MNG-3797] RealmUtils.create*Id() does not properly separate multiple threads
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@714067 13f79535-47bb-0310-9956-ffa450edef68
2008-11-14 16:49:04 +00:00
Benjamin Bentmann 1f6060121d [MNG-3839] XML parsing of POM does not reliably coalesce text data
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@714059 13f79535-47bb-0310-9956-ffa450edef68
2008-11-14 16:26:08 +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 f870fa638d Dedup interpolator property in list.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713505 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 20:47:14 +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
Benjamin Bentmann 4378d40c7b [MNG-3813] Plugin class path does not respect ordering of plugin dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713438 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 17:53:24 +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
Britton Isbell cac8f6eedf Fix for IT 3833. New implementation does multiple interpolation iterations, until it detects that there is no longer a change in the list.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713266 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 05:17:42 +00:00
Jason van Zyl f261031443 o updating to the new release of plexus to remove the remaining plexus IT related problem. the alpha-1 is hopefully possible now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713245 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 02:10:33 +00:00
Benjamin Bentmann 57171cb4aa [MNG-3503] Shade MX* classes from plexus-utils
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713202 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 22:34:59 +00:00
Benjamin Bentmann 803e95b370 o Synced dependency on stax-api with the JAR used by Woodstox (due to bad repo metadata, javax.xml.stream:stax-api is not recognized as a conflict/duplicate)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713182 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 21:46:34 +00:00
Benjamin Bentmann 14ef7d204e o Fixed compliance with StAX-API (not all impls accept strings for properties of type Boolean)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713172 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 21:14:02 +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 30f86cb7c8 o Added svn:keywords
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713050 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 14:37:26 +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
Benjamin Bentmann acc8010f45 o Repaired POM
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@709686 13f79535-47bb-0310-9956-ffa450edef68
2008-11-01 12:47:05 +00:00
John Dennis Casey 94bdfa2c7d Merging revIds: 709032, 709208, 709241 from 2.0.x branch for ITs in the bootstrap.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@709254 13f79535-47bb-0310-9956-ffa450edef68
2008-10-30 21:46:48 +00:00
Herve Boutemy c6a9575ad1 use descriptors attribute of maven-assembly-plugin instead of descriptor, which is deprecated (merged from 2.0.x branch, r706409)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@706411 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 21:02:39 +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
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 7c54aada90 Fix: IT 3746, 102, 0043 - Merged out some previous changes to PluginParameterExpressionEvaluator.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@704797 13f79535-47bb-0310-9956-ffa450edef68
2008-10-15 06:57:37 +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