Commit Graph

475 Commits

Author SHA1 Message Date
Vincent Siveton 5f412ebb40 Upgraded to plexus-site-renderer-1.0-alpha-2 and corrected a NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219253 13f79535-47bb-0310-9956-ffa450edef68
2005-07-15 22:55:33 +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
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 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 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
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 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 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
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
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 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
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
Trygve Laugstol e2d7c7622a o Adding missing file.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209427 13f79535-47bb-0310-9956-ffa450edef68
2005-07-06 08:01:51 +00:00
Jason van Zyl f04f9ed2a6 o http://jira.codehaus.org/browse/MNG-516
Thanks to Andreas Hoheneder



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209401 13f79535-47bb-0310-9956-ffa450edef68
2005-07-06 03:09:21 +00:00
Jason van Zyl 2e796ceb04 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209385 13f79535-47bb-0310-9956-ffa450edef68 2005-07-06 02:10:23 +00:00
Jason van Zyl 6bc88f3a63 o correction parent specs
o fixing typo in @goal


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209382 13f79535-47bb-0310-9956-ffa450edef68
2005-07-06 01:43:19 +00:00
Jason van Zyl ce0655ab1c adding the antlr plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209381 13f79535-47bb-0310-9956-ffa450edef68
2005-07-06 01:39:35 +00:00
Emmanuel Venisse d4af37ae66 Fix path to remote zip file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209258 13f79535-47bb-0310-9956-ffa450edef68
2005-07-05 11:46:05 +00:00
Emmanuel Venisse 6cc912fd77 Add ear plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209083 13f79535-47bb-0310-9956-ffa450edef68
2005-07-04 14:12:10 +00:00
Emmanuel Venisse 1d7750baa2 Move maven-ear-plugin to maven-plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209082 13f79535-47bb-0310-9956-ffa450edef68
2005-07-04 14:09:46 +00:00
Emmanuel Venisse 668ea536d2 Use the new snapshot version of surefire
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209028 13f79535-47bb-0310-9956-ffa450edef68
2005-07-04 07:32:51 +00:00
Emmanuel Venisse 504e281d0e Add a check on objects return by DefaultPluginManager.getReports for MNG-530
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@202142 13f79535-47bb-0310-9956-ffa450edef68
2005-06-28 07:06:03 +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 c3665ae359 [MNG-515]. Each language can have their own site descriptor (site.xml for default language, site_fr.xml for french menu)
Each i18n site must be under site directory:
src
  site
    apt <= default language
    xdoc
    fr
      apt <= french content
      xdoc

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201584 13f79535-47bb-0310-9956-ffa450edef68
2005-06-24 09:06:47 +00:00
Brett Leslie Porter 92fb6285eb put the site mojo back how it was. deployment was silently failing
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201544 13f79535-47bb-0310-9956-ffa450edef68
2005-06-24 02:04:18 +00:00
John Dennis Casey 7826a7b3ca [maven-release-plugin] prepare for development 2.0-alpha-4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201543 13f79535-47bb-0310-9956-ffa450edef68
2005-06-24 02:03:20 +00:00
John Dennis Casey d0e515cbb5 [maven-release-plugin] prepare release 2.0-alpha-3
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201541 13f79535-47bb-0310-9956-ffa450edef68
2005-06-24 02:03:06 +00:00
John Dennis Casey 96bdd2c56b preparing for re-release to fix version.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201532 13f79535-47bb-0310-9956-ffa450edef68
2005-06-24 01:34:55 +00:00
John Dennis Casey 5bb4e3565a preparing for re-release to fix version.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201531 13f79535-47bb-0310-9956-ffa450edef68
2005-06-24 01:34:23 +00:00
Emmanuel Venisse 70a13f3f56 [MNG-510]. Fix classpath order.
Thanks to Kenney Westerhof

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193164 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 15:22:57 +00:00
John Dennis Casey ec3b76f58d Removed @readonly from finalName for this plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193134 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 11:02:55 +00:00
John Dennis Casey 61db258aa9 Adding --no-plugin-updates to release:perform mojo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193105 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 08:08:10 +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
Brett Leslie Porter bcf34b9bb5 new distribution location
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193080 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 05:54:36 +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
Emmanuel Venisse c0131f4de4 Use basedir as working directory for tag
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@192996 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 21:06:32 +00:00
Emmanuel Venisse 60a2d6e545 Rename for correct use with i18n.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@192993 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 20:19:13 +00:00
Emmanuel Venisse 25d5870150 Don't use tag for commit. Commit pom change in the current branch.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191777 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 07:07:17 +00:00
Brett Leslie Porter 2ebe7275bf PR: MNG-178
Submitted by: Kenney Westerhof
Reviewed by:  Brett Porter

add filtering support to the resources
(applied with modifications)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191749 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 01:21:07 +00:00