Commit Graph

7296 Commits

Author SHA1 Message Date
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
Oleg Gusakov 30053a1000 generalized tree into graph
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@760596 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 20:33:24 +00:00
Oleg Gusakov bb33172f47 added tree-based resolution objects
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@760594 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 20:30:29 +00:00
Oleg Gusakov 0781fa0026 added tree-based resolution result to request/response
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@760575 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 19:44:33 +00:00
Oleg Gusakov f36831147b added tree-based resolution result to request/response
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@760573 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 19:36:53 +00:00
Britton Isbell 5233029d4e Test for setting profile properties.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@760229 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 23:07:33 +00:00
Britton Isbell 8a31c1a381 Setup test classes for testing of pom construction with settings. Tried to use test-jar type to reuse classes but the causes some lost dependencies in eclipse. Just duping classes for now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@760207 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 22:33:11 +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
Benjamin Bentmann bd263f7da7 o Updated to wagon:1.0-beta-5 for parity with Maven 2.1.x
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@759573 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 20:12:10 +00:00
Benjamin Bentmann aded054d76 [MNG-2387] <active> on <proxy> in settings is misleading
o Merged from r747683

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@759552 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 19:02:38 +00:00
Benjamin Bentmann ccdd99b5c6 o Fixed propagation of proxy settings
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@759550 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 18:57:11 +00:00
Britton Isbell 28d05ee6d4 Descriptions inherited. Modified API to add listeners to processors. Still need to modify the listener API as weell.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@759482 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 15:16:40 +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
Oleg Gusakov 5a5185c04a removed unnecessary fields
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@758829 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 20:11:07 +00:00
Oleg Gusakov 64d686236f added tree representation for resolution APIs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@758827 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 20:09: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 22562724da o Added toString() for Model to ease debugging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757879 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 16:15:42 +00:00
Oleg Gusakov b2d676a872 [MERCURY-105] fixed precision error in objective function, added tree serialization for debugging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757666 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 04:58:23 +00:00
Oleg Gusakov 3fefa0d588 reverting polluting exclusions as they will be replaced by correct shade configuration in provisio
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757665 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 04:57:21 +00:00
Oleg Gusakov 2559249eed added ad-hoc processing for test-jar type which was coming incorrectly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757664 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 04:55:05 +00:00
Oleg Gusakov c87fce65f9 added a default hint for easier hacking
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757663 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 04:53:12 +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
Britton Isbell 81048a856e [MNG-3846: Inherited URLs are not automatically extended with the child's artifactId]
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757543 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 21:06:00 +00:00
Benjamin Bentmann 1123131b32 o Fixed typos in expression
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757540 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 20:42:31 +00:00
Benjamin Bentmann f4d71c3b48 [MNG-4102] [regression] Properties used for interpolation of inherited properties can't be customized by child
o Extended UT to check interaction with profile injection as well which is apparently key to reproduce the issue
o Removed interpolation step after profile injection to fix issue

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757534 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 20:35:43 +00:00
Britton Isbell 9886cb18cd Fixed plugin dependency ordering.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757526 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 20:09:24 +00:00
Britton Isbell 1c35174120 [MNG-2309] - Profile activation order.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757491 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 18:35:53 +00:00
Britton Isbell 0f8624c297 [MNG-4102] -Properties used for interpolation of inherited properties can't be customized by child. [BUG] - override property in profile.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757485 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 18:19:37 +00:00