Commit Graph

522 Commits

Author SHA1 Message Date
Trygve Laugstol d34ec0926a o Fixing a small bug that would cause a NPE if a plugin doesn't contain any mojos.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@180000 13f79535-47bb-0310-9956-ffa450edef68
2005-06-04 16:10:13 +00:00
Jason van Zyl 177692f82c o sorting the artifacts used in the filter
o adding plexus-i18n which has now been added to the site rendering
  mechanism to provide internationalization support.
  


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179923 13f79535-47bb-0310-9956-ffa450edef68
2005-06-04 01:31:13 +00:00
Emmanuel Venisse c4809aed16 Fix typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179775 13f79535-47bb-0310-9956-ffa450edef68
2005-06-03 11:56:03 +00:00
Brett Leslie Porter a60964a9af fix typo in lifecycle
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179517 13f79535-47bb-0310-9956-ffa450edef68
2005-06-02 05:41:27 +00:00
Emmanuel Venisse 7bba85198e Check if plugin contains some mojo, and send an exception instead of NullPointerException if it isn't the case.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179369 13f79535-47bb-0310-9956-ffa450edef68
2005-06-01 09:08:04 +00:00
John Dennis Casey 215c30bbb3 Moved the packages org.apache.maven.model.settings and org.apache.maven.model.profiles to org.apache.maven.settings and org.apache.maven.profiles, respectively.
This is restoring the settings to their original package structure, and putting profiles next to it...the change I'm reversing was not a good one, conceptually.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179289 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 21:48:55 +00:00
John Dennis Casey 25fb7c646d improved the error diagnosis for invalid plugin parameters, as in MNG-345
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179274 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 21:01:25 +00:00
John Dennis Casey 23f82d0199 o Added runtime exception to construction of DefaultArtifact, when one or more of the four attributes required for object identity are null
o Created corresponding runtime exception: InvalidArtifactRTException
o Added error diagnoser for InvalidArtifactRTException
o Changed logError() in DefaultMaven to use error diagnosers (even the devs could use a hand!)
o Added unit test for InvalidArtifactDiagnoser.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179265 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 19:31:58 +00:00
John Dennis Casey 9d7e54c042 o Added model and builder support for Profiles specified in settings.xml, profiles.xml, and the POM.
o Changed MBoot and Verifier accordingly.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179233 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 16:24:34 +00:00
Emmanuel Venisse 2e3a99cd03 Use a release version of plexus i18n
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179148 13f79535-47bb-0310-9956-ffa450edef68
2005-05-30 21:10:56 +00:00
Emmanuel Venisse 4e6b33d359 o upgrade plexus-container to alpha-4-SNAPSHOT
o upgrade plexus-utils to alpha-3 until xpp stuff is fix in 1.0.0

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179122 13f79535-47bb-0310-9956-ffa450edef68
2005-05-30 18:24:32 +00:00
Brett Leslie Porter 17518785ac upgrade to container with separated utils
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178995 13f79535-47bb-0310-9956-ffa450edef68
2005-05-29 22:55:12 +00:00
John Dennis Casey fda1ed95c9 o changed the inheritanceApplied flag to be set by default, and unset if the plugin is merged to the child without <inherit/> being specified...this makes it work with isolated POMs.
o changed the semantics of when the unsetInheritanceApplied() method is called...it's now only when <inherit/> is NOT set.
o changed the default inheritByDefault attribute on MojoDescriptor to be true
o added inheritByDefault to PluginDescriptor (even though we don't have tools supporting it yet), with semantics identical to MojoDescriptor
o added generator/builder support for the inheritByDefault attribute of PluginDescriptor
o added calculation of inheritanceApplied || inheritByDefault to lifecycle executor before allowing plugins/mojos to bind.
o Everything builds, but we need some sort of IT to test the finer points.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178836 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 23:05:09 +00:00
John Dennis Casey 239439bb04 o Added inherited field to the Plugin and Goal classes in maven.mdo
o Added annotation inheritedByDefault (looks like: @inheritedByDefault true|false) for java mojos
o Added support for inheritedByDefault to MojoDescriptor, descriptor generator and builder
o Factored the plugin combinatorial logic into ModelUtils in o.a.m.project, for later reuse in a plugin-aware model inheritance builder
o Refactored the DefaultModelDefaultsInjector to use the new ModelUtils for plugin merging (this is factored into a utility for reuse in inheritance assembly)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178733 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 03:27:55 +00:00
Brett Leslie Porter 84269d34fa PR: MNG-359
Allow .. in module names to support a flat layout for eclipse


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178621 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 08:40:05 +00:00
Brett Leslie Porter ba2f6ce87a hasArgs was the culprit
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178058 13f79535-47bb-0310-9956-ffa450edef68
2005-05-24 00:46:54 +00:00
Brett Leslie Porter 47cf3a81f4 cli 1.0 is broken - on linux, empty vars occur and it checks up the arg list as part of -D arguments
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178056 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 23:49:52 +00:00
Emmanuel Venisse 5c7ac1cb57 Add javadoc report
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177962 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 12:17:30 +00:00
Brett Leslie Porter 6f74c90590 allow multiple system properties to be specified
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177938 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 07:18:16 +00:00
Emmanuel Venisse 0b208ead83 Clean imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170987 13f79535-47bb-0310-9956-ffa450edef68
2005-05-19 20:14:08 +00:00
Emmanuel Venisse a624012a8d Check if mojo has parameters before populate it
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170736 13f79535-47bb-0310-9956-ffa450edef68
2005-05-18 11:59:09 +00:00
Emmanuel Venisse 2f6b576c4b Check if mojo has parameters before populate it
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170735 13f79535-47bb-0310-9956-ffa450edef68
2005-05-18 11:51:42 +00:00
Brett Leslie Porter 0253ccc305 PR: MNG-164
Add Beanshell mojo support

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170608 13f79535-47bb-0310-9956-ffa450edef68
2005-05-17 15:11:41 +00:00
Brett Leslie Porter d85ce5d9ef m upgrade to commons-cli 1.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170499 13f79535-47bb-0310-9956-ffa450edef68
2005-05-17 01:06:38 +00:00
Brett Leslie Porter 92780b9511 remove redundant vars
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170490 13f79535-47bb-0310-9956-ffa450edef68
2005-05-16 23:43:58 +00:00
Emmanuel Venisse 025d519b89 Remove debug
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170435 13f79535-47bb-0310-9956-ffa450edef68
2005-05-16 19:48:50 +00:00
Emmanuel Venisse 8b6052bbc6 Start of release plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170406 13f79535-47bb-0310-9956-ffa450edef68
2005-05-16 16:27:51 +00:00
Brett Leslie Porter f9f481fc12 turn on reports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170017 13f79535-47bb-0310-9956-ffa450edef68
2005-05-13 13:20:13 +00:00
Brett Leslie Porter 7ed8a746d3 update to released versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169961 13f79535-47bb-0310-9956-ffa450edef68
2005-05-13 07:01:57 +00:00
Brett Leslie Porter c334dfaf2a PR: MNG-344
correctly render exceptions for initial project retrieval failure

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169591 13f79535-47bb-0310-9956-ffa450edef68
2005-05-11 05:58:03 +00:00
Brett Leslie Porter 8fc3e7a305 PR: MNG-338
Helpful error message for non-redistributable JARs, eg jdbc

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169577 13f79535-47bb-0310-9956-ffa450edef68
2005-05-11 04:29:44 +00:00
Brett Leslie Porter d64970af4d propogate more ArtifactResolutionExceptions directly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169557 13f79535-47bb-0310-9956-ffa450edef68
2005-05-11 02:13:18 +00:00
Brett Leslie Porter b10ed41fca reformat, apply license
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169548 13f79535-47bb-0310-9956-ffa450edef68
2005-05-11 01:04:50 +00:00
Brett Leslie Porter 967fa87820 PR: MNG-373
make sure plugin configuration is always injected

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169490 13f79535-47bb-0310-9956-ffa450edef68
2005-05-10 16:14:34 +00:00
Brett Leslie Porter 14b9e9f347 remove default plugin versions from super POM, rely on discovery of releases. Write out the current version during bootstrap to force its usage (unfortunately enforcing it on other installs, however...)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169484 13f79535-47bb-0310-9956-ffa450edef68
2005-05-10 15:04:06 +00:00
Brett Leslie Porter 158a667d94 remove maven-monitor dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169433 13f79535-47bb-0310-9956-ffa450edef68
2005-05-10 07:50:47 +00:00
Brett Leslie Porter d47f6c7dd6 move the Log interface to o.a.m.plugin.logging in maven-plugin-api, breaking the dependency on maven-monitor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169431 13f79535-47bb-0310-9956-ffa450edef68
2005-05-10 07:39:33 +00:00
Brett Leslie Porter 2eb327853b we do not currently support concurrent versions of a plugin a build as there is no access to the resolved version outside of the artifact container
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169398 13f79535-47bb-0310-9956-ffa450edef68
2005-05-10 02:57:10 +00:00
John Dennis Casey 7eda955b1d o Cleaned up a couple of things in repoclean that broke with the last update.
o Added concept of ErrorDiagnoser to help interpret errors and provide user feedback
o Added PluginParameterException to provide richer information than simply PluginConfigurationException (it's derived from PluginConfigurationException)
o Added implementations of ErrorDiagnoser for artifact resolution and plugin configuration handling.
o Modified DefaultMaven's logFailure(..) method to use errorDiagnosers Map (injected via Plexus)

I approached the plugin parameter expression/name feedback in this way, as it seems like a general pattern for interpreting errors without embedding this logic deep within the app itself. Feel free to rollback if this causes issues.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169379 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 23:30:01 +00:00
Brett Leslie Porter 05affa0a65 PR: MNG-192
Add "RELEASE" notation so that plugins without a version can be discovered

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169303 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 12:30:10 +00:00
John Dennis Casey 469f96a4f1 o Added '-e' switch, to allow error stacktraces without enabling DEBUG error level throughout.
o Added listing of error messages from getCause() chain in DefaultMaven rather than simply spitting out the (often useless) aggregator Exception's message.
o Added '-e' to the IT verifier's invocation of m2.

I'm trying to get visibility to errors here...

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169230 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 04:25:56 +00:00
Brett Leslie Porter 8e6a8fa694 actually make the changes I said I had for MNG-372
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169202 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 00:22:11 +00:00
Brett Leslie Porter 46e32b8b90 PR: MNG-371
Submitted by: Kenney Westerhof
Reviewed by:  Brett Porter
give the location of the plugin descriptor

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169201 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 00:21:33 +00:00
Brett Leslie Porter 0a7842482f PR: MNG-372
Submitted by: Mark Hobson
Reviewed by:  Brett Porter
deal better with spaces in paths on windows
(applied with modifications)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169184 13f79535-47bb-0310-9956-ffa450edef68
2005-05-08 22:50:01 +00:00
Brett Leslie Porter 6348de7143 comment out readonly check, as it breaks an integration test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169172 13f79535-47bb-0310-9956-ffa450edef68
2005-05-08 21:47:31 +00:00
Emmanuel Venisse dd4c6fb600 Add reports to the menu
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169077 13f79535-47bb-0310-9956-ffa450edef68
2005-05-07 13:01:17 +00:00
John Dennis Casey f1d5f829f2 Correcting module-path validation to error on '..' rather than '/'...'/' causes problems when modules are not direct subdirs of the current basedir.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168639 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 19:17:11 +00:00
Brett Leslie Porter b90399de88 make sure debug really is debug by initialising before DefaultMaven gets looked up.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168635 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 18:56:34 +00:00
John Dennis Casey 76c4ceda28 o Added duplicate check for mojo descriptor Parameters
o changed the exception(s) throws during mojo descriptor extraction to be derivatives of InvalidPluginDescriptorException
o changed PluginConfigurationException in plugin.descriptor to InvalidPluginDescriptorException
o changed all "true".equals(something) to Boolean.valueOf(something).booleanValue()
o added validation of 'modelVersion' back to [Default]ModelValidator
o Fixed/added tests for new 'modelVersion' validation
o changed all requiresXXX in MojoDescriptor to XXXRequired, and getRequiresXXX():boolean to isXXXRequired():boolean to help maintain bean-ness for future use




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168630 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 17:41:03 +00:00
Brett Leslie Porter 216a640dd0 recognise prefix of plugins already loaded
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168605 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 14:21:00 +00:00