Commit Graph

603 Commits

Author SHA1 Message Date
Emmanuel Venisse 0713fa12dd [MNG-541]. Fix NullPointerException when mojo doesn't have parameters.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@202520 13f79535-47bb-0310-9956-ffa450edef68
2005-06-30 10:54:30 +00:00
Emmanuel Venisse b44ec86d40 [MNG-541]. Fix NullPointerException when mojo doesn't have parameters.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@202502 13f79535-47bb-0310-9956-ffa450edef68
2005-06-30 07:53:20 +00:00
Emmanuel Venisse a029d766ce Update all versions to beta-1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@202001 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 15:29:14 +00:00
Emmanuel Venisse e7e0795a20 Rollback bad commit
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201994 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 14:01:21 +00:00
Emmanuel Venisse 9e4e149f8e bumping maven-project dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201992 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 13:59:10 +00:00
Emmanuel Venisse 336ad1f71d Clean imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201984 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 13:07:42 +00:00
Emmanuel Venisse 04c30a2e05 bumping version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201983 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 13:07:08 +00:00
Brett Leslie Porter b63d6e9d32 merge changes for rev 193190 from the alpha-3 tag
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193195 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 18:33:19 +00:00
Brett Leslie Porter 7999f398e2 unused
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193194 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 18:26:32 +00:00
John Dennis Casey a707e0ce99 rolled back dumbass changes. fixed assembly plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193133 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 11:02:36 +00:00
John Dennis Casey 2fdc19b089 wrong assembly plugin version.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193130 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 10:51:04 +00:00
John Dennis Casey c4db33f5da Adding assembly plugin info to get the thing running.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193129 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 10:46:52 +00:00
Brett Leslie Porter 539658eefa minor updates, remove outdated doco
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193112 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 08:43:27 +00:00
John Dennis Casey b796b7635a Fixing bug with resolving plugins and their deps.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193111 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 08:40:15 +00:00
John Dennis Casey 9699c96631 Adjusting DefaultPluginVersionManager to resolve based on pluginRepository rather than project repo.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193091 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:44:01 +00:00
John Dennis Casey 34a6140bef Adding wagon-file to the deps list for maven-core; adding artifact-exclusions for everything found in -maven.home- /lib in DefaultPluginManager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193088 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:23:17 +00:00
John Dennis Casey fcbc5e7d6f Resolving: MNG-495
o Pressing [ENTER] at a plugin update prompt should result in the plugin being registered, as indicated by the prompt.
o Use CLI switch '--no-plugin-updates' to suppress usage of the plugin registry
o Use CLI switch '--update-plugins' to force updated/resolved plugin versions to be registered
o Neither of these has a short CLI option, since we're starting to run out of sensible char options for these types of things.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193082 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:03:10 +00:00
John Dennis Casey 78be40776c Changing DefaultPluginManager to lookup a plugin's artifact from pluginRepositories, and changing the location of the super-pom's pluginRepository.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193081 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:00:33 +00:00
John Dennis Casey 6100b37321 Updating non-maven, non-modello deps to get rid of snapshots. Also removed marmalade stuff from mboot.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193052 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 02:31:28 +00:00
John Dennis Casey 8b85e50c52 Adding artifact filter for the plexus-input-handler...release-plugin uses it, and so does the PluginVersionManager, leading to CCE's.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@192972 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 18:40:34 +00:00
Brett Leslie Porter c3d0ba0846 use managed versions for project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191783 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 08:25:34 +00:00
Brett Leslie Porter 3f2f0d50a3 simplify the resolveTransitively API, and implement the new collector up to the level of functionality of the original.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191773 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 06:46:26 +00:00
John Dennis Casey 854b76e61f Fixing plugin-version prompting once and for all (hopefully)...at least, the logic.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191757 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 03:27:27 +00:00
Brett Leslie Porter 3bee4a55c1 change artifact resolution result to have a set of artifacts instead of a map, as everything dealt with them as a collection anyway.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191748 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 00:31:33 +00:00
Brett Leslie Porter 6cd2e31078 refactoring of the resolveTransitiveDependencies call.
simplified by removing a bunch of duplicated code in addArtifacts - no need to merge, you have the full list. 
separated the original artifacts (dependency artifacts) from the resolved artifacts (getArtifacts)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191667 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 15:32:02 +00:00
John Dennis Casey 4ce86c9b87 Resolving: MNG-495
o Pressing [ENTER] at a plugin update prompt should result in the plugin being registered, as indicated by the prompt.
o Use CLI switch '--no-plugin-updates' to suppress usage of the plugin registry
o Use CLI switch '--update-plugins' to force updated/resolved plugin versions to be registered
o Neither of these has a short CLI option, since we're starting to run out of sensible char options for these types of things.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191664 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 14:51:55 +00:00
Brett Leslie Porter 2561a2893f reduce phase bindings for plexus application
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191658 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 13:50:00 +00:00
Brett Leslie Porter 86aa7ce7da comment and clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191653 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 12:16:26 +00:00
Brett Leslie Porter 26d36d8959 PR: MNG-140
split artifact impl from api so that dep resolution can be used independently of wagon
only the first step in making maven-artifact more useful as a public api - more changes to be made


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191634 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 06:49:49 +00:00
John Dennis Casey ce0065fea3 Adding feedback for version-update prompt, and fixing bug with [a]ll selection.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191618 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 02:56:23 +00:00
John Dennis Casey cda19f2e5c Resolving: MNG-494
o During addPlugin() only the plugin's artifact is resolved/added...just enough to get the plugin container to discover the pluginDescriptor.

