Commit Graph

613 Commits

Author SHA1 Message Date
John Dennis Casey 0cc696a407 Working on: MNG-576
o Implemented plan from my comments on MNG-576 for looking up lifecycle mappings within plugins.

o Fixed subtle bug in DefaultWagonManager for verifying checksums, where the destination file was being used to verify the checksum rather than the recently download temp destination.

o Fixed the DefaultRepositoryMetadataManager.resolve(..) method to allow the locally-installed metadata to be used if it is newer than the one resolved from the repository.

o Moved the lifecycle mappings for the EJB and WAR plugins out to META-INF/plexus/components.xml in the respective plugin's src/main/resources directory. it0016 and it0017 still pass.

o Changed the distributionManagement repository for maven-plugins/pom.xml to have id of 'central-plugins' and then added a normal artifact repository definition for central-plugins to that pom, to allow locally-installed repository metadata for the plugins to be put in the right place (and these builds should have access to the central plugin repo anyway).

o Changed the DefaultPluginMappingBuilder to only warn when plugins.xml for a particular plugin group is missing.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@216273 13f79535-47bb-0310-9956-ffa450edef68
2005-07-13 21:57:57 +00:00
John Dennis Casey cb257db78e Resolving:
MNG-511
MNG-513

Working on:

MNG-449

o Added code to stop the version manager from prompting the user for unregistered plugins; it will simply register them with the resolved version.

o Added failover fourth plugin-version resolution option, which is a plugin-specific artifact metadata called LATEST.version.txt, and will be published with each install/deployment

o Added MavenProject.get/setArtifact(..) to handle a single artifact instance for a project (allows injection of artifact metadata without having to handle it all within the install/deploy mojos).

o Changed plugin-version resolution to only use MavenMetadataSource rather than resolving the whole plugin artifact.

o Changed the install and deploy mojos to only use ${project.artifact} rather than constructing their own, so they can take advantage of metadata added elsewhere in the build.

o Factored the "RELEASE".equals(..) check in the DefaultRepositoryLayout to use new metadata method storedInArtifactDirectory() instead, since RELEASE and LATEST both share this characteristic.


NOTE: I'm not going to resolve MNG-449 yet, because I'm not sure what else Brett had in mind related to the plugin-development-without-release use case...



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@215919 13f79535-47bb-0310-9956-ffa450edef68
2005-07-12 04:13:40 +00:00
John Dennis Casey 4b53aba3bb Fixing issues related to MNG-377, where the plugins.xml metadata was being mishandled. Separated updating of this metadata into a separate mojo, bound to the 'package' phase, and put in a validator for the POM (POM has to have distributionRepository now for maven-plugin's) which is bound to the 'validate' phase. Put together an integration test that uses modello:java as a case where the pluginGroups must be consulted. Also had to change the Verifier to check a verifier.properties for failOnErrorOutput, which will suppress IT failures based on [ERROR] log output (modello outputs one of these, and kills the IT unnecessarily).
MNG-377 should be resolved at this point.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@215890 13f79535-47bb-0310-9956-ffa450edef68
2005-07-11 22:08:58 +00:00
John Dennis Casey b90c2d1e24 rolling back this change until I get the plugin-mapping stuff figured out, to keep the bootstrap working...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@210200 13f79535-47bb-0310-9956-ffa450edef68
2005-07-11 20:04:16 +00:00
John Dennis Casey 03a50c1462 [MNG-377] Resolving.
Added new mojos to the plugin-plugin that will update the plugins.xml mapping metadata in the plugin's group on the distribution repository.




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@210153 13f79535-47bb-0310-9956-ffa450edef68
2005-07-11 16:13:33 +00:00
John Dennis Casey 91dfd62176 Working on: MNG-377
o Normalized all references to plugins to use either o.a.m.model.Plugin or o.a.m.plugin.PluginDescriptor instances

o Changed DefaultLifecycleExecutor, PluginManager, DefaultPluginManager, MavenPluginCollector, and DoxiaMojo to reflect the above

o Added mapped-plugin resolution of goal prefixes to the DefaultLifecycleExecutor

o Added caching of PluginMappingManager instance inside of MavenSession

o Modified SettingsUtils to be more resistant to null String-Lists for pluginGroups and activeProfiles during merge.

o Added checks to MavenProject.addPlugin(..) to only add if the plugin doesn't already exist in the model.

Next step is to modify installation and deployment process for plugins to publish plugins.xml repository metadata.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209677 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 23:50:25 +00:00
John Dennis Casey 63aab278c2 Working on: MNG-377
o Added component descriptor for the MavenPluginMappingBuilder

o Added a new ComponentDiscoveryListener implementation to factor the DefaultPluginManager out of the plexus.xml for maven-core...the DefaultPluginManager now delegates to this component for plugin registration/lookup/etc. and has proper component requirements.

o Moved the DefaultPluginManager component declaration into components.xml, and added a component definition for MavenPluginCollector to plexus.xml in maven-core

Next step is to get rid of the old pluginKey junk, and start using o.a.m.Plugin instances to hold g🅰️v info for all plugins in the system...this will make the interface cleaner and remove the need to concat/parse the plugin identity. Then, I'll add the mapped-plugin lookup functionality to the lifecycle executor.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209563 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 03:18:53 +00:00
John Dennis Casey ca59227be1 Working on: MNG-377
o Added maven-plugin-mapping project to handle repository metadata that contains prefix-to-artifactId mappings for groups of plugins

o Added builder classes for plugin mappings

o Modified maven-artifact and maven-artifact-manager to handle the concept of repository metadata in addition to artifact metadata.

o Added pluginGroups section to settings.xml, new code to merge these lists of plugin groups, and a unit test to ensure that this merge is taking place properly.

o Added maven-plugin-mapping to dependencies of maven-core, along with the list of builds to be performed by mboot.

Should be ready to incorporate plugin mapping consultation into the lifecycle executor and the deploy mojo...



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209550 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 00:17:37 +00:00
Emmanuel Venisse 70055892fc Move plexus-utils to 1.0.1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209031 13f79535-47bb-0310-9956-ffa450edef68
2005-07-04 07:43:12 +00:00
Trygve Laugstol 55518cbd57 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@208743 13f79535-47bb-0310-9956-ffa450edef68 2005-07-01 10:37:49 +00:00
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