Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-08 11:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,756 Commits 86 Branches 96 Tags
Commit Graph

5756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Hobson
b79759f338 [MNG-3039] mvn.bat fails 
Fixing same problem for trunk.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@548789 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-19 16:32:57 +00:00
Jason van Zyl
fc40bd04a6 MNG-3059 Make sure that dependencies listed in plugins are obeyed 
Submitted by: Eric Redmond


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@548228 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-18 06:10:00 +00:00
Jason van Zyl
c3272e9284 o put the shader in the package phase and order the plugins so that the shading happens first and then the assembly 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@548224 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-18 05:38:33 +00:00
Jason van Zyl
3d1a1ca9cf o using 6-SNAPSHOT -> using the new remote-resources plugin causes a CCE so rolling back to 5 until I can test it 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@548048 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-17 15:53:18 +00:00
Kenney Westerhof
811de4eb41 Added some tests; also add test for MNG-3001 where it's claimed that [1.0,) includes 1.0-SNAPSHOT, which it doesn't. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547874 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-16 07:20:35 +00:00
Brett Leslie Porter
3efdafe6a8 produce a source assembly as part of the release 
Merged from: r547502,547498 from maven-2.0.x branch


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547505 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-15 03:10:55 +00:00
Brett Leslie Porter
aca2e17b72 ignore 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547504 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-15 03:09:01 +00:00
Carlos Sanchez Gonzalez
aa9368044a Fix test that fails on windows 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547488 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-15 02:17:38 +00:00
Kenney Westerhof
6618c01021 Remove redundant argument - doesn't compile. I hope this is the right fix. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547172 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-14 08:42:26 +00:00
Jason van Zyl
a441f3d28a o exclude the rest of the xml classes 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547149 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-14 06:58:56 +00:00
Brett Leslie Porter
9d341d66f1 add required snapshot repo 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547110 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-14 04:19:32 +00:00
John Dennis Casey
19311574e1 Try to assume that a plugin bound in the POM but not resolved during build-plan-building will be resolvable later. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545558 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-08 16:46:20 +00:00
John Dennis Casey
17e4709531 Fixing plexus-utils version. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545546 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-08 16:20:54 +00:00
John Dennis Casey
6312592e56 Forgot a requirement in the component descriptor. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545545 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-08 16:19:58 +00:00
John Dennis Casey
f6416573fa Bumping surefire plugin version to fix problem with wrong plexus-utils version in ModelUtilsTest (in maven-project). 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545535 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-08 15:43:35 +00:00
John Dennis Casey
182220d00c Fixing per Mark Hobson's suggestion. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545519 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-08 14:26:57 +00:00
Jason van Zyl
b4ce07fec5 Add Zip artifact handler. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545398 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-08 04:09:39 +00:00
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
Brett Leslie Porter
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
John Dennis Casey
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
Jason van Zyl
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
Carlos Sanchez Gonzalez
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
Jason van Zyl
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
Kenney Westerhof
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
Jason van Zyl
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
Jason van Zyl
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
Jason van Zyl
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
Jason van Zyl
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
Jason van Zyl
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
Jason van Zyl
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
Jason van Zyl
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
Jason van Zyl
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
John Dennis Casey
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
Carlos Sanchez Gonzalez
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
Carlos Sanchez Gonzalez
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
Carlos Sanchez Gonzalez
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
Carlos Sanchez Gonzalez
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
Carlos Sanchez Gonzalez
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
Carlos Sanchez Gonzalez
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
John Dennis Casey
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
John Dennis Casey
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
Jason van Zyl
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
Jason van Zyl
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
John Dennis Casey
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
John Dennis Casey
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
Jason van Zyl
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
Jason van Zyl
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