Commit Graph

6963 Commits

Author SHA1 Message Date
Oleg Gusakov c4db569df7 [MNG-3969] downgraded mercury version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746147 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 05:29:53 +00:00
Britton Isbell b1638bbbe7 Fixed a class cast exception that shows up in mercury use of transformer. Regression from previous refactor.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746135 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 04:49:53 +00:00
Herve Boutemy 70895b5f43 o used exception chaining as much as possible
o added generics to PomProcessor
o fixed code style

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746072 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 00:41:01 +00:00
Oleg Gusakov 0c1aaae366 [MNG-3969] debugging bootstrap
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746035 13f79535-47bb-0310-9956-ffa450edef68
2009-02-19 22:24:58 +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
Herve Boutemy 45b99d20cf missed build-mercury.xml when upgrading Modello to 1.0 in r745260
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745971 13f79535-47bb-0310-9956-ffa450edef68
2009-02-19 19:02:40 +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
Oleg Gusakov 4e1fc45f7e [MNG-3969] removed explicit local repo from temporary bootstrap script
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745635 13f79535-47bb-0310-9956-ffa450edef68
2009-02-18 20:17:08 +00:00
Oleg Gusakov e39657bd9e [MNG-3969] added a temporary bootstrap script to bypass xml stream factory issues for mercury-ant
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745633 13f79535-47bb-0310-9956-ffa450edef68
2009-02-18 20:12:33 +00:00
Oleg Gusakov 0235b8e9c1 [MNG-3969] intermediate commit - all dependencies are processed correctly, including modello. Problem was stale cached metadata. Also upreved to the released mercury
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745629 13f79535-47bb-0310-9956-ffa450edef68
2009-02-18 19:52:54 +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
Oleg Gusakov 09bd331c5a [MNG-3969] intermediate commit - need help to identify stax problem
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745311 13f79535-47bb-0310-9956-ffa450edef68
2009-02-18 00:25:15 +00:00
Herve Boutemy 3d52a23b10 o upgraded Modello version to 1.0
o improved models to use Modello new features (merged from 2.1.x branch r745216)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745260 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 21:46:38 +00:00
Benjamin Bentmann 29df2bf1bf [MNG-3732] [regression] project.getActiveProfiles() has not the same behaviour
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745259 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 21:21:35 +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 759769900d [MNG-4035] - Removing plugin manager changes. This is breaking tycho build and also causes a hefty performance hit. Using mixins is over-generalizing this solution. Only need to cleanup config merging.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745040 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 13:13:49 +00:00
Benjamin Bentmann 55fe596230 [MNG-4037] Include Java home in version information
o Merged from r744645

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744647 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 10:18:00 +00:00
Benjamin Bentmann fac6b97faf o Generified model/project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744572 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 21:49:23 +00:00
Benjamin Bentmann fda7685244 [MNG-4036] [regression] Maven 3.x can't resolve parent POMs from repositories defined in settings.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744560 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 19:38:53 +00:00
Benjamin Bentmann 90e6b3ecb8 [MNG-4034] dependency version is not inherited from parent dependencyManagement
o Added UT

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744254 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 21:47:45 +00:00
Britton Isbell 0abb04c8bb [MNG-3631] Mojo Configuration. Allow embedder to get executions by goal, query config with xpath and execute mojo.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744145 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 15:39:54 +00:00
Oleg Gusakov 90ee1deab0 [MNG-4033] downgrade to the latest mercury release
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743991 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 05:25:41 +00:00
Oleg Gusakov c1368df785 [MNG-4033] found more appropriate injection point for password encryption
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743948 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 01:42:38 +00:00
Oleg Gusakov e07ccacaf2 [MNG-4033] found more appropriate injection point for password encryption
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743947 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 01:38:15 +00:00
Oleg Gusakov 48398db0e4 disabled maven-mercury test to move it to Mercury ITs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743919 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 23:00:22 +00:00
Herve Boutemy dc29595f98 fixed coding style
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743918 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 22:58:36 +00:00
Oleg Gusakov f3755e8c71 uprev to mecrury 1.0-alpha-5, disabled maven-mercury test to move it to Mercury ITs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743916 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 22:54:21 +00:00
Oleg Gusakov 9f80bf1e63 [MNG-4033] migrated password encryption from 2.1.x trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743914 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 22:44:08 +00:00
Oleg Gusakov b88e78ae1d [MNG-4033] migrated password encryption from 2.1.x trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743913 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 22:43:32 +00:00
Oleg Gusakov 9737a2f1d9 [MNG-4033] migrated password encryption from 2.1.x trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743912 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 22:42:53 +00:00
Oleg Gusakov 84e363c313 [MNG-4033] migrated password encryption from 2.1.x trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743907 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 22:24:36 +00:00
Britton Isbell 9863957196 [MNG-3862] Remove all plugin configuration manipulation from the plugin manager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743225 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 04:56:35 +00:00
Jason van Zyl dd564ae3bd o use annotations for the remainder of the maven-artifact code
o update to latest release of plexus which fixes super/subclass annotation processing



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743174 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 00:05:47 +00:00
Benjamin Bentmann c303c49d71 [MNG-4027] [regression] Injection of dependencies from profiles crashes project builder
o Added UT

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743083 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 20:20:47 +00:00
Britton Isbell 6032251645 Fixed path problem on unit test.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742760 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 22:00:52 +00:00
Jason van Zyl 1b36ff52dd o last bit i need to in trunk before merging to my branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742684 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 19:16:02 +00:00
Jason van Zyl 1ef89c5f7b o no ids, i'll get rid of them all but i want byte for byte sameness before i push my work back to trunk.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742676 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 19:04:14 +00:00
Jason van Zyl 8ecae9a554 o removing maven 1.x related files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742674 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 18:59:19 +00:00
Jason van Zyl 1da74993a9 o getting rid of $Id$
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742673 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 18:56:31 +00:00
Jason van Zyl 50dc057e54 o getting rid of ID tags, diffs in non-svn tools are not _exactly_ the same. i like seeing the authors, i can look in subclipse to see the detailed list of changes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742665 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 18:24:39 +00:00
Britton Isbell 778f044ed9 [MNG-2174] Profile bug dealing with dependencies : [MNG-3877] Reporting directory base aligned.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742594 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 16:10:48 +00:00
Britton Isbell 2f8742ae19 [MNG-3995] Config property lost
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@741596 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 15:38:08 +00:00
Benjamin Bentmann 6c591d981d o Added temp fix for snapshot dependency in bad release
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@741527 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 10:55:30 +00:00
Benjamin Bentmann 3677655284 o Formatted POM
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@741525 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 10:53:39 +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 3ccd647208 Fixed broken poms.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@740797 13f79535-47bb-0310-9956-ffa450edef68
2009-02-04 17:07:25 +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