Commit Graph

6580 Commits

Author SHA1 Message Date
Benjamin Bentmann 42f59de75d o Set svn:eol-style=native
o Added svn:keywords

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720480 13f79535-47bb-0310-9956-ffa450edef68
2008-11-25 12:33:22 +00:00
Benjamin Bentmann c7c009c6d3 o Removed IDE file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720478 13f79535-47bb-0310-9956-ffa450edef68
2008-11-25 12:22:01 +00:00
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 d486ebbe5c [MNG-3664] Various unit tests from maven-core fail when run from a directory with space in its path
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720050 13f79535-47bb-0310-9956-ffa450edef68
2008-11-23 21:42:00 +00:00
Benjamin Bentmann 4310dd2c51 [MNG-3544] Beautify debug output for mojo parameters of type array
o Merged r720042 from maven-2.0.x

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720045 13f79535-47bb-0310-9956-ffa450edef68
2008-11-23 21:17:34 +00:00
Benjamin Bentmann 9811be2c3e [MNG-3787] Add plugin version to default reports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@720001 13f79535-47bb-0310-9956-ffa450edef68
2008-11-23 16:09:58 +00:00
Jason van Zyl c0bbd26f11 MNG-3865: Allow the generation of the component.xml files from the bootstrap so that we can start eliminating the hand-written versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719931 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 22:26:16 +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 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 06f0e84b0a [MNG-3796] Class loader inconsistency when loading classes imported from core realm
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719922 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 21:21:40 +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
Benjamin Bentmann 0ffab5354e o Extended svn:ignore with more IDE files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719865 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 15:38:18 +00:00
Benjamin Bentmann 6b8faaeffc o Added svn:keywords
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719862 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 15:23:49 +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
Oleg Gusakov b75bdaee71 removing eclipse specific files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719776 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 01:11:53 +00:00
Oleg Gusakov 72cc97e2e9 removing eclipse specific files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719775 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 01:11:08 +00:00
Oleg Gusakov 9f3c510c24 removing eclipse specific files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719774 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 01:10:28 +00:00
Oleg Gusakov 4a49883d58 removing eclipse specific files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719773 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 01:09:54 +00:00
Oleg Gusakov aaa3637333 removing eclipse specific files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719772 13f79535-47bb-0310-9956-ffa450edef68
2008-11-22 01:09:15 +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
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 5d0a16c182 Removed maven-shared model. It is now located in shared trunk.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719516 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 07:04:44 +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 1f9bf0c917 Import of maven mercury project.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@719473 13f79535-47bb-0310-9956-ffa450edef68
2008-11-21 04:50:50 +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 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