1fc7419f03
o Added <properties/> for profiles configured in the pom.xml
...
o Split ModelNormalizationUtils into two utility classes in the maven-profile and maven-settings projects, to be used for converting Profile instances from the settings.xml and profiles.xml into maven-model instances.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190344 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 04:21:27 +00:00
d2e1f3c975
o Adding support for <executions/>, which means multiple runs of the same goal/set-of-goals with different configs.
...
o Adding @phase declarations for those mojos that seem to be part of the main build, just for completeness
o Added two ITs, to test that <executions/> doesn't mess up the normal operation, and to test multi-execution for a goal.
Should resolve: MNG-172.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190335 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 02:47:57 +00:00
8918d09b75
remove MAVEN_OPTS - no need for such a high setting, and make it consistent with the shell script
...
also, the form of MAVEN_OPTS did not work when it was already set due to extra quoting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190218 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 05:16:59 +00:00
2a8ed2f339
PR: MNG-154
...
Define the lifecycle according to packaging.
Some more work on the structure of this is required.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189871 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 00:57:19 +00:00
8a257be6fc
Fixed problems with merging profile-defined properties into the project, and fixed the ITs testing profile definitions in the process.
...
This should finally resolve MNG-421
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189768 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 15:53:31 +00:00
30b1434723
Resolving: MNG-421
...
o External profiles (from settings.xml, profiles.xml) are now available before the main MavenProject is constructed, which allows repositories defined in external profiles to be used to resolve project parents and dependencies.
NOTE: I need to double-check whether the profile-defined repos are actually used to resolve the parent project(s)...there may be another commit following on the heels of this one.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189667 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 23:34:35 +00:00
921d4ced59
o Started maven-projecthelp-plugin to help with build analysis (this helped me to visualize profile stuff)
...
current goals:
projecthelp:active-profiles
projecthelp:effective-pom
o Added source attribute to the Profile model class in maven-model, along with code in the normalization utilities (converters from profiles.xml and settings.xml models to maven-model instances) to identify the source of a particular profile.
o Added a activeProfiles cache of the Profiles in effect for the current project, on the MavenProject class
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189612 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 17:54:11 +00:00
7c69d89b08
add wagons to the exclusion list as long as they are in core (needed for site:deploy)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189525 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 05:18:36 +00:00
a58b76e2e4
Adding profiles.xml and settings.xml support for profiles, along with integration tests for each.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189510 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 03:27:43 +00:00
420d9a5fca
remove old cvs ignore files
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188697 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 05:24:51 +00:00
619871e7bd
remove commented out sections from last commit
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188691 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 04:46:18 +00:00
9d31796e99
PR: MNG-366
...
reverse the reference. DoxiaMojo depends on maven-core instead of maven-core depending on the reporting api + doxia
This is not a great solution, but it gets us closer. It is currently not possible, as before, to get the correct set of reports as they are all loaded into the one container and then everything found is returned.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188690 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 04:41:54 +00:00
5442089b82
no need for beanshell in the core
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188679 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 03:29:38 +00:00
3623775987
only test the expressions if the field is required
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188656 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:33:41 +00:00
89da261562
put back deprecation message
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188649 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:16:17 +00:00
a48cfef4eb
PR: MNG-423
...
move default value into configuration, rather than relying on Java. More convenient for other languages, and allows us to validate/document it. Cleaned up the plugin manager handling. More should be pushed into plexus proper.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188647 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:13:52 +00:00
a96a03d0a0
o Removed dependency on plexus-container-artifact, using nested DefaultPlexusContainer instances instead for plugin isolation.
...
o Moved marmalade support dependencies out of maven-core, since they can be supported on demand now
o changed the ordering of the ant and assembly plugins, to show that the classloader (plugin param) bug is fixed.
o added a method in PluginDescriptor which is similar to o.a.m.model.Plugin.getId() (I think that's the method; it's the one that results in a key of 'g:a')
o moved wagon-ssh dependency into maven-core, since there is a new issue related to nested containers and wagons which are introduced as plugin dependencies. This should be solved using a mechanism similar to plugin-manager for wagon-manager impl in future anyway
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@187639 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 00:37:01 +00:00
4aa157e75c
cosmetic update
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@180243 13f79535-47bb-0310-9956-ffa450edef68
2005-06-06 06:37:26 +00:00
900449d57e
Remove plexus-i18n from core for use it in plugins, site and reports
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@180100 13f79535-47bb-0310-9956-ffa450edef68
2005-06-05 15:21:52 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
d9ac5ea1e5
use consistent ordering for reactored projects
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168569 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 08:22:28 +00:00
4f60e7e0a1
fix substitution in messages files
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168568 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 08:21:58 +00:00
3f031d5722
avoid NPE if there are not report plugins defined in the POM when generating the site.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168565 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 08:05:52 +00:00
d17b250fec
- allow multiple versions of a plugin to operate concurrently.
...
- allow specification of a mojo as groupId:artifactId:version:goal
- general removal of more hard coding
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168543 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 07:03:14 +00:00
4b12bf0e6e
add (commented out) reports
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168514 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 03:57:48 +00:00
acabb9d990
Added isXXXEnabled() methods to Log.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168486 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 01:00:37 +00:00
5877385df1
Final pass on cleaning up the mojo api...collapsed MavenPluginDescriptor and PluginDescriptor in the same way as MavenMojoDescriptor/MojoDescriptor had been; eliminated the need for plugin.descriptor.Dependency and MavenPluginDependency (using ComponentDependencies instead); adjusted the MojoExtractors (name?) to return Lists instead of Sets; added duplicate checking to a new addMojo(MojoDescriptor) method on PluginDescriptor, so we catch it on all sides; changed the Generators to use execute(outputDirectory, pluginDescriptor) rather than the myriad pluginDescriptor-derived values; added an IT for checking that the build for a plugin will fail if multiple mojos are detected with the same goal; and, added a special case to PluginDescriptor.getGoalPrefixFromArtifactId() to handle maven-plugin-plugin. That should be about it. I'm not sure that I've gotten the IT for that failure test added to svn yet, so that may follow.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168481 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 00:32:08 +00:00
c9d01daf19
remove erroneous TODO item
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168295 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 07:23:13 +00:00
7363dbc843
PR: MNG-145
...
Implement and document repository download mirrors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168292 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 07:16:07 +00:00
6dca9007eb
a couple of notes
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168278 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 05:44:44 +00:00
e095874576
Cleaned up plugin descriptor generation/reading to be more consistent, and to include some things that were being left out. Removed more deprecated behavior from annotations support and expression support. Wrote up the first pass on the mojo api and annotations spec. Fixed the mmld-mojo suppport to accommodate the new expression syntax and collisions with the default expression evaluator for mmld. Added an exception to plugin configuration in DefaultPluginManager to not look for a Field when the configurator == map-oriented.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168233 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 01:33:42 +00:00
bd9a7f4f7b
Add some debug trace
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168221 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 00:40:46 +00:00
e94fd427f3
improve error message if there is no expression
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168220 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 00:35:55 +00:00
d4af503a5c
align error handling with that of m1
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168214 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 23:43:47 +00:00
705f269567
Fix APT
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168185 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 20:40:04 +00:00
acfba80edc
consolidate defaults injection
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168152 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 17:34:52 +00:00
7f7a1049e6
improve the artifact ID parsing - any maven or plugin is removed to get the default prefix. If you want something different, use the configuration for plugin:descriptor
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168141 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 16:23:42 +00:00
671b0828ec
remove unused function
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168135 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 14:55:57 +00:00
24c6328ad3
declare the desired "prefix" inside the plugin descriptor instead of pulling apart the artifact ID (though that is how the default is created).
...
Currently, the reverse is not handled in anyway, so a non-default prefix may not work, but this makes the code easier to isolate.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168099 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 08:17:39 +00:00
118a53927d
remove old style req, resp mojo support
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168082 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 05:52:55 +00:00
5345ee5fc6
Removed backward compat for plugin class-level parameter annotations and '#' expressions.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168070 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 04:20:36 +00:00
690bc67fb9
Added marmalade support back in...it's currently still using the libraries-shovelled-into-core method, but it now uses the new mojo mechanism that uses plexus ComponentConfigurators...had to make the lookup for configurators dynamic for the DefaultPluginManager, too.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168064 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 03:28:41 +00:00
e12a025c81
remove unused component dependencies
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168053 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 02:42:43 +00:00
19d96b6163
reduce the code duplication of the injection
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168052 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 02:38:39 +00:00
e0b032ac0a
improve the structure of the lifecycle execution code
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168041 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 01:40:59 +00:00
b5670bdcaa
start to clean up the plugin vs. goal name handling so the hardcoding can be reduced, and eventually removed
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168040 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 01:20:49 +00:00
e9a7f3ce85
Initial version of site generation with repots.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168031 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 00:47:01 +00:00
6bb39db726
improve error message
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165604 13f79535-47bb-0310-9956-ffa450edef68
2005-05-02 08:19:01 +00:00
95a1895b16
add integration test phase
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165598 13f79535-47bb-0310-9956-ffa450edef68
2005-05-02 07:22:47 +00:00
8d4ca04b2d
fix bad expression handling
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165597 13f79535-47bb-0310-9956-ffa450edef68
2005-05-02 07:22:18 +00:00
3966104e9c
Removed the need for MavenMojoDescriptor (collapsed to just MojoDescriptor)...also partially setup the possibility for container-injected configurations, provided we enhance as described in getting-to-container-configured-mojos.apt.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165378 13f79535-47bb-0310-9956-ffa450edef68
2005-04-30 03:50:47 +00:00
36f970b652
don't fail if there is a default value and the parameter is set to required.
...
Reformat according to intelliJ settings.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165266 13f79535-47bb-0310-9956-ffa450edef68
2005-04-29 06:06:14 +00:00
f5cd6adbe7
Cleaning up errors I introduced with search-and-replace, and with marmalade scripting support. I'm marking marmalade support out for now, until I can get that stuff dragged back into the present.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165242 13f79535-47bb-0310-9956-ffa450edef68
2005-04-29 00:29:04 +00:00
a58632b9dd
Renamed Plugin.java, AbstractPlugin.java, PluginExecutionRe(quest|sponse) PluginExecutionException to Mojo*
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165238 13f79535-47bb-0310-9956-ffa450edef68
2005-04-29 00:12:09 +00:00
ab91b7f4c2
o Cleaned up field-level annotation support (especially descriptor extraction, generation, and building)
...
o Converted all "core" plugins (including maven-core-it-plugin) to use field-level annotations
o Removed generation of parameter descriptors for ${/#component.* param specifications.
o Added @readonly for parameters that cannot be overridden by user configuration (List override was dangerous here)
o Added validation against pom-derived configuration for @readonly parameters
o Fixed @parameter alias="" support...now configuration of the mojo instance actually will work with either the real param name or the alias. Would be nice to support multiple aliases, but that might require @alias annotations...
o Added [temporary?] support for null editable attributes for parameters, to support pre-built mojos from the repo.
Annotation support should be just about ready to go...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165224 13f79535-47bb-0310-9956-ffa450edef68
2005-04-28 23:05:01 +00:00
23ec733870
don't create dummy configuration for components
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165171 13f79535-47bb-0310-9956-ffa450edef68
2005-04-28 17:56:04 +00:00
092c9b2423
fix typo in exclusion list
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165074 13f79535-47bb-0310-9956-ffa450edef68
2005-04-28 00:42:33 +00:00
3760f873a1
PR: MNG-167
...
Add the ability for a mojo to "fork" a phase execution, in a separate iteration of the lifecycle.
Add @executePhase generate-sources to idea:idea
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164930 13f79535-47bb-0310-9956-ffa450edef68
2005-04-27 01:16:06 +00:00
9a1bc52a21
fix package
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164910 13f79535-47bb-0310-9956-ffa450edef68
2005-04-26 23:23:33 +00:00
d8d2e34dca
Resolving MNG-221, simplify qdox with field-level mojo parameter annotations
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164872 13f79535-47bb-0310-9956-ffa450edef68
2005-04-26 20:30:21 +00:00
00d581599b
move MavenMetadataSource to maven-project from maven-core
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164391 13f79535-47bb-0310-9956-ffa450edef68
2005-04-23 15:02:01 +00:00
23835350c8
fixes related to changing the path of parent poms, though the actual functionality is not implemented
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164346 13f79535-47bb-0310-9956-ffa450edef68
2005-04-23 06:24:08 +00:00
9eec3fc5c2
I fell for the oldest trick in the book again...
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164324 13f79535-47bb-0310-9956-ffa450edef68
2005-04-23 03:24:39 +00:00
23b8cd0e46
remove unnecessary maven-core dependencies
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164322 13f79535-47bb-0310-9956-ffa450edef68
2005-04-23 03:12:07 +00:00
8e8d95924f
fix error message
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164299 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 23:39:05 +00:00
e313416d63
separate maven-project code
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164217 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 11:01:33 +00:00
9774d3d1cb
decouple project stuff from maven-core
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164205 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 09:01:47 +00:00
a803fc26b4
move artifact repository factory into maven-artifact
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164201 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 08:48:41 +00:00
874a8c1245
add more use of ${} expressions, fix problem when } was not at end
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164195 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 08:33:34 +00:00
d43cfef170
decouple auth info from repository, allows removing settings from project code
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164189 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 07:55:32 +00:00
7d6b029c43
some clean up of components and artifact repository factory
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164181 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 07:16:09 +00:00
c98b557ac8
move artifact factory to maven-artifact
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164178 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 06:16:25 +00:00
21d261f503
clean the artifact factory interface a little
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164172 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 05:19:04 +00:00
c289cf4f7f
change expressions to use ${} instead of #
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164171 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 04:32:35 +00:00
c8b5f21331
fix README instructions to be inline with web site
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164168 13f79535-47bb-0310-9956-ffa450edef68
2005-04-22 04:06:28 +00:00
aafbd6b61c
remove dependency on settings from the project builder
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164089 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 17:17:36 +00:00
be6703f6da
disperse constants only used in one place
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164081 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 16:26:57 +00:00
bc738a21f4
move utils to plexus-utils
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164078 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 16:16:25 +00:00
804e18cac0
improved error handling for failed downloads
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164065 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 14:17:14 +00:00
c7e407ba12
improve error handling for failed downloads
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164058 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 13:47:42 +00:00
c435539656
improve download/upload monitors
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164024 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 10:11:08 +00:00
8e279f87e1
avoid NPE when there is no project file
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163991 13f79535-47bb-0310-9956-ffa450edef68
2005-04-21 00:49:19 +00:00
ab2070d797
add deprecated parameter feature
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163983 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 16:49:01 +00:00
c1cea8cbb8
factor out project sorter, and use whole ID
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163982 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 16:48:11 +00:00
06ebdedc0c
PR: MNG-316
...
Submitted by: Kenney Westerhof
Reviewed by: Brett Porter
fix NPE when there is no default plugin configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163981 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 16:46:27 +00:00
a75e7d2577
improved error handling and other clean up
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163979 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 16:41:36 +00:00
4fe1c64276
clean up exception handling
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163978 13f79535-47bb-0310-9956-ffa450edef68
2005-04-20 04:16:11 +00:00
d377256c93
update to new container
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163972 13f79535-47bb-0310-9956-ffa450edef68
2005-04-19 09:00:48 +00:00
9e512f8d03
posting an update that represents changes in the design for offline mode, back to being more similar to m1's concept of it.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163970 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 23:15:25 +00:00
61406495be
o Refactored the MavenSettings code into the settings.mdo/Settings class.
...
o Added code to cache the active proxy and profile inside the Settings instance for quicker lookup.
o Added a method to initialize a new active profile for a Settings instance in the event one didn't exist.
o Started adding offline mode. So far, I've implemented:
- Warning when a mojo declares a requirement for connectivity, but we're offline.
- INFO message stating when maven is running in offline mode.
- Addition to the Profile class in o.a.m.settings package to allow specification of offline mode by declaring: <offline>true</offline>
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163969 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 21:50:55 +00:00
30d097daaa
remove half-done declaration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163967 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 07:08:21 +00:00
335af74bb5
add missing delegation
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163965 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 04:27:02 +00:00
2a143e22e6
update wagon
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163954 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 08:33:19 +00:00
e054a2fa5a
resolve outstanding issues with scoping regarding tests. Algorithm to be documented in user's guide.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163953 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 07:31:40 +00:00
912898c716
PR: MNG-285
...
fix bug in plugin management inheritence
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163952 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 06:16:47 +00:00
8ace38fbce
PR: MNG-281
...
show id if name is null in reactor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163951 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 05:46:13 +00:00
f4bf6c145d
allow the expression evaluator to align strings to a base directory, for the purposes of the file converter
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163949 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 05:29:00 +00:00
b2e4433615
utilise the container for populating all mojo configuration, including expressions
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163947 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 04:52:31 +00:00
378cc229a3
convert #component expressions to <requirements/>
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163942 13f79535-47bb-0310-9956-ffa450edef68
2005-04-14 03:27:35 +00:00
f0e391dba7
Adding maven-plugin back to the exclude filter for artifact download temporarily, until the plugins are fixed...feel free to roll this back if it's a horrible idea.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163941 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 18:44:13 +00:00
85cc412a5f
PR: MNG-225
...
use both groupId and artifactId in mojo descriptor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163937 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 11:34:09 +00:00
John Dennis Casey
Brett Leslie Porter
Emmanuel Venisse
Trygve Laugstol
Jason van Zyl