Commit Graph

2395 Commits

Author SHA1 Message Date
John Dennis Casey fd3e9fe9e2 Fixing artifact handling to only process the runtime artifacts, and select out the tld's from that. This is for the war mojo, BTW. :)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191688 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 17:13:24 +00:00
Brett Leslie Porter ea5bbda3e0 add failing test for MNG-63
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191675 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 16:12:44 +00:00
John Dennis Casey e90ba206d3 PR: MNG-500 Not sure if anything else is touched besides the war mojo. If so, we should factor the inclusion logic into some sort of component for maintenance purposes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191674 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 16:08:40 +00:00
John Dennis Casey 05892c489f Dressing up the execution collision error some more for non -X output.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191670 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 15:45:51 +00:00
John Dennis Casey 9dfc1f9962 Improving error reporting when execution id's collide.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191669 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 15:36:00 +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
Emmanuel Venisse 94529a2bd8 format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191646 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 10:13:27 +00:00
Emmanuel Venisse 64185c024a maven-settings must be build before other projects
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191644 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 09:35:03 +00:00
Brett Leslie Porter f017c2ed9c add missing '.' (thanks Kenney!)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191638 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 08:00:00 +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
Brett Leslie Porter d6b4a7adea remove unrequired dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191628 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 06:02:14 +00:00
Brett Leslie Porter b138c8d378 reformat and optimize imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191627 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 05:42:35 +00:00
Brett Leslie Porter 40a257ff11 reformat and optimize imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191622 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 05:17:39 +00:00
John Dennis Casey 7acd75ed8a Forcing collision of plugin-execution id's in non-inherited, direct-goal invocation scenarios.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191621 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 04:20:18 +00:00
John Dennis Casey bea9eca2f6 Resolving issue: MNG-493
o Changed getExecutionsAsMap() in Plugin (within maven.mdo) to throw an IllegalStateException if two PluginExecutions are detected with the same id. This method should always be called during inheritance assembly...

o Changed PluginExecution's id field to have a defaultValue of 'default' within maven.mdo.

NOTE: It may be necessary to double-check the id-collision within MavenProjectBuilder, in case there is no inheritance of plugins...I'll add this, and follow this commit momentarily.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191620 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 03:57:17 +00:00
Brett Leslie Porter b61ca41b76 update api
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191619 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 03:02:13 +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
Brett Leslie Porter be7f19382c ignorance
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191614 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 01:33:33 +00:00
Brett Leslie Porter 3bd5067bd0 remove empty directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191611 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 01:11:54 +00:00
John Dennis Casey 07dda3c3ae Resolving issue: MNG-271
o Added method to MavenProject called writeModel( Writer ) 
o Added code in MavenArchiver to export the full effective POM to ${project.build.directory}/exported-pom.xml and then embed that in the archive, rather than simply embedding ${project.file}.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191588 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 23:34:34 +00:00
Trygve Laugstol 1c58065c2a o Adding a plexus-service artifact handler.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191587 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 23:31:42 +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
Brett Leslie Porter 6dd6a7f146 let's try that again
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191581 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 22:38:04 +00:00
Brett Leslie Porter e37d95003f put back integration test, update plugin should have wandered over to ibiblio by now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191580 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 22:36:57 +00:00
Brett Leslie Porter 046dc5d63c make mojos backwards compat with alpha-2, and run with the eclipse test unmodified
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191579 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 22:35: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
John Dennis Casey 9b5c187e43 Commenting maven-eclipse-plugin and it0027...eclipse plugin is missing from injected parameters, and it0027 cannot find core-it:fork. NOTE: this is based on a mirror setup directly to ibiblio.org, since codehaus was having web problems. When codehaus is again reliable, I'll take the mirror back out and try it0027 again...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191533 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 18:47:58 +00:00
Brett Leslie Porter bce81a38d7 correct opening statement
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191497 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 15:55:55 +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 60f4482686 change <model> to <project> in root tag.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191414 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 07:18:24 +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 914cf98b69 set a default if no basedir sys property
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191411 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 07:10:27 +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
Brett Leslie Porter 7247c5c097 use <project> in archetypes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191393 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 05:00:32 +00:00
Brett Leslie Porter 86e4a5647c fix pom formats as parsing is now stricter
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191392 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 04:29:46 +00:00
Brett Leslie Porter d617a0480e fix import
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191391 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 04:29:02 +00:00
Brett Leslie Porter 3e26e6ca55 add lifecycle mdo to booty
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191390 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 04:28:52 +00:00
Brett Leslie Porter dbcdd0b526 PR: MNG-471
add @execute phase|lifecycle doclet tag for java and beanshell
not sure how this would be configured for marmalade - will leave this for a once over of marmalade wrt the mojo api later


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191385 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 03:39:42 +00:00
Brett Leslie Porter 0d27b339f9 correct lifecycle doco
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191383 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 03:19:21 +00:00
Brett Leslie Porter 75c3b41c01 use latest modello for booty
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191382 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 03:18:55 +00:00
Brett Leslie Porter 53820cd3cb update to use executions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191381 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 03:18:43 +00:00