Commit Graph

2238 Commits

Author SHA1 Message Date
John Dennis Casey 21e050e5fa Attempting to fix problem with resolution of parent-poms for plugins, but continuing the use of the plugin repository when assembling the plugin-pom's lineage.
NOTE: I have not bootstrapped with this fix in place (I'm in the middle of something else right now), so BEWARE!



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219252 13f79535-47bb-0310-9956-ffa450edef68
2005-07-15 22:13:10 +00:00
John Dennis Casey 2c80da6ba4 Resolving: MNG-482
To use the new artifact map for either the project or the current plugin from your mojo, simply use one of the following expressions:

  ${plugin.artifactMap}
  ${project.artifactMap}

The artifacts in these maps are keyed using org.apache.maven.artifact.ArtifactUtils.versionlessKey( String groupId, String artifactId ) (found in the maven-artifact project).



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219234 13f79535-47bb-0310-9956-ffa450edef68
2005-07-15 19:04:20 +00:00
Emmanuel Venisse 872214ca25 Move plexus lifecycle mapping to plexus plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219213 13f79535-47bb-0310-9956-ffa450edef68
2005-07-15 16:19:48 +00:00
John Dennis Casey f8abb9e729 Fixed logic problem with multiple plugin repositories and exception handling.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219211 13f79535-47bb-0310-9956-ffa450edef68
2005-07-15 16:11:34 +00:00
Vincent Siveton 8d0d2759a3 Removed \U000C character in .apt files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219190 13f79535-47bb-0310-9956-ffa450edef68
2005-07-15 12:42:28 +00:00
Vincent Siveton 28cee4f515 Beautified Velocity template
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219151 13f79535-47bb-0310-9956-ffa450edef68
2005-07-15 01:56:03 +00:00
Vincent Siveton cd2f81534e Updated Test case for MNG-584 and MNG-585 issues.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219149 13f79535-47bb-0310-9956-ffa450edef68
2005-07-15 01:46:41 +00:00
John Dennis Casey 3f47c60752 Cleaned up plugin-version resolution.
o Added four command-line options:

  --check-plugin-updates is a synonym for --update-plugins
  
  --no-plugin-registry turns off usage of plugin-registry.xml for plugin version resolution for the current build.
  
  --check-plugin-latest turns on usage of LATEST metadata for plugin version resolution for the current build.

  --no-plugin-latest turns off usage of LATEST metadata for plugin version resolution for the current build.

o Added settings.xml configuration <usePluginRegistry>true|false</usePluginRegistry> to en/disable the use of plugin-registry.xml for plugin version resolution. The default value is true, to use the plugin-registry.xml.

o Added plugin-registry.xml configuration <checkLatest>true|false</checkLatest> to en/disable the use of LATEST metadata when resolving plugin versions. The default value is false, or do not use LATEST.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219089 13f79535-47bb-0310-9956-ffa450edef68
2005-07-14 20:35:23 +00:00
Emmanuel Venisse 06597924cf Fix svn properties
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219087 13f79535-47bb-0310-9956-ffa450edef68
2005-07-14 20:12:21 +00:00
John Dennis Casey 5de8088b0b STILL trying to get the damn repository stuff right...thanks for the pointer, Kenney.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219045 13f79535-47bb-0310-9956-ffa450edef68
2005-07-14 14:51:41 +00:00
Vincent Siveton 4001df5247 MNG-584 and MNG-585: updated the Velocity template and added test case
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@218985 13f79535-47bb-0310-9956-ffa450edef68
2005-07-14 04:28:06 +00:00
Vincent Siveton 045b43f08e Added test cases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@218984 13f79535-47bb-0310-9956-ffa450edef68
2005-07-14 04:17:00 +00:00
Vincent Siveton 64a704b7b7 MNG-582: generate an index.html
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@218981 13f79535-47bb-0310-9956-ffa450edef68
2005-07-14 04:07:08 +00:00
John Dennis Casey 99c8250b8f Applying partial patch for MNG-266. Thanks Andreas.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@216282 13f79535-47bb-0310-9956-ffa450edef68
2005-07-13 22:58:28 +00:00
John Dennis Casey beff5623f2 Resolved: MNG-502
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@216279 13f79535-47bb-0310-9956-ffa450edef68
2005-07-13 22:34:40 +00:00
John Dennis Casey 133d3c9330 Applying patch(es) for: MNG-576
One change:

o Applied lifecycle mapping patch to a new file in src/main/resources of the ear plugin project, to create META-INF/plexus/components.xml with the custom lifecycle mapping.

This plugin needs an integration test.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@216275 13f79535-47bb-0310-9956-ffa450edef68
2005-07-13 22:08:02 +00:00
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
Vincent Siveton 1404266309 MNG-561: improve documentation for the plugin:xdoc goal
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@216148 13f79535-47bb-0310-9956-ffa450edef68
2005-07-13 12:28:03 +00:00
Vincent Siveton a108dd47a5 Take care about generatedSiteDirectory var
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@216145 13f79535-47bb-0310-9956-ffa450edef68
2005-07-13 12:20:40 +00:00
John Dennis Casey 20047d63c9 Fixing problem with using distributionManagement repository definition for download of plugins.xml metadata.
Now, in order to build a maven plugin, you need two things:

1. a repository defined in distributionManagment
2. a repository defined in <repositories/> which has the same id as the one in distributionManagement.

This is necessary, since in most cases SSH will be used in the distributionManagement definition for uploading the plugin...which means that the download of the existing plugins.xml file might not be available for users trying to run an install. SSH requires authentication information, and users (particularly those running the bootstrap) might not have this auth info.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@216013 13f79535-47bb-0310-9956-ffa450edef68
2005-07-12 20:08:21 +00:00
Jason van Zyl d210bf33df o applying http://jira.codehaus.org/browse/MNG-571
Thanks to Tim.
  


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@215942 13f79535-47bb-0310-9956-ffa450edef68
2005-07-12 12:06:17 +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
Emmanuel Venisse 81afd82296 [MNG-564]. Add exception handling.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@210144 13f79535-47bb-0310-9956-ffa450edef68
2005-07-11 15:04:13 +00:00
Emmanuel Venisse 4a0a96f918 [MNG-565]. Add missing requireDependency tag
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@210141 13f79535-47bb-0310-9956-ffa450edef68
2005-07-11 14:28:54 +00:00
Emmanuel Venisse 9985c8f364 [MNG-561]. Adding more options for the javadoc plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@210140 13f79535-47bb-0310-9956-ffa450edef68
2005-07-11 14:23:53 +00:00
Jason van Zyl 1df1ea3d1a o this release guide is really just a place holder and contains the couple
of commands i need for releasing :-)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@210060 13f79535-47bb-0310-9956-ffa450edef68
2005-07-11 03:06:36 +00:00
Emmanuel Venisse e056ac9baa git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209846 13f79535-47bb-0310-9956-ffa450edef68 2005-07-08 17:29:26 +00:00
Emmanuel Venisse a895954c38 Add our own svn config file.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209815 13f79535-47bb-0310-9956-ffa450edef68
2005-07-08 15:21:58 +00:00
Emmanuel Venisse 9168f28699 Add our own svn config file.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209814 13f79535-47bb-0310-9956-ffa450edef68
2005-07-08 15:19:28 +00:00
Emmanuel Venisse 6f62ddc456 [MNG-562] Add ignore failures
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209803 13f79535-47bb-0310-9956-ffa450edef68
2005-07-08 14:53:06 +00:00
Emmanuel Venisse 2a1a7c3808 set svn properties
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209772 13f79535-47bb-0310-9956-ffa450edef68
2005-07-08 13:42:56 +00:00
Emmanuel Venisse abfac2bd33 Add subversion config in developer guide.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209770 13f79535-47bb-0310-9956-ffa450edef68
2005-07-08 13:36:35 +00:00
Vincent Massol c10680bdab Fixed svn properties (eol and keywords) that were not set for non-java files in my config.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209763 13f79535-47bb-0310-9956-ffa450edef68
2005-07-08 13:17:26 +00:00
Vincent Massol 07d8d8a972 added ignore files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209758 13f79535-47bb-0310-9956-ffa450edef68
2005-07-08 13:10:21 +00:00
Emmanuel Venisse 267dcf5d02 [MNG-562] Implement -Dmaven.test.skip=true
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209755 13f79535-47bb-0310-9956-ffa450edef68
2005-07-08 13:01:15 +00:00
Vincent Massol d6f5f354e3 added ignore files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209753 13f79535-47bb-0310-9956-ffa450edef68
2005-07-08 12:57:46 +00:00
Vincent Massol 7aba39ee4d - Initial commit of the Clover plugin
- The CloverCheckMojo still doesn't seem to work and report a coverage error when used in the simple sample. Not sure why yet
- The CloverReportMojo doesn't work as mixed plugins do not seem to be supported yet.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209751 13f79535-47bb-0310-9956-ffa450edef68
2005-07-08 12:52:48 +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 73184be8e3 Removed site-sandbox
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209626 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 17:53:39 +00:00
John Dennis Casey 19861bb4b7 this has been converted to plugin-overview.apt and developers/plugin-development-guide.apt in maven-site/src/site/apt
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209623 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 17:45:16 +00:00
John Dennis Casey b39c286733 merging in changes from the xdoc version, before I delete the xdoc version.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209620 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 17:40:03 +00:00
John Dennis Casey e2468df6f4 pulling this stuff back out of site-sandbox...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209618 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 17:26:13 +00:00
Emmanuel Venisse e91013f6e5 we need extensions for figure filename. It's a difference with the original APT format, but we can't know where images are stored for check the existence of files when we generate the output.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209597 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 12:58:23 +00:00
Emmanuel Venisse 82afba636b [MNG-546]. copy resources in the correct order
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209594 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 12:05:38 +00:00
Emmanuel Venisse 7ad6e2a386 Use the new doxia snapshot
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209589 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 11:21:56 +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