Commit Graph

1075 Commits

Author SHA1 Message Date
Britton Isbell 57756314e2 Support for build extensions. Updated maven-mercury to use latest project builder code. Dumped all references to model-builder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@765684 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 16:50:46 +00:00
Jason van Zyl c2c3134b34 o localizing mercury into the mercury repository implementation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@765273 13f79535-47bb-0310-9956-ffa450edef68
2009-04-15 17:24:22 +00:00
Benjamin Bentmann e203f0c5d3 o Fixed detection of default profiles
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764944 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 20:37:34 +00:00
Britton Isbell c4af0fcde1 Moved interpolation package into builder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764788 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 14:25:47 +00:00
Britton Isbell ae476bf2fa Moved legacy builder code to maven-mercury. Moved over interpolator code from model-builder to maven-project-builder to reduce the dependencies. Reduce the amount of parsing to and from model properties.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764568 13f79535-47bb-0310-9956-ffa450edef68
2009-04-13 19:14:44 +00:00
Paul Gier bd45522faf [MNG-3834] Improve missing version error message.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@764552 13f79535-47bb-0310-9956-ffa450edef68
2009-04-13 18:35:55 +00:00
Britton Isbell e8e1d53e14 Fixed problem where repo count int MavenProject was increasing.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763966 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 16:05:31 +00:00
Britton Isbell 9a4e614d86 [MNG-1995] - interpolation of boolean values.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763351 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 19:00:11 +00:00
Britton Isbell 15ef04371b [MNG-1957] jdk activation for profiles.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763291 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 15:52:32 +00:00
Britton Isbell 85ad173dba [MNG-1412,4027] - dependency order from profile.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763150 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 09:08:03 +00:00
Britton Isbell 2cb49a84ac [MNG-3843] - inheritance of pom description.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@763117 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 06:01:06 +00:00
Britton Isbell 6c6513cad3 [MNG-2174] plugin management dependencies.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@762892 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 18:27:37 +00:00
Britton Isbell 81bd2d7cd1 [MNG-4106] Interpolation does not use properties from dominant settings profile if other profile defines same property.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@762779 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 13:57:19 +00:00
Britton Isbell 57568aa984 [MNG-3545] overridden if profile is activebyDefault. Fixed and added unit test.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@762767 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 13:28:02 +00:00
Britton Isbell d40d830ecd [MNG-3106,3983,4107] - profile fixes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@761825 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 22:35:02 +00:00
Britton Isbell 1c57f3a99b Collapsed the ProfileContext into the ProfileManager - serves similar function.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@761629 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 11:45:45 +00:00
Britton Isbell db49936302 Separated out the interpolation from the build.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@761609 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 10:56:06 +00:00
Benjamin Bentmann d148da84da o Fixed path normalization/alignment
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@761356 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 17:48:00 +00:00
Britton Isbell 38e8586852 Collapsed methods, moved logic for active profiles from ProjectBuilder to ProfileContext.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@761121 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 00:30:00 +00:00
Britton Isbell 421732b443 Further cleanup of maven project APIs.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@761112 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 00:04:51 +00:00
Britton Isbell bd45240fe2 Don't need model in signature for active profiles.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@761108 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 23:21:57 +00:00
Britton Isbell 553c6822f6 Added file.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@761106 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 23:10:00 +00:00
Britton Isbell e2b3bace10 [MNG-4107] ser settings can't override properties used for POM interpolation. Cleaned up the interpolation code and the MavenProjectBuilder impl. Building and interpolation is now more clearly separated.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@761104 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 23:05:27 +00:00
Britton Isbell 8e004afe5f Fixed settings profile activation for maven plugins. Cleaned up project builder. Unit Tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@760635 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 21:07:56 +00:00
Benjamin Bentmann 136bac419e [MNG-4116] [regression] Effective POM contains invalid URLs upon usage of percent-encoded characters
o Fixed by reverting r759364 (the issue meant to be fixed was a Wagon issue, not a POM issue)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@759729 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 17:18:39 +00:00
Britton Isbell 3cfbbb52c6 Fixed empty scm tag being add to pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@759417 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 02:01:18 +00:00
Britton Isbell e81caca85f [MNG-0479] unable to override the default central repository.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@759383 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 23:03:38 +00:00
Britton Isbell 334c95d85e [MNG-4087] decoding project urls.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@759364 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 21:52:08 +00:00
Britton Isbell bdf651f694 [MNG-2006] - Module SCM URL resolution -relative path. Brought scm path behavior inline with Maven 2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@759354 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 21:13:45 +00:00
Britton Isbell 60c1b6f7b6 [MNG-3621] -site url inheritance broken for UNC paths
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@759192 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:15:25 +00:00
Britton Isbell 5d0b74b0a4 Fixed pom profile activation issues. Added support for hooking up latest builder into Mercury.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@759145 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 14:17:08 +00:00
Britton Isbell a5dfd7f338 [MNG-3680] - POM validation fails on projects in repo.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@758493 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 01:23:53 +00:00
Britton Isbell 49508f67ad [MNG-3899] - Inheritance does not merge extensions with same gid and aid
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@758487 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 00:50:45 +00:00
Britton Isbell 0a68cca3ef Removed unneeded test.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@758477 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 00:20:13 +00:00
Britton Isbell a71841e776 Fixed profile activation for profiles in pom. Profile injection was causing double injection of some elements from plugin mng. Partial fix.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@758473 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 00:06:09 +00:00
Benjamin Bentmann ff898bffd3 [MNG-2591] Plugins are merged incorrectly
o Extended UT to exhibit negative side-effects of profile injection

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@758436 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 21:06:56 +00:00
Britton Isbell 9ce8c65d58 Unit test for reporting plugin config.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@758358 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 17:28:34 +00:00
Britton Isbell d2c1d1e42e [MNG-3811] - Report plugins don't inherit configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@758357 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 17:26:55 +00:00
Britton Isbell 72c4417369 [MNG-3938] - Plugin executions with default id are not always merged. Had previously changed the id to default-execution-id to make default clearer. Some tests had changed this value, others had not. Brought back inline with Maven 2.x
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@758338 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 16:40:21 +00:00
Britton Isbell 2ca25b29fa t07 and t10 unit tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@758127 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 02:16:16 +00:00
Britton Isbell f5167ad05a Unit test was incorrect. Fixed it.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@758122 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 01:41:14 +00:00
Britton Isbell fc83f1f70b [MNG-2591 - Plugin config inheritance.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@758121 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 01:39:38 +00:00
Benjamin Bentmann 98ed6538fa o Used the same code path for testing as a real build would use to reduce discrepancies between ITs and UTs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757983 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 19:47:02 +00:00
Benjamin Bentmann 8b690bebfa o Made the models valid
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757982 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 19:45:06 +00:00
Benjamin Bentmann acdc5f96c5 o Used the same code path for testing as a real build would use
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757967 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 19:21:44 +00:00
Britton Isbell 1a294dff09 Fixed some problems with inheritance of resources.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757965 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 19:14:42 +00:00
Britton Isbell b954b833e5 [MNG-3906] - Project-level plugin dependencies order. Fixed a lot of problems with ordering of elements. We need to assume that the processors always get the parent model first, then the child, down the line.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757936 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 18:24:56 +00:00
Benjamin Bentmann 60f3a9b0cb o Added missing processors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757927 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 18:02:05 +00:00
Benjamin Bentmann f5c0ef6ecc o Marked potential performance problem
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757900 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 16:48:29 +00:00
Benjamin Bentmann 1f1ef561e5 [MNG-4106] [regression] Interpolation does not use properties from dominant settings profile if other profile defines same property
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757584 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 23:04:15 +00:00