Benjamin Bentmann
cd04c1d85a
o Set svn:eol-style=native
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@713049 13f79535-47bb-0310-9956-ffa450edef68
2008-11-11 14:35:30 +00:00
Britton Isbell
e96229a165
Reverting back changes. It's building locally but breaking on Hudson.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@706231 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 11:06:03 +00:00
Britton Isbell
d733885e54
Hooked up maven-project-builder into build. Updated classes.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@706143 13f79535-47bb-0310-9956-ffa450edef68
2008-10-20 07:57:44 +00:00
Britton Isbell
7c54aada90
Fix: IT 3746, 102, 0043 - Merged out some previous changes to PluginParameterExpressionEvaluator.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@704797 13f79535-47bb-0310-9956-ffa450edef68
2008-10-15 06:57:37 +00:00
Jason van Zyl
a2f245109b
o revert my ordering, i'll have to investigate why property set on the CLI which conflicts with an internal property still wins in 2.0.x
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701702 13f79535-47bb-0310-9956-ffa450edef68
2008-10-04 19:51:42 +00:00
Jason van Zyl
4770c52af5
o make sure that the execution properties that are taken from the CLI are processed before anything else
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701694 13f79535-47bb-0310-9956-ffa450edef68
2008-10-04 19:20:15 +00:00
Jason van Zyl
f4de864984
o restore the getApplicationVersion() method which is use by eclipse:eclipse
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701693 13f79535-47bb-0310-9956-ffa450edef68
2008-10-04 19:19:41 +00:00
Jason van Zyl
9a02f5a1ec
o placing a hard coded version in the event the pom.properties can't be found. for debugging inside m2e i can live with this.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701665 13f79535-47bb-0310-9956-ffa450edef68
2008-10-04 16:33:36 +00:00
Jason van Zyl
fa17cae65a
o be more lenient when looking for the properties file. in my case i am debugging completely from the eclipse workspace and i don't want to have to produce the JAR everytime i want to execute maven. these properties files should be created as part of the generate resources phase and not buried in the maven archiver and performed during JAR production. bad mixing of concerns.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701663 13f79535-47bb-0310-9956-ffa450edef68
2008-10-04 16:30:55 +00:00
Britton Isbell
d17fd4ca86
Fix for IT0096, IT0097. Now checking session to see if plugin is part of reactor before trying to resolve it.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701563 13f79535-47bb-0310-9956-ffa450edef68
2008-10-03 23:06:25 +00:00
Jason van Zyl
556254c8c3
MNG-3653/MNG-3677: restored property file nabbing from the core JAR, and reworked the runtime component to be more general and used it from the CLI
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701264 13f79535-47bb-0310-9956-ffa450edef68
2008-10-02 22:36:41 +00:00
Jason van Zyl
d06897e91c
MNG-3637: making sure it says we fail when we fail
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@701228 13f79535-47bb-0310-9956-ffa450edef68
2008-10-02 19:52:53 +00:00
Britton Isbell
9220e682ec
Remove model cloning.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700325 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 01:58:20 +00:00
Britton Isbell
3af42c2f05
Removed unneeded class/methods related to extension scanner.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700300 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 23:02:15 +00:00
Britton Isbell
534b660b4e
Removed extension scanner. It was tied up into the old model lineage code, which is very buggy. Needs to be reimplemented.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@700226 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 19:51:10 +00:00
Jason van Zyl
b6c2132bc7
o merging from my branch to trunk
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699806 13f79535-47bb-0310-9956-ffa450edef68
2008-09-28 12:16:53 +00:00
Jason van Zyl
1260ced4f5
o collapsing all the profile code into maven-project, now it's all in one place
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699659 13f79535-47bb-0310-9956-ffa450edef68
2008-09-27 14:52:28 +00:00
Jason van Zyl
6282ce0b0e
o rolling back change, not sure how subclipse commits to two separate repositories in one commit..
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696679 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 15:49:48 +00:00
Jason van Zyl
02a0cb7d5a
o match shane's changes to remove the workspace
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696637 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 11:39:16 +00:00
Britton Isbell
3929bd0e45
Reverted back previous checkin, which broke something in the assembly plugin.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696326 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 14:42:57 +00:00
Britton Isbell
06abbabcd2
Some fixes for adding properties from active profiles to the interpolation list.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@696299 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 13:52:46 +00:00
Britton Isbell
bc3660ec47
Detangled profile activitation dependency on realm manager. Move org.apache.maven.realm package to maven-core project.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695332 13f79535-47bb-0310-9956-ffa450edef68
2008-09-15 02:54:31 +00:00
Britton Isbell
180bf37d84
Fix: mng2562 - timestamp
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695241 13f79535-47bb-0310-9956-ffa450edef68
2008-09-14 15:36:56 +00:00
Britton Isbell
6221dfb9e6
Fix: mng3746 - Implemented proper ordering of system, user and model properties used in interpolation. this required creating a tag value, which could be used for comparing and ordering of InterpolatorProperty.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695196 13f79535-47bb-0310-9956-ffa450edef68
2008-09-14 11:34:27 +00:00
Britton Isbell
c993fd98d0
Fix: IT0098 - CLI properties now correctly constructed and passed to interpolator.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@695022 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 20:20:25 +00:00
Britton Isbell
9fff4c0612
Moved PathTranslator to maven-core. maven-project no longer uses it.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694912 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 10:07:23 +00:00
Britton Isbell
7dc42ed958
Replaced interpolator code.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694907 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 09:28:23 +00:00
Britton Isbell
f2e9e6810a
Cleanup of code. Removed last of dynamic/concrete code.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694598 13f79535-47bb-0310-9956-ffa450edef68
2008-09-12 03:45:45 +00:00
Britton Isbell
45f10e7526
Refactored out restorer class and related MavenProjectBuilder methods.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694360 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 17:11:34 +00:00
Britton Isbell
cacc78b1d0
Removed dynamic injection of pom build during project construction. Deleted aspects.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@694109 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 04:16:40 +00:00
Britton Isbell
6b96692a93
Merge of sisbell-maven-2.1-profile branch. Removes use of project lineage from builder.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@693332 13f79535-47bb-0310-9956-ffa450edef68
2008-09-09 01:04:17 +00:00
Jason van Zyl
b07c8d2e36
reverting that commit, meant for my branch
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@688584 13f79535-47bb-0310-9956-ffa450edef68
2008-08-24 23:38:39 +00:00
Jason van Zyl
2a94051f54
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@688581 13f79535-47bb-0310-9956-ffa450edef68
2008-08-24 23:24:41 +00:00
Jason van Zyl
c82352832a
o updating to 3.0-SNAPSHOT
...
o aparently when we start from scratch the bootstrap wasn't working, so the maven ant tasks will now igore trying to download the projects we
are actually trying to build.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@684975 13f79535-47bb-0310-9956-ffa450edef68
2008-08-11 23:05:20 +00:00
Vincent Siveton
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
Brett Leslie Porter
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
Jason van Zyl
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
Brett Leslie Porter
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
Brett Leslie Porter
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
Jason van Zyl
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
Milos Kleint
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
John Dennis Casey
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
Brian E Fox
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
Herve Boutemy
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
John Dennis Casey
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
Vincent Siveton
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
Herve Boutemy
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
John Dennis Casey
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
Vincent Siveton
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
Vincent Siveton
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
John Dennis Casey
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
Jason van Zyl
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
John Dennis Casey
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
John Dennis Casey
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
Carlos Sanchez Gonzalez
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
John Dennis Casey
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
Jason van Zyl
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
Brett Leslie Porter
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
Carlos Sanchez Gonzalez
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
Carlos Sanchez Gonzalez
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
John Dennis Casey
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
Vincent Siveton
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
738cb3016b
MNG-3388: DefaultPluginManager needs to catch LinkageError
...
o added the catch
o based on r619234
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@619237 13f79535-47bb-0310-9956-ffa450edef68
2008-02-07 00:57:42 +00:00
John Dennis Casey
04ad40121c
[MNG-1493] Modifying to allow <module> to specify a full path, including alternate pom file, rather than just a directory wherein a normal 'pom.xml' is expected to reside. This works more like <relativePath> has worked for awhile now.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@618780 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 21:27:53 +00:00
John Dennis Casey
256d3cf86b
[MNG-3331] Correcting URI.normalize call for only non-windows environments, since this apparently destroys UNC paths.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@618735 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 18:30:45 +00:00
John Dennis Casey
91d2e5abf9
[MNG-3331] Modified module path calculation to use URI.normalize to handle relative directory references, so there is no confusion about such references causing false positives on symlink detection (where getCanonicalPath() != getAbsolutePath()).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@618708 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 17:31:57 +00:00
John Dennis Casey
10da177f1d
[MNG-3119] Modifying MavenProject.addAttachment(..) and MavenProjectHelper.attachArtifact(..) implementations to throw an unchecked exception when a project attachment will collide with existing attachments. This includes tests to verify the behavior. The unchecked exception allows Maven to deal with it as a real build failure, while avoiding the need to modify the MavenProjectHelper API, which is part of Maven's core and which would render many existing plugins incompatible with new Maven releases.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@618497 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 00:09:27 +00:00
John Dennis Casey
e38fa6fcc5
[MNG-3099] Modify the call to get the super-pom in cases where maven is not using any pom files, to ensure that profiles from the settings are used.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@618391 13f79535-47bb-0310-9956-ffa450edef68
2008-02-04 19:36:35 +00:00
John Dennis Casey
e86a507c5d
Fixing formatting on transitive resolution error (again).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@617669 13f79535-47bb-0310-9956-ffa450edef68
2008-02-01 21:57:26 +00:00
John Dennis Casey
c9d88e6ce3
Fixing formatting on transitive resolution error.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@617663 13f79535-47bb-0310-9956-ffa450edef68
2008-02-01 21:44:10 +00:00
John Dennis Casey
f838337b7a
Refactor the artifact-scanning logic from the realm manager and the plugin-artifact resolution logic in the plugin manager into two separate classes, one a component and one a static class, to allow the new PluginPrefixLoader to reuse some of both and create a lighter-weight approach to grabbing the PluginDescriptor for build-planning purposes...also avoids some needless error messages during build planning.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@617293 13f79535-47bb-0310-9956-ffa450edef68
2008-01-31 23:29:18 +00:00
John Dennis Casey
e670bd3ea3
Adding the concept of recommended stacktrace hints for reported errors, and add the ability to directly access the list of exceptions that actually hit the error reporter (instead of having to use MavenExecutionResult.getExceptions() in conjunction with findReportedException(..) to unwrap them.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@617178 13f79535-47bb-0310-9956-ffa450edef68
2008-01-31 18:17:05 +00:00
John Dennis Casey
b7ce1b8c93
Fixing the case where there were exceptions in the build, but for whatever reason they didn't trigger a reactor-manager build failure flag...in cases where there isn't really a project against which to log the error, for instance.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@616968 13f79535-47bb-0310-9956-ffa450edef68
2008-01-31 00:36:26 +00:00
John Dennis Casey
6c103fff87
Adding the build-plan instance for each project to the session and MavenExecutionResponse.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@616824 13f79535-47bb-0310-9956-ffa450edef68
2008-01-30 18:11:50 +00:00
John Dennis Casey
ba9624676d
Cleanup use of repositories for resolving plugin dependencies by using a LinkedHashSet to avoid duplicated repository defs (although two defs pointing to the same URL but with different id's will still look like two repos).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@615004 13f79535-47bb-0310-9956-ffa450edef68
2008-01-24 21:29:12 +00:00
John Dennis Casey
48db18c81b
Cleanup on pointcuts to make them slightly more efficient.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614756 13f79535-47bb-0310-9956-ffa450edef68
2008-01-24 00:33:24 +00:00
John Dennis Casey
268d08b8a3
[MNG-3372] Improve error handling where a mojo is referenced but the plugin doesn't contain it (in direct-invocation cases), and fix plugin-version discovery where a plugin pom gives a maven prereq.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614708 13f79535-47bb-0310-9956-ffa450edef68
2008-01-23 22:18:23 +00:00
John Dennis Casey
22e2b4ab35
Commenting out debug pointcut because it causes class sizes to balloon.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614620 13f79535-47bb-0310-9956-ffa450edef68
2008-01-23 18:54:20 +00:00
John Dennis Casey
8d42ef1ce3
Fixing error-reporting pointcut that I broke.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614342 13f79535-47bb-0310-9956-ffa450edef68
2008-01-22 22:01:57 +00:00
John Dennis Casey
a23ed648fd
adding basic bootstrapping instructions to the README.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614337 13f79535-47bb-0310-9956-ffa450edef68
2008-01-22 21:52:28 +00:00
John Dennis Casey
f2ea396212
Widening the pointcut to catch more potential places where plugin-loading could be a problem.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614330 13f79535-47bb-0310-9956-ffa450edef68
2008-01-22 21:33:50 +00:00
John Dennis Casey
8b762300ef
Improve diagnosis when no goals are passed in via the request (the goals List is null, not just empty). This can happen when used via the embedder in a non-cli scenario.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614319 13f79535-47bb-0310-9956-ffa450edef68
2008-01-22 20:52:11 +00:00
John Dennis Casey
6d0563662c
Improve error reporting bindings for two exception cases, to get away from handler(..) pointcuts which are less versatile for later debugging aspects to manipulate.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614317 13f79535-47bb-0310-9956-ffa450edef68
2008-01-22 20:50:16 +00:00
Vincent Siveton
309fadbdcc
o fixed duplicate license header
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@614084 13f79535-47bb-0310-9956-ffa450edef68
2008-01-22 01:26:47 +00:00
Milos Kleint
c8b4b7294c
the reactorpoms modules need to be checked recursively to satisfy this case:
...
parent --> submodule -->subsubmodule --> subsubsubmodule where parent defines a plugin with extensions in pluginManagement section and the subsubmodule is the one using the plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@613662 13f79535-47bb-0310-9956-ffa450edef68
2008-01-20 19:54:09 +00:00
Milos Kleint
863d1fcb8c
when version is defined in plugin-management section, we need to use it in mojo binding.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@613256 13f79535-47bb-0310-9956-ffa450edef68
2008-01-18 20:20:46 +00:00
John Dennis Casey
b731e783fa
Adding new unit test for non-recursive run, where one of the modules that should NOT be read contains an invalid parent reference.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@613254 13f79535-47bb-0310-9956-ffa450edef68
2008-01-18 20:14:44 +00:00
John Dennis Casey
facb56d1eb
Fixing compilation errors.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@613035 13f79535-47bb-0310-9956-ffa450edef68
2008-01-18 01:38:37 +00:00
John Dennis Casey
89f482ac37
last of the error-reporting unit tests, and an additional error type to handle modules that are referenced but don't exist, which should stop the build. All tests pass.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@613032 13f79535-47bb-0310-9956-ffa450edef68
2008-01-18 01:27:23 +00:00
John Dennis Casey
724b3db3c4
Adding more error-reporting unit tests.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@612920 13f79535-47bb-0310-9956-ffa450edef68
2008-01-17 18:26:35 +00:00
John Dennis Casey
4bcfd7c5a5
more unit tests for error reporting on plugins-as-extensions.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@612895 13f79535-47bb-0310-9956-ffa450edef68
2008-01-17 18:01:29 +00:00
John Dennis Casey
0c61152546
More unit tests, this time for plugin-related error messages.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@612592 13f79535-47bb-0310-9956-ffa450edef68
2008-01-16 22:17:56 +00:00
John Dennis Casey
ca169d0262
Refactor management of activated, deactivated, and default-activated profile ids, so the context tracks all of that stuff.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@612186 13f79535-47bb-0310-9956-ffa450edef68
2008-01-15 18:34:58 +00:00
John Dennis Casey
6e230d611a
two more unit tests, and a little simplification to take care of duplicated error reporting coverage.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@611974 13f79535-47bb-0310-9956-ffa450edef68
2008-01-14 23:59:01 +00:00
John Dennis Casey
c3983894ab
Adding more error-reporting fixes and unit tests.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@611945 13f79535-47bb-0310-9956-ffa450edef68
2008-01-14 21:44:59 +00:00
Milos Kleint
e10f025310
Add Thread.getId() to the realm identification, a simple trick to make DefaultMavenRealmManager lifecycle safe for paralel execution.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@611615 13f79535-47bb-0310-9956-ffa450edef68
2008-01-13 18:19:35 +00:00
Milos Kleint
fc244926ca
comment on multithreading.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@611548 13f79535-47bb-0310-9956-ffa450edef68
2008-01-13 08:41:12 +00:00
John Dennis Casey
25460922d5
More unit tests for error-reporting pointcuts, and some minor adjustments for duplicated handler methods.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@611014 13f79535-47bb-0310-9956-ffa450edef68
2008-01-11 01:57:27 +00:00
John Dennis Casey
dc770e321b
Adding some unit tests (mostly stubbed out at the moment) to start testing the pointcuts used to shunt build errors off to the appropriate error-reporter method.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@610618 13f79535-47bb-0310-9956-ffa450edef68
2008-01-10 00:07:48 +00:00
Brian E Fox
c754ccad3a
MNG-2166: enhanced missing goal error info. (fix from 587339:587340 in 2.0.x)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@609085 13f79535-47bb-0310-9956-ffa450edef68
2008-01-05 02:49:42 +00:00
John Dennis Casey
40c84ecb79
Fixing for windows users everywhere.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@605125 13f79535-47bb-0310-9956-ffa450edef68
2007-12-18 07:58:45 +00:00
John Dennis Casey
fe4363a4c5
Removing the build overlay, as it was causing problems with path translation, and doesn't serve any real purpose.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@605095 13f79535-47bb-0310-9956-ffa450edef68
2007-12-18 05:36:03 +00:00
John Dennis Casey
fbb4833982
Cleaning up reporting some more.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@604750 13f79535-47bb-0310-9956-ffa450edef68
2007-12-17 00:15:21 +00:00
John Dennis Casey
b511c734a6
Fixing issues with reports used from the site plugin, where the reports' classloaders had been disconnected from the project/core parent realms, and so couldn't use maven libraries.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@604685 13f79535-47bb-0310-9956-ffa450edef68
2007-12-16 20:09:43 +00:00
John Dennis Casey
fa0cce4fdb
Fixing case where pluginRealm == projectRealm to avoid setting parent realm == null. This would happen whenever the lifecycle forked, for instance, and would result in weird container classes not being found.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@604643 13f79535-47bb-0310-9956-ffa450edef68
2007-12-16 16:11:18 +00:00
John Dennis Casey
45729dcafc
Improving binding for PluginParameterException report.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@604642 13f79535-47bb-0310-9956-ffa450edef68
2007-12-16 16:10:21 +00:00
John Dennis Casey
10a192dfc2
fixing error reporting for when pom file is missing, and adding deprecated-mojo and deprecated-mojo-param warnings.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@604538 13f79535-47bb-0310-9956-ffa450edef68
2007-12-16 01:28:17 +00:00
John Dennis Casey
5159c0b4b6
Error reporting works properly now.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@604401 13f79535-47bb-0310-9956-ffa450edef68
2007-12-15 08:17:21 +00:00
John Dennis Casey
fe523d1151
Basic error reporting (tips aren't available for everything yet) is complete for everything the CLI typically handles directly.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@603779 13f79535-47bb-0310-9956-ffa450edef68
2007-12-12 23:40:49 +00:00
John Dennis Casey
147f00077b
Fixing broken tests.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@603455 13f79535-47bb-0310-9956-ffa450edef68
2007-12-12 04:17:58 +00:00
John Dennis Casey
441b096e79
Mapping in most of the rest of the maven-core errors to the error reporter...just need to finish the ExtensionManagerException mappings, then write error reports for the new mappings from today, and we should be in good shape.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@603431 13f79535-47bb-0310-9956-ffa450edef68
2007-12-12 00:52:26 +00:00
John Dennis Casey
3e081b677a
Fixing the legacy lifecycle mappings back to compatibility with 2.0.x in terms of classname, then mapping them back to a field in the lifecycle executor so the enforcer plugin continues to function.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@602972 13f79535-47bb-0310-9956-ffa450edef68
2007-12-10 17:22:33 +00:00
John Dennis Casey
1328959dca
Working on the compat aspect, and changing the DefaultMaven class to implement LogEnabled directly so I can grab the logger instance inside the compat aspect...AbstractLogEnabled is beyond the grasp of this aspect.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@602610 13f79535-47bb-0310-9956-ffa450edef68
2007-12-09 02:09:44 +00:00
John Dennis Casey
a104251412
Fixing debug message that snuck in as info log-level.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@602156 13f79535-47bb-0310-9956-ffa450edef68
2007-12-07 17:15:58 +00:00
John Dennis Casey
b38e6e2fad
Fixing compat aspect in cases where the Set being passed in is unmodifiable.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@601161 13f79535-47bb-0310-9956-ffa450edef68
2007-12-05 00:05:00 +00:00
John Dennis Casey
103a85a02b
Fixing plugins-as-extensions when brought in from pluginManagement to a module-project's build. Unit test included.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@601013 13f79535-47bb-0310-9956-ffa450edef68
2007-12-04 17:22:28 +00:00
John Dennis Casey
1db3b755ab
Fixing problem with new extensions manager code where custom lifecycle definitions are not used in build planning. Unit tests included.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@600792 13f79535-47bb-0310-9956-ffa450edef68
2007-12-04 04:32:13 +00:00
John Dennis Casey
f55eb07bda
Adding unit tests for plugin-as-extension in the extension scanner, cleaning up an unneeded call to registerWagons() (controlled by active collection now), and cleaning up a sysout in the embedder unit test.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@599707 13f79535-47bb-0310-9956-ffa450edef68
2007-11-30 07:11:00 +00:00
John Dennis Casey
2ec256bab6
Removing pluginRepository use (finally), and fixing pluginGroups usage with profiles from the settings and super-POM without an accompanying pom.xml in the project directory...I know, something of a convoluted case.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@599692 13f79535-47bb-0310-9956-ffa450edef68
2007-11-30 04:26:58 +00:00
John Dennis Casey
b61bb393a8
Cleaning up error reporting some for project building, and attempting to make the error reporter instances propagate to the aspects binding them to the error sources.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@599503 13f79535-47bb-0310-9956-ffa450edef68
2007-11-29 16:33:57 +00:00
John Dennis Casey
9732014c53
Fixing case where parent pom has pluginManagement, child does not refer to the plugin, and plugin is used directly on the command line...version from parent-pom pluginManagement should be used. Test case to follow.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@599338 13f79535-47bb-0310-9956-ffa450edef68
2007-11-29 08:42:38 +00:00
John Dennis Casey
941a11381c
Adding aspect-bound error reporting for BuildFailureException descendants.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@598900 13f79535-47bb-0310-9956-ffa450edef68
2007-11-28 08:11:49 +00:00
John Dennis Casey
249af52bb5
Wiring plugin-as-extension back into the new extension scanning stuff.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@598720 13f79535-47bb-0310-9956-ffa450edef68
2007-11-27 17:59:22 +00:00
Milos Kleint
deca7349ff
add maven-toolchain to the list of default excludes. necessary for proper retrieval from MavenSession's plugin context.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@597154 13f79535-47bb-0310-9956-ffa450edef68
2007-11-21 17:40:39 +00:00
John Dennis Casey
5fc3d35ce0
Removing maven-build-context, and replacing it with caching aspects for model-lineage stuff and project instances. Still needs caching for artifact resolution, and I have an aspect for this too, but it's not enabled yet, since it's still buggy.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@595215 13f79535-47bb-0310-9956-ffa450edef68
2007-11-15 05:37:55 +00:00
Vincent Siveton
643119482b
o merged r594510 (fixed line size)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@594511 13f79535-47bb-0310-9956-ffa450edef68
2007-11-13 12:39:55 +00:00
Jason van Zyl
1a286e2325
o adding PomMetadataSource for the changes to maven-artifact
...
o adding in all the artifact handlers here as they are Maven specific and don't belong in maven-artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@593857 13f79535-47bb-0310-9956-ffa450edef68
2007-11-11 08:10:35 +00:00
John Dennis Casey
7fcf47aa8c
formats.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@593625 13f79535-47bb-0310-9956-ffa450edef68
2007-11-09 19:16:06 +00:00