Commit Graph

82 Commits

Author SHA1 Message Date
Vincent Siveton 5125817f61 MNG-599: Using the organization name and the inception year in the Velocity template
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225446 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 03:12:55 +00:00
Vincent Siveton cbb5657526 MNG-588: Throw an exception if two index files already exist
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225290 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 12:33:12 +00:00
John Dennis Casey 701ef520a3 Working on MNG-607
o Changed MavenMetadataSource to a component, to avoid having to lookup artifactFactory and projectBuilder in order to 
  construct it.

o Added add(..) method to ScmBean in the release plugin to allow addition of release-pom.xml

o Changed the PrepareReleaseMojo to resolve ONLY version and parent-version for the normal pom.xml, and fully resolve all
  artifacts used in the release-pom.xml, including version, parent-version, dependency closure (given by project.getArtifacts()), plugins, and reports. It will then add the release-pom.xml, and (attempt to) delete it before performing the final commit for next development version.

o Added some mapping methods to ArtifactUtils, to key by artifact.getId, and to create an Artifact.getId()-compatible string from parameters.

o Added TestProjectBuilder to remove the requirement in ProjectClasspathTest to modify the fields of the project builder directly.

o Cleaned up the AbstractReleaseMojo and PrepareReleaseMojo to avoid container lookups...they're now mojo parameters with the 'component.' prefix.

NOTE: Next step is to figure out how to use maven-scm to remove an SCM resource, to enable the prepare mojo to take the release-pom.xml back out of HEAD after the tag is complete.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224413 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 22:07:28 +00:00
Brett Leslie Porter 511af3d3e2 PR: MNG-596
add XSD definition to m2 poms and archetypes



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220079 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 13:58:42 +00:00
Brett Leslie Porter ed7ccf707a PR: MNG-530
don't attempt to configure non-report mojos during reporting



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220042 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 12:18:35 +00:00
Brett Leslie Porter 5a0904e9fd PR: MNG-366
separate api from implementation keeping most of doxia, reporting and other libraries out of the core



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220009 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 06:54:21 +00:00
Brett Leslie Porter 5565016f24 refactor duplicate code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219990 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 03:11:07 +00:00
Vincent Siveton 33b34579e1 Correct typo and code format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219835 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 02:57:54 +00:00
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
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
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 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
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 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 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 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 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
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 7299bd7058 PR: MNG-469
remove MavenConfiguration class



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191301 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 16:52:44 +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 7f0f194fca add deprecation message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191286 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 13:10:15 +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
Brett Leslie Porter 29439c710c PR: MNG-476
guarantee comands are executed in order

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191256 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 02:44:08 +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
John Dennis Casey a3cf96219f Resolving issue: MNG-379
o Added support for update-all and update-none when prompting the user.

o Added --update-plugins/-F option to force an update of the plugins used in the project.

o Added autoUpdate setting for the plugin registry. This is used when in non-interactive mode, to determine whether to register plugin updates

o Added updateInterval to determine when/how often to check for updates to registered plugins. Supports three syntaxes:

  - 'never'
  - 'always'
  - 'interval:XXX' (where XXX can be a combination of weeks, days, hours, and minutes in the syntax: 1w1d1h1m)
         > this renders the interval syntax similar to 'interval:1w' to check every week.

  NOTE: update intervals are calculated from the time a particular plugin was last checked.

o Added lastChecked attribute for registered plugins, to use as a basis for calculating update-check interval

o Added RuntimeInfo classes for maven-settings and maven-plugin-registry, to help in tracking the file each instance comes from, in addition to merging info which is useful when extracting the user-level instance from the merged instance (for persisting changes to the user instance, f.e.).

o Changed verifyPlugin(..) to take an instance of Settings, to allow persistent decisions across the session (like update-all, update-none in the plugin version manager)

This should take care of outstanding issues with this new feature. I'm closing the JIRA issue now, and we'll deal with any bugs/shortcomings as separate issues.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191021 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 22:38:57 +00:00
John Dennis Casey b813c3d430 Working on issue: MNG-379
Added specified stop-gap patch for issue: MNG-473 (affects settings-builder and registry-builder)

