8ec3ac8a97
OPEN - issue MNG-2591: Plugins are merged incorrectly
...
http://jira.codehaus.org/browse/MNG-2591
Added tests to verify the XML attribute that switches merge-mode from replace/merge to append for children...then, fixed append semantics to force the dominant children (those given by the child POM, in this case) to be appended to those of the recessive/parent-POM configuration.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545315 13f79535-47bb-0310-9956-ffa450edef68
2007-06-07 21:11:29 +00:00
7db88ddfaf
Bumping up the version of plexus-utils, to use PropertiesBasedValueSource for the settings builder.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545285 13f79535-47bb-0310-9956-ffa450edef68
2007-06-07 19:53:43 +00:00
4626c93d3c
OPEN - issue MNG-2577: Allow interpolation of Properties in settings.xml
...
http://jira.codehaus.org/browse/MNG-2577
Modifying to use request properties (embeddable system properties), and organizing this with the existing use of envars. NOT allowing profile-property interpolation, as these could influence profiles in a recursive manner and make their values hard to determine...besides, model-interpolation will pickup profile properties before POMs are interpolated, so the only thing this will miss is profile/properties -> servers, etc. inside the settings itself.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545283 13f79535-47bb-0310-9956-ffa450edef68
2007-06-07 19:52:55 +00:00
bfce771633
Replacing JDK 1.5 api call.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545241 13f79535-47bb-0310-9956-ffa450edef68
2007-06-07 16:54:58 +00:00
d20f6c96fe
[MNG-2988] Ranges with inclusive upper bounds are not validated against metadata
...
Submitted by: Mark Hobson
Merged from: maven-2.0.x branch r545150
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545156 13f79535-47bb-0310-9956-ffa450edef68
2007-06-07 12:39:05 +00:00
0c1b689e52
[MNG-3037] Combining plugin dependencies with plugin-level dependencies from the current project PRIOR to resolution, to enable version-conflict resolution to take place between the two sets of dependencies.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@544662 13f79535-47bb-0310-9956-ffa450edef68
2007-06-05 22:38:33 +00:00
02d3305b8e
Add better message when artifacts are missing so that people know how to deploy to their own repositories. Suggested by Patrick Lightbody.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@544634 13f79535-47bb-0310-9956-ffa450edef68
2007-06-05 21:09:39 +00:00
d8890819ad
Fix path separator for failing test on windows
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@544314 13f79535-47bb-0310-9956-ffa450edef68
2007-06-04 22:26:34 +00:00
9cb7e9af8c
MNG-2934 Extensions should not be affected by the project's dependency resolution
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@544249 13f79535-47bb-0310-9956-ffa450edef68
2007-06-04 20:28:04 +00:00
faf0da2430
Add cause to throws. 10 slaps on the wrist! ;)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543941 13f79535-47bb-0310-9956-ffa450edef68
2007-06-03 16:53:46 +00:00
97cf3951e6
o just adding my debug ruby stuff
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543921 13f79535-47bb-0310-9956-ffa450edef68
2007-06-03 15:33:37 +00:00
605227abb7
MNG-2860 Don't fly out of control when we encounter <module></module> in a POM
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543797 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 22:38:40 +00:00
f53a45bda8
MNG-2992 Set %HOME% to something sane if null
...
Submitted by: Tim Reilly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543790 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 21:41:53 +00:00
617eebbee3
MNG-2884 Get a list of the missing artifacts from the exception.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543769 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 18:01:19 +00:00
eb9054adfd
MNG-2923/2929: Correct a version range restriction problem caused by work on MNG-1577
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543765 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 17:31:13 +00:00
885409f569
o fix typo causing NPE setting properties
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543756 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 16:53:40 +00:00
e8fc77cccd
o some jruby integration. I will integrate what Eric has made but this allows for some easy experiments with the embedder
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543754 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 16:31:27 +00:00
cc5f2f954b
Reverting the package changes
...
Issue id: MNG-2943
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543753 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 15:35:57 +00:00
6d3984551c
OPEN - issue MNG-2671: Parent/modules relative file path compression
...
http://jira.codehaus.org/browse/MNG-2671
Applied, with small changes so it will not swallow exceptions. If this causes a problem with broken symlinks, we can address that later.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543682 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 00:43:15 +00:00
6d69087ae9
[MNG-2943] Avoid using package names used in other artifacts: add some comments
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543671 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 00:06:11 +00:00
53acf2858f
[MNG-2943] Avoid using package names used in other artifacts: org.apache.maven
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543670 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 00:05:35 +00:00
46e5b38635
[MNG-2943] Avoid using package names used in other artifacts, configure the bundle plugin to ignore deprecated packages
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543666 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 23:38:41 +00:00
1bd449b2f1
[MNG-2943] Avoid using package names used in other artifacts: org.apache.maven
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543664 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 23:36:54 +00:00
d050220b39
[MNG-2943] Avoid using package names used in other artifacts
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543657 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 23:12:33 +00:00
1891c6abc0
[MNG-3013] The plugin manager incorrectly caches plugin versions between embedder calls, added test case that doesn't show the wrong behaviour yet
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543655 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 23:07:00 +00:00
f136fa7ace
OPEN - issue MNG-2619: building from the middle pom of a (parent,child,grandchild) heirarchy fails
...
http://jira.codehaus.org/browse/MNG-2619
Added tests from the included patch. Main code didn't apply any longer, but this shows that the new ModelLineageBuilder code solves the problem. Will apply the original patch to the 2.0.x branch...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543637 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 22:10:03 +00:00
dce22c78fb
OPEN - issue MNG-2503: mvn.bat file is not correct for 4NT 5.0 and does "endlocal" twice if error
...
http://jira.codehaus.org/browse/MNG-2503
Applying the patch, even though it's not a patch...I was able to generate one using the supplied file and the current mvn.bat file from the trunk.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543621 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 21:21:43 +00:00
1a0b546e7f
MNG-2690 Some maven-project tests fail under maven-surefire-plugin 2.3
...
Submitted by: Mark Hobson
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543614 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 21:01:48 +00:00
b4f380dd3c
MNG-2683 Better exception messages
...
Submitted by: Mark Lundquist
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543604 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 20:46:48 +00:00
5401fb4c64
OPEN - issue MNG-2784: Multiple executions of the same plugin at the same life cycle phase in a multi-module profile mixed up
...
http://jira.codehaus.org/browse/MNG-2784
NOT applying this patch, as there is a much simpler solution. The processing is currently in the correct order, so all we need to do is make sure the Map.values() method retains this order. Therefore, I changed the Map implementation for plugin executions to LinkedHashMap.
I've also added a test for this issue...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543599 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 20:35:44 +00:00
09553c6ff3
REOPENED - issue MNG-1910: Allow jdk 1.4+ as profile requirement
...
http://jira.codehaus.org/browse/MNG-1910
Applied.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543579 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 19:12:58 +00:00
e12fbd08e9
o fix typo
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543382 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 04:19:59 +00:00
6db368df4e
MNG-1849 Fix Extension.hashCode() throwing NPE if groupId or artifactId is null
...
Submitted by: David Hawkins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543381 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 03:47:31 +00:00
6cb79190cd
MNG-2813: Fix OutOfMemoryError when using profiles and pom inheritance
...
Submitted by: Jochen Kuhnle
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543373 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 03:11:29 +00:00
f2f86285a3
MNG-2687 prevent windows from potentially crapping out with long POM names
...
Submitted by: Stepan Roh
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543361 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 02:29:24 +00:00
82146b83f0
MNG-2921 Fixing the ejb-client dependency problem introduced by MNG-1577
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543349 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 01:31:29 +00:00
d25dd879f3
OPEN - issue MNG-3027: forked execution does not get configuration from the POM
...
http://jira.codehaus.org/browse/MNG-3027
Adding reporting section to sources of plugin configuration when mojos are forked from a report mojo. Also, improving detection/addition of report mojos from a plugin, when no report-set is defined.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543308 13f79535-47bb-0310-9956-ffa450edef68
2007-05-31 23:11:47 +00:00
78aa1f1879
MNG-2347 MavenExecutionRequest.getBaseDirectory() should be propagated to the ${basedir} expression
...
Submitted by: Ovidio Mallo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543240 13f79535-47bb-0310-9956-ffa450edef68
2007-05-31 19:59:38 +00:00
da10710224
it0114 worked for me on the last run. Seems I had an updating issue for the bootstrap, since my M2_HOME was pointing at a linked directory, not a real one (ant's delete task doesn't like that, apparently).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543190 13f79535-47bb-0310-9956-ffa450edef68
2007-05-31 17:42:47 +00:00
2f49e47227
OPEN - issue MNG-3012: ClassCastException due to plexus-utils NOT being filtered during plugin loading
...
http://jira.codehaus.org/browse/MNG-3012
Removing some debug output that will be quite noisy...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543189 13f79535-47bb-0310-9956-ffa450edef68
2007-05-31 17:30:41 +00:00
dc2f469a10
[MNG-3012] Adding an import for Xpp3Dom from plexus-utils in maven-core to plugin realms, to prevent ClassCastException when they call plugin.getConfiguration() from maven-model objects.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543187 13f79535-47bb-0310-9956-ffa450edef68
2007-05-31 17:28:23 +00:00
4c175033e8
formatting
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@542736 13f79535-47bb-0310-9956-ffa450edef68
2007-05-30 03:02:03 +00:00
a866905cb4
Fixing issue with different lifecycles getting in the way of one another, as when `mvn clean install` on a maven-plugin project catches the clean:clean binding from the clean lifecycle, and knocks out the plugin:descriptor binding from the beginning of the default lifecycle.
...
Plugins can now be built using maven trunk once again.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@542734 13f79535-47bb-0310-9956-ffa450edef68
2007-05-30 03:00:40 +00:00
38b12ace0c
Remove PathTranslator duplicate component as it's declared in maven-project
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@542316 13f79535-47bb-0310-9956-ffa450edef68
2007-05-28 20:30:06 +00:00
93801e2888
Remove duplicate component declaration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@542315 13f79535-47bb-0310-9956-ffa450edef68
2007-05-28 20:27:24 +00:00
ac5f47115b
Fixing a couple small things having to do with reports that fork.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@541999 13f79535-47bb-0310-9956-ffa450edef68
2007-05-27 16:47:09 +00:00
7b5bac791a
Upgrade snapshots
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@541965 13f79535-47bb-0310-9956-ffa450edef68
2007-05-27 05:45:18 +00:00
e58f2094ab
Fixing it0027...I had end-fork and clear-fork-context mixed up.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@541951 13f79535-47bb-0310-9956-ffa450edef68
2007-05-26 23:47:59 +00:00
008d6943bc
Fixed forking from reports.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@541950 13f79535-47bb-0310-9956-ffa450edef68
2007-05-26 23:37:35 +00:00
a55e9c24fe
Making resolution of artifacts from the reactor work with classifiers (hopefully).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@541942 13f79535-47bb-0310-9956-ffa450edef68
2007-05-26 21:22:10 +00:00
John Dennis Casey
Brett Leslie Porter
Jason van Zyl
Carlos Sanchez Gonzalez
Kenney Westerhof