6874 Commits

Author SHA1 Message Date
Benjamin Bentmann
8bc517009b o Created UT for MNG-2591
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737078 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 16:44:14 +00:00
Benjamin Bentmann
67c93459cc o Created UT for MNG-3836
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737071 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 16:28:48 +00:00
Benjamin Bentmann
2e4285f616 o Created UT for MNG-3864
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737066 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 16:06:37 +00:00
Benjamin Bentmann
04a020ea5a o Created UT for MNG-3827
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737056 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 15:35:43 +00:00
Britton Isbell
f4e6bfebd3 Using release version of plexus.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736749 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 19:16:56 +00:00
Britton Isbell
92f4a49a6b Updated plexus version to latest snapshot.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736714 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 17:06:19 +00:00
Britton Isbell
34aceea2eb Added #set to URI configurations. Fixed problem where execution rule was joining all collections, not just goals.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736578 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 06:53:25 +00:00
Britton Isbell
c688a8266d MNG-3964: Execution ID rules added to spec.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736554 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 04:14:27 +00:00
Britton Isbell
496d8ffcb4 MNG-3997: If one ModelProperty property URI starts with another ModelProperty URI and both are empty and both are consecutive in the pom, then the first tag was not being closed on unmarshalling to XML.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736541 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 03:18:20 +00:00
Britton Isbell
15f10579d7 Fix: MNG-3965
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736386 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 19:31:48 +00:00
Britton Isbell
01e602351c Unit test for MNG-3965
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736373 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 18:53:00 +00:00
Britton Isbell
b77af2e2e6 MNG-3985
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736294 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 11:58:50 +00:00
Britton Isbell
4247360de9 MNG-3973
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736283 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 10:56:31 +00:00
Britton Isbell
68d8ce9d34 MNG-3979.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736252 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 07:35:33 +00:00
Britton Isbell
01f81a5d11 MNG-3821
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736246 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 06:51:52 +00:00
Britton Isbell
04833ce768 MNG-3984
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736236 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 06:20:34 +00:00
Britton Isbell
036d5932e1 MNG-3937 - goals inheritance.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736233 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 05:58:52 +00:00
Vincent Siveton
e97df44d2c o bump to maven-stylus-skin:1.1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@735000 13f79535-47bb-0310-9956-ffa450edef68
2009-01-16 13:37:30 +00:00
Oleg Gusakov
0e25f639fe organized imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@734852 13f79535-47bb-0310-9956-ffa450edef68
2009-01-15 23:40:21 +00:00
Benjamin Bentmann
27d2e3c058 [MNG-2605] Profiles in profiles.xml are active by default
o Merged from r734803

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@734810 13f79535-47bb-0310-9956-ffa450edef68
2009-01-15 20:30:50 +00:00
Benjamin Bentmann
5872cd6d2e [MNG-3955] [regression] ${settings.localRepository} does not reflect actual repo path if maven.repo.local used
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@734219 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 19:01:21 +00:00
Benjamin Bentmann
ef18c490e4 o Made bootstrap smart enough to use correct maven home path regardless of user input
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@734204 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 18:18:03 +00:00
Benjamin Bentmann
40e357e21f o Deleted empty directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@734150 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 15:12:06 +00:00
Benjamin Bentmann
62e2d40504 [MNG-3988] [regression] Profiles.xml is not processed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@734142 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 14:33:39 +00:00
Jason van Zyl
f1ba2636b4 o fix location of assembly, needs to be centralized
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733919 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 21:54:28 +00:00
Jason van Zyl
219616a557 o change module name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733847 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 17:26:35 +00:00
Jason van Zyl
a37996d04b o change the artifact id to match
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733846 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 17:18:11 +00:00
Jason van Zyl
4611e43a15 o everyone is having problems with this not name as the artifact we ship with and we can't change it from apache-maven now so back it goes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733845 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 17:16:22 +00:00
Britton Isbell
192af339c6 Final fix for the problem where snapshot plugin repositories from external profiles were not being used. Added code for setting remote repos to MavenProject, after profile injection.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733655 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 09:02:50 +00:00
Britton Isbell
9c67a22ddc Profile Injector was missing injecting of plugin repositories from settings file. Fixes this.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733648 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 08:22:15 +00:00
Britton Isbell
a457427433 Fix: Different types of ID Model containers were being joined if their ids matched. Now we have one ID model container factory instance per type.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733637 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 07:00:09 +00:00
Britton Isbell
e3385f5e0e Added #collection to repositories/pluginRepositories URI's to allow more than one in the pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733632 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 06:12:02 +00:00
Jason van Zyl
bd85732ce2 o mercury settings were not right
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733579 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 01:56:57 +00:00
Jason van Zyl
e696de926b o adding the mercury ant tasks
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733577 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 01:54:11 +00:00
Jason van Zyl
539040db95 o start flipping over the bootstrap to mercury
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733575 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 01:47:58 +00:00
Jason van Zyl
e46b526820 MNG-3960: update plexus which allow the operation of the plexus-maven-plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733564 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 01:09:29 +00:00
Benjamin Bentmann
8e3adc631c o Created UT for MNG-3979
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733262 13f79535-47bb-0310-9956-ffa450edef68
2009-01-10 10:46:00 +00:00
Benjamin Bentmann
cb68caf9dd o Removed empty directories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733260 13f79535-47bb-0310-9956-ffa450edef68
2009-01-10 10:34:41 +00:00
Britton Isbell
e3bde472f9 Fix: MNG-3978
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733133 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 19:44:19 +00:00
Brian E Fox
9c7e082906 MNG-3974 - stop on first mirror pattern match (fix to handle repeated entires)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733071 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 15:50:31 +00:00
Brian E Fox
6034e26622 MNG-3974 - stop on first mirror pattern match
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733063 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 15:34:41 +00:00
Jason van Zyl
92129e51a3 o as we collect rules embedded we'll capture the here fast before we forget, we can put them in the spec prop later
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733053 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 15:02:02 +00:00
Britton Isbell
647a0112cc Fix: MNG-3943
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733036 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 13:42:37 +00:00
Britton Isbell
b4931fef14 Updated spec with profile info.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733028 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 13:11:19 +00:00
Oleg Gusakov
8cd715bc5e [MNG-3973] masked NPE when parent metadata cannot be found
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732937 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 06:09:09 +00:00
Jason van Zyl
fe6d32bd6c MNG-3961: reverted the addition and we'll deal with this later properly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732936 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 06:06:32 +00:00
Jason van Zyl
cfbcba22a8 MNG-3586: system scope is working again, the IT does not appear to work on OS/X. Both 2.0.9 and this snapshot fail the first test of the IT. Brian helped me verify and on Windows with 2.0.9 and this snapshot both tests pass.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732929 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 05:34:14 +00:00
Britton Isbell
c4782c4a38 Fix: 3944 - we can just use the existence of the project directory to determine whether it is in the build. This will be a contract of the setProjectDirectory method
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732683 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 11:12:11 +00:00
Britton Isbell
f3c978e962 Fix: MNG-3938
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732344 13f79535-47bb-0310-9956-ffa450edef68
2009-01-07 14:03:06 +00:00
Britton Isbell
e52473272d Fix: MNG-3856 - Just needed to replace modelProperty.getValue with modelProperty.getResolvedValue.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732286 13f79535-47bb-0310-9956-ffa450edef68
2009-01-07 09:40:40 +00:00