Commit Graph

7394 Commits

Author SHA1 Message Date
Benjamin Bentmann 9b6716c552 o Restored backward-compat with maven-assembly-plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749982 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 12:38:00 +00:00
Benjamin Bentmann 374ef3a15b o Fixed resolution of project dependencies for plugin execution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749974 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 12:12:45 +00:00
Benjamin Bentmann 5ad4dc1cc6 o Restored compat with 2.x where the root is not resolved for ArtifactResolver.resolveTransitively()
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749968 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 11:35:58 +00:00
Benjamin Bentmann fd7b2b7985 o Updated to maven-jar-plugin:2.2 (by inheritance from parent) to get proper reactor resolution of test JARs due to MJAR-75
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749952 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 09:34:54 +00:00
Benjamin Bentmann 11a0d7d345 o Reinstantiated repository fixups
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749950 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 09:25:41 +00:00
Benjamin Bentmann 1b0a7e4c6b o Fixed project name
o Removed superfluous whitespace

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749947 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 09:10:20 +00:00
Jason van Zyl c8d4f4240b o note about doxia, it's not to be updated in 3.x
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749930 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 07:15:50 +00:00
Jason van Zyl beedf0cf7b o restore profile manager location so that the site plugin works ...
o teach the resolution to understand when the root is local with a file present versus retrieving the root as well          


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749924 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 06:58:09 +00:00
Oleg Gusakov eb8855fab8 [MNG-3849] mercury build - added path resolution timestamping, removed path output
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749917 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 05:59:25 +00:00
Oleg Gusakov 7d8f206bc2 [MNG-3849] had to add a lot of test deps - will remove when collapsed mercury
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749915 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 05:53:59 +00:00
Oleg Gusakov 645bfdaeda [MNG-3849] test harness
- legacy system UT placeholder

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749912 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 05:51:33 +00:00
Oleg Gusakov 504128e0ba uprev model-builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749908 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 05:31:10 +00:00
Britton Isbell 1492907f1b Updated to use latest model-builder. Now detect most specialized model through method, not order of domain model list.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749870 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 01:05:58 +00:00
Oleg Gusakov 9ef5c6edbe [MNG-3849] test harness
- abstract test for testing all repository system implementations
- mercury implementation test

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749864 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 00:48:34 +00:00
Oleg Gusakov 245ff008fc [MNG-3849] - moved maven-repository tests into test scope
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749861 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 00:37:54 +00:00
Oleg Gusakov fca57c3241 [MNG-3849]
- abstract test for testing all repository system implementations
- mercury implementation test

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749858 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 00:28:50 +00:00
Oleg Gusakov 892ade6462 [MNG-3849] - added test dependencies for repository UTs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749843 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 23:32:36 +00:00
Jason van Zyl 3d883f3a9f o inject the logger
o formatting

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749825 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 23:07:51 +00:00
Benjamin Bentmann 5c0715ceef o Added explicit repo ids (using the URL for maven-metadata-<id>.xml doesn't work overly well on Windows)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749822 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 23:04:39 +00:00
Benjamin Bentmann 6a64ca3cc3 o Removed superfluos repo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749819 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 23:00:24 +00:00
Jason van Zyl 914d340b45 o use released model-builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749815 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 22:52:39 +00:00
Jason van Zyl 141083a2ae o place execute method first
o inject the logger


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749807 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 22:36:48 +00:00
Oleg Gusakov b914c57e10 changed default logging level for mercury ant
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749789 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 22:06:55 +00:00
Benjamin Bentmann b3d226a90b o Pushed online network state down into artifact resolver where it actually matters
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749788 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 22:06:49 +00:00
Jason van Zyl a5fc1cfb14 o fix the mirroring code
o restore ArtifactResolver.resolve( artifact, remotes, local ) for the rr plugin


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749784 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 21:56:42 +00:00
Britton Isbell c5938b5d12 Added unit test for mng-3900
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749774 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 21:52:33 +00:00
Britton Isbell d05439959c Added unit test for mng-3900
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749773 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 21:52:12 +00:00
Benjamin Bentmann 3e7be3ad1f o Restored isolation of model in forked lifecycle
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749738 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 20:39:51 +00:00
Britton Isbell c151f2925f Profile tests. Fixes for negation activation.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749717 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 19:57:01 +00:00
Benjamin Bentmann e417b541e0 o Fixed resolution of local projects from reactor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749687 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 18:42:34 +00:00
Benjamin Bentmann 0c988fc7a9 [MNG-4056] Relax resolution of active project artifacts from the reactor with regard to artifact type
o Merged from r749612

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749616 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 13:47:47 +00:00
Benjamin Bentmann c9514a39f5 o Fixed ConcurrentModificationException
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749595 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 12:25:22 +00:00
Benjamin Bentmann aa74529144 o Added generics
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749586 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 11:48:20 +00:00
Benjamin Bentmann 13680356a5 o Added IDE files to svn:ignore
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749568 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 09:06:18 +00:00
Oleg Gusakov 65a8daef73 [MNG-3849] - added placeholders for separating metadata resolution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749543 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 06:28:20 +00:00
Oleg Gusakov c3ef515d0e [MNG-3849] - cleaner names
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749541 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 06:16:06 +00:00
Oleg Gusakov aece478e1e [MNG-3849] - created Mercury adaptor project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749540 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 06:11:51 +00:00
Oleg Gusakov 2aabec225e [MNG-3849] initial import
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749539 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 06:09:26 +00:00
Jason van Zyl 3b31023865 o if there was no metadata resolved then don't try to resolve artifacts
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749535 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 05:35:38 +00:00
Jason van Zyl 8fede74822 o adding backward compat for Surefire
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749494 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 00:33:58 +00:00
Benjamin Bentmann 352fd0a543 o Fixed handling of plugin groups
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749493 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 00:33:55 +00:00
Jason van Zyl d670f82e62 o don't need WagonManager anymore
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749489 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 00:24:15 +00:00
Jason van Zyl 781d7091cb o further culling fields from the resolution request
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749484 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 00:14:44 +00:00
Benjamin Bentmann ed6f76548b o Added generics
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749482 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 00:00:40 +00:00
Jason van Zyl cfbb4c4f54 o clean up unused methods in the resolution request
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749480 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 23:58:51 +00:00
Benjamin Bentmann 3a731303a7 o Updated to model-builder:1.4
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749476 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 23:34:15 +00:00
Jason van Zyl 47971a16a1 o fixing failing project building tests as a result of consolidating the artifact resolution code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749460 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 22:40:17 +00:00
Jason van Zyl 92a962c9e1 o fixes for failing tests, there is much confusion between metadata and artifacts, requests made and real values returned.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749414 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 19:01:37 +00:00
Jason van Zyl 613253dda7 o trying to use the request/result pattern everywhere
o remove another use of ResolutionGroup in the core
o remove all the deprecated methods in the resolver, we'll see what breaks and we'll restore in maven-compat


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749407 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 18:42:31 +00:00
Benjamin Bentmann 7c537105b2 o Fixed profile injection
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749386 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 17:58:15 +00:00