o During getConfiguredMojo(), the rest of the plugin's artifacts will be transitively resolved and added to the plugin container (if this hasn't already been done). The deciding factor for attempting to complete the plugin container's artifact list is whether the only artifact in the pluginDescriptor's artifact list is the plugin artifact itself. If that makes sense.

It's a bit of black magic, but I think it'll work unless/until we find something more elegant. I'm abusing the container a little bit here, so it might be sensitive to plexus changes in future.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191582 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 22:42:26 +00:00
John Dennis Casey d7e421fd01 Resolving: MNG-496
o Adding extraction of mojo-specific configuration from the merged config for the plugin
o Warning at the DEBUG log-level for unused plugin configuration during the extraction process above
o Added integration test it0028 to test with unused plugin configuration present.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191552 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 20:11:01 +00:00
John Dennis Casey 9aaca6a72d o Added conversion handling of checksumPolicy to Settings and Profiles.
o Moved the profiles-builder stuff into maven-profile, to make that API more self-contained for reuse in Ant tasks, etc.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191551 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 20:08:05 +00:00
John Dennis Casey fda77afb12 Resolving issue: MNG-339
o Added checksumPolicy to artifact repository construction, which meant changing all the places where the factory was called.

o Added two command-line switches (-C=strict-checksum-checking, -c=lax-checksum-checking, or warning)

o Added checksum policy to all repository definitions (profiles.mdo, settings.mdo, maven.mdo)

o Changed the maven-artifact-ant stuff to use a Repository definition with checksumPolicy added to it

NOTE: I just realized that I haven't touched the inheritance/conversion of repository stuff from profiles/settings.xml to the model. I'll do this, and commit the additional changes.

Currently, the default checksum policy is to warn, since there are still bad checksums out there that prevent bootstrapping. Once we chase these down, we can change to default-strict checking. When verifying checksums, SHA-1 is attempted first, with MD5 acting as a backup verification method. If the checksum verification fails legitimately (not related to the process of retrieving/reading the checksum file), then the verification process is repeated ONCE ONLY.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191536 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 18:53:53 +00:00
Brett Leslie Porter ae93f02c8d PR: MNG-418
use a silent transfer monitor in batch mode


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191492 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 15:21:50 +00:00
Brett Leslie Porter 22f6d7e1a7 only report 0 seconds if there was no minutes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191487 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 15:10:39 +00:00
Brett Leslie Porter 8dec28247b PR: MNG-471
implemented cloned lifecycle, project and tests. update mojos accordingly


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191476 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 14:42:56 +00:00
Brett Leslie Porter 543189e2fd PR: MNG-471
- correct the lifecycle instantiation
- read/write executeLifecycle in the plugin descriptor


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191416 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 08:00:53 +00:00
Brett Leslie Porter 81fe76fd27 PR: MNG-471, MNG-489
- refactor project out of MavenSession so that it can be cloned
- refactor lifecycle construction out so we can clone the existing one and pass it into a new execution
- only resolve plugins that are executed (MNG-489)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191413 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 07:17:32 +00:00
Brett Leslie Porter f64881f21a use newer wagon
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191402 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 06:45:04 +00:00
Brett Leslie Porter ded91a973b better default bindings of goals for a plexus application
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191399 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 06:15:34 +00:00
John Dennis Casey 68e52f7f9c Adding default interval type of minutes, in case W|D|H|M is not specified. This is to be consistent with the snapshot policy in the repository.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191357 13f79535-47bb-0310-9956-ffa450edef68
2005-06-19 18:02:07 +00:00
John Dennis Casey 9863732555 PR: MNG-432
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191312 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 23:45:47 +00:00
Brett Leslie Porter 1a63032af4 PR: MNG-469
configure reports according to spec:
- <reporting> section affects reports run through site and standalone
- <build> section affects reports run standalone and overrides anything already in <reporting>
- command line parameters rule all



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191298 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 16:21:49 +00:00
Brett Leslie Porter a257dca4f9 re-enable reports by correcting tag name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191289 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 13:47:50 +00:00
Brett Leslie Porter c16f3e139f record the base version (ie, keep SNAPSHOT so each new snapshot doesn't cause a prompt)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191287 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 13:29:36 +00:00
Brett Leslie Porter a9f174c834 Clean up of the lifecycle executor, simplify configuration and push back into the plugin manager.
This fixed a couple of bugs along the way.

One change that this has brought to bear from the document is you now must specify a goal for it to be bound to the LC
(see it0008)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191285 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 13:01:26 +00:00
Brett Leslie Porter dedfacf69a remove unused code and empty directories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191267 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 05:20:21 +00:00
John Dennis Casey fdfb9d5a2d Changing <reporter/> to <plugin/> in the reporting section.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191266 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 04:23:20 +00:00
John Dennis Casey 60750dede2 Working on issue: MNG-469
o Changed <reports/> in the Model to <reporting/>, to accommodate the <reports/> inside of <reportSet/>.

o Changed the report-plugin class <plugins/> inside of <report[ing]/> to <reporters/>, which means using a new class called Reporter (this is meant to be a Plugin-like model for reports, with reportSets rather than executions...)

o Changed the MavenProject to reflect these two model changes

o Added support to the inheritance assembler to perform deep inheritance of the reporting model (complete with calculations based on the <inherit/> attributes on Reporter and ReportSet).

o Updated DoxiaMojo, Pom, and DefaultPluginVersionManager to reflect the new model classes and MavenProject methods.

This is only round one of the changes for this issue. The next step is to start binding report configuration to the plugin manager via the lifecycle executor (it will traverse the reporting section, and verifyPlugin() to enable direct calls to the report's mojo).



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191239 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 00:43:00 +00:00