Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,166 Commits 84 Branches 96 Tags 107 MiB
Commit Graph

6166 Commits

Author SHA1 Message Date
Patrick Schneider 5da9d28906 [MNG-2919] Add fix for depMan scope overwriting to the trunk. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@552182 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-30 17:31:45 +00:00
John Dennis Casey f3f3c70321 Fixing infinite recursion when a mojo bound to the lifecycle forks a new phase that contains implies another phase that contains the bound mojo. This was triggered by the assembly:assembly mojo, and should look familiar. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@551696 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-28 20:53:55 +00:00
Mark Hobson 407f924f83 Adding target to svn:ignore 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@550772 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-26 10:59:11 +00:00
Kenney Westerhof e54695ddba Move osgi bundle manifest generation to osgi profile. 
The generated manifests are incorrect, for instance, maven-project's manifest
misses the package-import org.apache.maven.artifact.transform which should come from 
maven-artifact CacheAware*.java.

Further, this doesn't work in an osgi environment, since if each artifact
is a bundle, then maven-embedder must have access to all component.xml files
in all maven core artifacts, and in all dependencies (which aren't bundles
but that can be fixed).
Osgi import/exports for packages work for resources too, but META-INF/ isn't
a package so this doesn't work. This may work with 'Require-Bundle'
(it does in my implementation although i don't think i follow the spec entirely ;)).
The next problem you get is classcasts for wagon (httplightweightwagon). This
has to be included in a bundle too and get proper exports. The same goes
for all other dependencies (plexus-*).
Maven and plexus are not suited for osgi yet - too much changing is required
in both the metadata structure, the code, and all dependencies and/or
packaging and binary inclusion of dependencies to make this work.
The best bet is to use the one-artifact embedder.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549982 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-22 23:54:45 +00:00
John Dennis Casey f479a38620 Adding a small comment about managed artifact versions in here. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549970 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-22 22:09:22 +00:00
John Dennis Casey fda3badc24 Accumulate remote repositories when scanning for extensions, down the model lineage, starting with the original remote repositories passed in from outside. 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549968 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-22 22:02:10 +00:00
Kenney Westerhof 99ba1e7e85 PR: MNG-2339 - ${project.*} evaluated badly 
This commit makes sure that pom.* and project.* are resolved using the model reflector,
but if the prefix isn't pom or project, context and model properties are consulted.
If the value still isn't found, the model reflector is used as a legacy fallback,
and a warning is printed.

Also, project.* is deprecated in favour of pom.*.

TODO: env.*.

N.B.: there's loads of warnings about ${artifactId}. I can turn these off,
but if you specify -DartifactId on the commandline, all hell breaks loose.

See http://docs.codehaus.org/display/MAVEN/Refactoring+Interpolation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549786 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-22 11:34:53 +00:00
Mark Hobson 87f98299ac Merged r549509 from 2.0.x: 
Update OMIT_FOR_NEARER event to correctly reflect which node was actually omitted.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549510 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-21 15:21:49 +00:00
Mark Hobson de13a61f46 Merged r549437 from 2.0.x: 
Only log omit-for-nearer debug message if versions differ - required after removing restriction from DefaultArtifactCollector in r548797.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549438 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-21 09:23:20 +00:00
Mark Hobson db111e752a Merging r548797 from 2.0.x: 
Make DefaultArtifactCollector fire OMIT_FOR_NEARER events to listeners even if the artifact versions do not differ.  This allows interested listeners to be able to track omitted duplicate artifacts.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@548799 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-19 16:54:44 +00:00
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