Today I've made the following progress on this so far:

- Added a new project, called maven-plugin-registry, to house the model for this new file.

- Developed/debugged/tested PluginVersionManager/DefaultPluginVersionManager to isolate the plugin-version checks/management code away from the PluginManager

- Added interactiveMode (<interactiveMode>true|false</interactiveMode> directly under the root element of settings.xml, or -B short CLI option or --batch-mode CLI option, where the CLI options turn OFF interactiveMode). This will allow things like the maven-plugins build to register new plugins (and, for now, new versions of plugins) automatically.

- Added user input handler for when interactiveMode = true, to get a yes/no on whether to use the discovered version over the installed version and/or no version at all. If there is no installed version, and the user selects 'n', then the discovered version is used FOR THAT SESSION ONLY, and won't be recorded in the registry.

- Added checks/recording rejected versions against the registry, before attempting to use the discovered version.

Pending:

- Still need to add update-policies, to determine two things:

  1. how often to check for updates
  2. what to do when updates are found (autoUpdate, etc.)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190854 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 01:50:28 +00:00
Brett Leslie Porter 45d95aa6fb update parent references to get access to the ci settings
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189881 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 02:42:40 +00:00
Brett Leslie Porter 420d9a5fca remove old cvs ignore files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188697 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 05:24:51 +00:00
Brett Leslie Porter 9d31796e99 PR: MNG-366
reverse the reference. DoxiaMojo depends on maven-core instead of maven-core depending on the reporting api + doxia

This is not a great solution, but it gets us closer. It is currently not possible, as before, to get the correct set of reports as they are all loaded into the one container and then everything found is returned.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188690 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 04:41:54 +00:00
Brett Leslie Porter 4d43a4d43c only copy directory if it exists
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188644 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:12:02 +00:00
Emmanuel Venisse 1218c92bd4 o Internationalize site plugin generation.
o Add french translation

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@180168 13f79535-47bb-0310-9956-ffa450edef68
2005-06-05 23:10:11 +00:00
Emmanuel Venisse 1330677e6e i18n template
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@180101 13f79535-47bb-0310-9956-ffa450edef68
2005-06-05 15:22:25 +00:00
Emmanuel Venisse 9543fcc0cc Update template, we now the site descriptor parsing in it for more flexibility
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179773 13f79535-47bb-0310-9956-ffa450edef68
2005-06-03 11:54:55 +00:00
Emmanuel Venisse 0ce22ce966 Allow user to change the template
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179471 13f79535-47bb-0310-9956-ffa450edef68
2005-06-02 00:23:46 +00:00
Emmanuel Venisse 4c582afdbf Remove unused code.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179323 13f79535-47bb-0310-9956-ffa450edef68
2005-06-01 00:28:02 +00:00
Emmanuel Venisse 6d4626e2d6 o Fix copy of resources directory for exclude all "default" files
o Fix xhtml for conformance with standard

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179320 13f79535-47bb-0310-9956-ffa450edef68
2005-06-01 00:24:37 +00:00
Jason van Zyl 6e83944830 o tidy up the site template
o set the classloader used where the template will be found


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179176 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 00:39:51 +00:00
Emmanuel Venisse 26141c2358 o Extends AbstractReport to AbstractMojo => we need now to create only one class for a report and a mojo
o Start implementation of internationalization

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178980 13f79535-47bb-0310-9956-ffa450edef68
2005-05-29 19:52:01 +00:00
Emmanuel Venisse d6ba438cdb Remove unused file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178889 13f79535-47bb-0310-9956-ffa450edef68
2005-05-28 21:05:53 +00:00
Emmanuel Venisse 27cbac3e16 Use plexus-site-renderer for generate site with velocity templates.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178887 13f79535-47bb-0310-9956-ffa450edef68
2005-05-28 20:35:37 +00:00