Commit Graph

7048 Commits

Author SHA1 Message Date
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
Britton Isbell 70583e8717 Build broken. Disabled mercury unit test, until issue is fixed.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732235 13f79535-47bb-0310-9956-ffa450edef68
2009-01-07 06:01:48 +00:00
Oleg Gusakov 6b1e9b923d looks like I added a file by mistake. Don't know where it came from - contains a copy of maven POM, should it be ignored instead - as a build product?
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732110 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 20:46:47 +00:00
Oleg Gusakov bea79ffe1d added a unit test for un-substituted variable
Issue id: MNG-3856


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732103 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 20:35:12 +00:00
Britton Isbell fb1c3cc39a Updated spec. Includes the Model Container Operator definitions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731613 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 16:35:05 +00:00
Jason van Zyl 481cde5756 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731333 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:28 +00:00
Jason van Zyl 6991c79e34 [maven-release-plugin] prepare release maven-3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731331 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:05 +00:00
Jason van Zyl 96ad021c1d o notes about the RuntimeInfo class and the Settings object used in the release plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731276 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:41:15 +00:00
Jason van Zyl 1b59d7556f o note in the settings.mdo file about the release plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731275 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:36:11 +00:00
Jason van Zyl 80a6a03dd6 o get rid of debug output
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731274 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:32:55 +00:00
Jason van Zyl bfe3cbf4e9 o the release plugin manages to somehow get its own instance of a Settings so the SettingsAdapter which I use everywhere else gets used except in the release plugin so I have to jack back in the hardcoded RuntimeInfo until I figure out why. not a big deal, i'll list it in the compatibility notes. on another note if you start the release process using release:prepare and it fails, you make code changes, it will happily let you continue and not check the status again.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731273 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:32:19 +00:00
Jason van Zyl cc38a455f7 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731271 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:29:07 +00:00
Jason van Zyl bab3480d4b [maven-release-plugin] prepare release 3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731269 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:28:42 +00:00
Jason van Zyl 59e207e530 o adding runtime info to the settings adapter
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731173 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 04:43:10 +00:00
Jason van Zyl ac091b558c o adding some capatibility for plugins and components that use settings directly.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731172 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 04:42:36 +00:00
Jason van Zyl f7c2d16ee6 o we'll just stick with tex
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731163 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 03:37:40 +00:00
Jason van Zyl ab9347bc76 o there is a subtle realm problem with plexus and under certain conditions (release deploys) the wagon manager used to populate auth info is not the same as used by the wagon manager. this is fixed in subsequent releases of plexus but i'm not testing everything again so i'm using a static map as a work around. when alpha-1 is released i'll bump the version of plexus and test again.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730868 13f79535-47bb-0310-9956-ffa450edef68
2009-01-02 23:35:29 +00:00
Benjamin Bentmann 6a3afa1c46 [MNG-1349] openssl checksums are not accepted by maven
o Merged from r730631

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730635 13f79535-47bb-0310-9956-ffa450edef68
2009-01-01 23:14:07 +00:00
Benjamin Bentmann 970065b4bd [MNG-3424] Respect ordering of elements as given in POM
o Merged from r708871

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730079 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 09:33:02 +00:00
Britton Isbell a64d505aa3 Fix: MNG-3927
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730028 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 01:33:12 +00:00
Britton Isbell 269c07916e Removing final from class. Tycho has a case where it needs to extend.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729996 13f79535-47bb-0310-9956-ffa450edef68
2008-12-29 21:04:50 +00:00
Benjamin Bentmann da66dd9fd4 [MNG-3933] Profiles.xml does not pickup OS family
Submitted by: Pawel Paprota

o Merged from r729785

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729787 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 22:09:20 +00:00
Benjamin Bentmann 72a871c1b2 o Consequently used http://maven.apache.org/xsd/* for the schema locations (merged from r729738)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729741 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 14:00:38 +00:00
Herve Boutemy 35472a49f5 o Consequently used http://maven.apache.org/xsd/* for the schema locations (see r729720) (merged from 2.0.10RC branch r729731)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729734 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 13:35:32 +00:00
Benjamin Bentmann d639132f0b o Fixed file checks
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729517 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 17:55:13 +00:00
Benjamin Bentmann 4cc361f4ff o Created UT from MNG-3944
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729514 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 17:22:22 +00:00
Benjamin Bentmann 8d845eaa55 o Created UT from MNG-3822
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729511 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 16:56:31 +00:00