b663f0c26c
o merged from r682323
...
Issue id: o merge
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@682324 13f79535-47bb-0310-9956-ffa450edef68
2008-08-04 11:15:23 +00:00
d52ffdef81
reapplying John's merge of all 2.0.10-RC changes to date by reverting r679244, sans artifact upgrade and user agent parts. Passes all integration tests locally, seeing if Hudson and Continuum agree
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679263 13f79535-47bb-0310-9956-ffa450edef68
2008-07-24 01:56:21 +00:00
24176a08a1
Rolling back merge attempt until I have time to fix failing unit tests (most likely tomorrow will do it).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679244 13f79535-47bb-0310-9956-ffa450edef68
2008-07-24 00:18:09 +00:00
3c9be4bceb
Merging changes in from 2.0.10-RC2 release candidate on 2.0.10-RC branch. Still have two failing unit tests in maven-core; I'll take care of those in a few minutes.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679229 13f79535-47bb-0310-9956-ffa450edef68
2008-07-23 23:26:00 +00:00
16ba522c66
Switch to using plexus-interpolation directly to avoid hidden imports.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675618 13f79535-47bb-0310-9956-ffa450edef68
2008-07-10 15:52:53 +00:00
104dc17200
forgot a newline.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674906 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 18:08:19 +00:00
9cef694f17
[MNG-3511] Improve output when no goal is specified.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674904 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 18:07:50 +00:00
c48e137846
o work around for MNGECLIPSE-607 until the interpolation is fixed, something broke it and is wreaking havoc with platform testing within eclipse
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674211 13f79535-47bb-0310-9956-ffa450edef68
2008-07-05 17:05:45 +00:00
ff3312c747
Need to interpolate the plugin configurations that are stored in MojoExecution instances, created during build planning.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672794 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 15:27:16 +00:00
3e03ce0956
Now that we're holding back the plugin config for interpolation just before it's used, we need to accept pom.* expressions in the parameter expression evaluator. Also, setting the maven-distribution finalName for the assembly plugin back to its old expression, which used pom.version not project.version.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672784 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 14:47:09 +00:00
5c32bc6b28
All tests pass on my localhost...committing to see how it works on hudson.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672782 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 14:35:43 +00:00
cd2602d9e6
Adding -V|--show-version, and cleaning up interpolation to correspond with recent refactoriing in 2.0.x branch. Also, changing super-POM to use basedir/build.directory expressions in build paths, to enable paths to respond to changes in other, more basic paths (like outputDirectory responding to a change in build.directory). This is in preparation for merging over the dynamicBuild behavior.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@671936 13f79535-47bb-0310-9956-ffa450edef68
2008-06-26 16:34:27 +00:00
c49d930eba
add license
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@670349 13f79535-47bb-0310-9956-ffa450edef68
2008-06-22 12:38:42 +00:00
3bce57d8c7
license header
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@669225 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 17:00:14 +00:00
ac4c940711
MNG-3598: Allow custom dependency resolution
...
Submitted by: Igor Fedorenko
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@660244 13f79535-47bb-0310-9956-ffa450edef68
2008-05-26 17:33:49 +00:00
ca2bb6a32f
MNG-3574 - project plugin meta version needs to be replaced with the resolved one.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@659463 13f79535-47bb-0310-9956-ffa450edef68
2008-05-23 07:45:41 +00:00
89f6e8e60e
Fixing xpp3 imports for plugin realms.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@654198 13f79535-47bb-0310-9956-ffa450edef68
2008-05-07 18:08:15 +00:00
1c50dc0d0d
clean up the poms and move versions to dependencyManagement
...
Issue id: c
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@653481 13f79535-47bb-0310-9956-ffa450edef68
2008-05-05 13:46:40 +00:00
6d897f9312
Cleaning up artifact ordering for extensions and plugins in teh realm manager by switching to List for artifact collections, instead of allowing unordered Collection instances.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@651081 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 21:50:49 +00:00
5900250b45
Cleaning up the error message formatting some more.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@650601 13f79535-47bb-0310-9956-ffa450edef68
2008-04-22 18:05:10 +00:00
1cb3190b0f
Make the error message construction a little more resilient to errors in classloading.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@650543 13f79535-47bb-0310-9956-ffa450edef68
2008-04-22 15:11:19 +00:00
007fe63a03
added site descriptors to provide modules/parent links (merged from 2.0.x branch r649903)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649913 13f79535-47bb-0310-9956-ffa450edef68
2008-04-20 11:37:31 +00:00
d51e3b5e7a
Adding tests for the plugin-parameter expression evaluator, and some better behavior around MojoExecution and PluginDescriptor instances. Also, bumping plexus-container-default to -alpha-45-SNAPSHOT to take advantage of a new MapConverter fix.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648053 13f79535-47bb-0310-9956-ffa450edef68
2008-04-14 23:22:10 +00:00
3c05ebda15
o merged from r647732 (MNG-3520: Korean message resource)
...
Issue id: o m
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@647733 13f79535-47bb-0310-9956-ffa450edef68
2008-04-14 11:12:38 +00:00
24af7274bc
Fixing error-reporting pointcuts for plugin manager changes I just checked in.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@646544 13f79535-47bb-0310-9956-ffa450edef68
2008-04-09 21:21:13 +00:00
32a9c73445
Fixing MNG-2277 integration test.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@646517 13f79535-47bb-0310-9956-ffa450edef68
2008-04-09 20:21:39 +00:00
5691b96e4d
Fixing MNG-3473 integration test.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@646052 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 19:51:15 +00:00
c32aa5a656
Fixing unit test problems from it0103 fix, and fixing it0042...just 4 more failing ITs before this is back on its feet.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@645015 13f79535-47bb-0310-9956-ffa450edef68
2008-04-05 02:19:29 +00:00
49a0e76b82
[MNG-3497] rar, par and ejb3 archives should not be added to classpath
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644434 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 18:30:00 +00:00
1d9d014cde
Fixing MNG-3355 and MNG-2339.
...
This commit introduces three changes: user-level properties that are separated from the execution properties, where execution properties contain envars, sysprops, and user-level properties...user-level properties are useful for POM interpolation for 2339 and 3355.
Second, a ProjectBuilderConfiguration interface and default implementation, to stem the proliferation of method parameters to projectBuilder methods. This was a natural place to introduce it, as user-level properties had to be passed in separately from the execution properties, for interpolation.
Finally, interpolation has been switched to use the new plexus-interpolation project, which is based on the classes in plexus-utils.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@644354 13f79535-47bb-0310-9956-ffa450edef68
2008-04-03 15:18:18 +00:00
c9888e169a
o merged from r634311 (MNG-3442: Add explicit resource bundle for English)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634313 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 15:45:08 +00:00
39a85be0d3
o merged r634304 (MNG-428: Japanese message resource)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634305 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 15:32:01 +00:00
fdf69050f1
Reinstate mojo execution logging to the console using the default event monitor. Also, have the error-reporting unit test cleanup after itself.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634134 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 02:48:44 +00:00
9bf54d4984
o rolling back r631468, we will use the container to dynamically pull in wagons in 2.1
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@634081 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 23:34:06 +00:00
d9b17ffbb3
Fixing injection of plexus-utils imports for XPP3 stuff.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633750 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 02:28:59 +00:00
19cfe737aa
Restore complete list of plugin artifacts in PluginDescriptor for use in ${plugin.artifacts}.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@633239 13f79535-47bb-0310-9956-ffa450edef68
2008-03-03 19:18:37 +00:00
b19a751704
[MNG-3410] Managed versions in plugins are not considered when using them
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632683 13f79535-47bb-0310-9956-ffa450edef68
2008-03-02 00:55:14 +00:00
a5f49900f2
Adding the beginnings of a workspace to Maven, which is just a shared cache component for project, model, and POM file instances (for now). This allows fine-grained control over when such caches are cleared in environments where embedder instances may be reused multiple times, and will eventually enable new profile activators that require access to project information in the current build along with other advanced caching and cache-querying features.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632482 13f79535-47bb-0310-9956-ffa450edef68
2008-02-29 22:58:00 +00:00
4411b1c425
Changing to name and not email.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@632468 13f79535-47bb-0310-9956-ffa450edef68
2008-02-29 22:36:19 +00:00
c2bc33050c
[MNG-2664] add wagon-webdav to the built in providers
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@631468 13f79535-47bb-0310-9956-ffa450edef68
2008-02-27 02:46:17 +00:00
b4e41217c6
Improve phase-tracking, event dispatching, and align build headers as events dispatched to the default event monitor...also, add debug-level enter/exit phase output in the default event monitor. Finally, refactored code that actually renders the build plan and executes the mojos for each task-segment in the lifecycle executor, to eliminate all the duplication.
...
This lays the ground work for improving cache management, since I also added event types for embedder control (keep in mind that event monitors can be used to control when the project/model cache is flushed, for example).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@631455 13f79535-47bb-0310-9956-ffa450edef68
2008-02-27 01:26:41 +00:00
22817a2444
Fixing site-generation and other plugins that require reports.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@630048 13f79535-47bb-0310-9956-ffa450edef68
2008-02-21 23:31:38 +00:00
d54cf5b9bb
Ignore missing modules during extension-scanning when MavenEmbedder.readProject(..) is called. At other times, as in the case of normal builds, don't suppress missing module exceptions.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@629571 13f79535-47bb-0310-9956-ffa450edef68
2008-02-20 18:53:09 +00:00
0ca8675e19
[MNG-3400] Implement clone properly following Effective Java' book considerations
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@627935 13f79535-47bb-0310-9956-ffa450edef68
2008-02-15 03:10:09 +00:00
17d401df6c
[MNG-3400] MavenProject is not extensible
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@627670 13f79535-47bb-0310-9956-ffa450edef68
2008-02-14 06:08:07 +00:00
0fc4704f30
[MNG-2184] Commenting this out again, until I can figure out how to make aggregators run once and only once, regardless of the contents of the reactor.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@619724 13f79535-47bb-0310-9956-ffa450edef68
2008-02-08 01:20:22 +00:00
80f538bc52
Putting aggregator skip logic from previous commit ahead of warning messages, and adding some doco to the javadoc for the method to note the skip behavior.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@619721 13f79535-47bb-0310-9956-ffa450edef68
2008-02-08 01:06:16 +00:00
34c390602c
[MNG-2184] Skip aggregator-mojo execution when bound to the lifecycle (or bound as a report), and the current project is not the root project...in other words, detect aggregator mojos bound to the lifecycle in some way, and only execute them once using the root project.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@619720 13f79535-47bb-0310-9956-ffa450edef68
2008-02-08 01:03:03 +00:00
cc6b280343
Add warnings for deprecation of aggregator-mojos bound to the lifecycle, and add error/error-logging (error when directly in the pom, error-logging when brought in via lifecycle mapping, etc.) when a direct-invocation mojo (@requiresDirectInvocation) is bound to the lifecycle.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@619711 13f79535-47bb-0310-9956-ffa450edef68
2008-02-08 00:46:16 +00:00
621d238877
MNG-3388: DefaultPluginManager needs to catch LinkageError
...
o added another catch
o based on r619408
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@619410 13f79535-47bb-0310-9956-ffa450edef68
2008-02-07 13:41:13 +00:00
Vincent Siveton
Brett Leslie Porter
John Dennis Casey
Jason van Zyl
Milos Kleint
Brian E Fox
Herve Boutemy
Carlos Sanchez Gonzalez