Commit Graph

7084 Commits

Author SHA1 Message Date
Benjamin Bentmann 38aaa7cc5a o Fixed dependency resolution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747418 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 16:28:06 +00:00
Britton Isbell e668c88d56 Reenable classpath UT.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747413 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 16:18:34 +00:00
Britton Isbell 04475b691b Cleaned up rules. Removed mercury dependencies.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747378 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 13:35:47 +00:00
Britton Isbell ceaa949f1e Small change in mercury build file to use correct assembly location.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747152 13f79535-47bb-0310-9956-ffa450edef68
2009-02-23 21:49:48 +00:00
Jason van Zyl 00c302e021 o checking in so that oleg and shane can see the changes, there are three failing tests. i'm fixing in the plane and will check in when i land
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746850 13f79535-47bb-0310-9956-ffa450edef68
2009-02-23 00:04:14 +00:00
Benjamin Bentmann 63c695adaa o Fixed artifact filter propagation
o Added task tag for bug in resolution of system-scope dependencies

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746832 13f79535-47bb-0310-9956-ffa450edef68
2009-02-22 21:58:50 +00:00
Benjamin Bentmann 38e7799397 o Partly reverted r746431 to restore backward-compat with plugins like Surefire that access this field directly for manual container lookups
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746819 13f79535-47bb-0310-9956-ffa450edef68
2009-02-22 21:01:29 +00:00
Benjamin Bentmann dee79ea2dc o Fixed dependency resolution (the dependency artifacts are cached so we can't employ the scope filter here)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746818 13f79535-47bb-0310-9956-ffa450edef68
2009-02-22 21:00:18 +00:00
Benjamin Bentmann ca7b1b784b o Fixed test descriptors due to r746432
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746807 13f79535-47bb-0310-9956-ffa450edef68
2009-02-22 20:06:57 +00:00
Jason van Zyl 69777c2ea2 o remove wagon manager from the request populator
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746531 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 16:15:26 +00:00
Benjamin Bentmann 8cb5aa6172 o Inherited from maven-parent:11
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746472 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 09:39:56 +00:00
Herve Boutemy 06dca8e528 fixed bootstrap problem to resolve Modello 1.0.1-SNAPSHOT dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746453 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 08:26:24 +00:00
Oleg Gusakov 93ff4ffc2b [MNG-3969] mercury-ant global exclusions work, bad metadata is partially addressed, maven bootstrap compiles fine
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746448 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 07:46:00 +00:00
Jason van Zyl b4257bad3b o use RepositorySystem and LegacyRepositorySystem
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746432 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 03:22:21 +00:00
Jason van Zyl a85440fe92 o use annotations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746431 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 03:10:57 +00:00
Jason van Zyl 41001b509d o removed all but one component reference of the legacy artifact code in the plugin manager
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746430 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 02:46:14 +00:00
Jason van Zyl db63dc78c0 o taking more legacy artifact components out of the plugin manager
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746336 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 18:52:57 +00:00
Jason van Zyl f6d25b36f8 o remove legacy artifact component references from the embedder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746311 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 18:03:46 +00:00
Britton Isbell dd676fd685 Cleanup up some methods. Removed mixins from interfaces.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746288 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 16:33:41 +00:00
Jason van Zyl ec84760e04 o drop back to modello 1.0 for the bootstrap
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746286 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 16:31:26 +00:00
Jason van Zyl a8cd789425 o first push of a plug point for repository/transport in maven
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746285 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 16:27:27 +00:00
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