Commit Graph

441 Commits

Author SHA1 Message Date
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
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
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
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
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 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
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 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 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 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 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 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
Brett Leslie Porter bb39d626aa set file to copy
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191114 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 08:49:52 +00:00
Brett Leslie Porter 80fa5ad89e - fix issues with source mojo
- attach source artifact for install/deploy


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191113 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 08:44:39 +00:00
Brett Leslie Porter fb065d7858 PR: MNG-257
- hook up the source:jar goal to packaging, but only execute for non-SNAPSHOT builds
- allow comma-delimited list of goals in phase definitions
- only register necessary phases for the goals given


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191111 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 08:33:41 +00:00
Brett Leslie Porter 01e6c8daa6 PR: MNG-257
refactor artifact creation to all go through the factory, and assign the type handler from there.
Attach EJB client to the EJB artifact so that it is installed/deployed along with it.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191096 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 06:49:57 +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
Brett Leslie Porter ac2d8a7e83 PR: MNG-415
implement provided scope


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190930 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 15:02:07 +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
John Dennis Casey 685ba3412b Added projecthelp:effective-settings mojo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190615 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 15:26:43 +00:00
John Dennis Casey d2e1f3c975 o Adding support for <executions/>, which means multiple runs of the same goal/set-of-goals with different configs.
o Adding @phase declarations for those mojos that seem to be part of the main build, just for completeness
o Added two ITs, to test that <executions/> doesn't mess up the normal operation, and to test multi-execution for a goal.

Should resolve: MNG-172.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190335 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 02:47:57 +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 a787f8dd0e add ci management
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189878 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 02:33:05 +00:00
Brett Leslie Porter 2a8ed2f339 PR: MNG-154
Define the lifecycle according to packaging.
Some more work on the structure of this is required.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189871 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 00:57:19 +00:00
John Dennis Casey 921d4ced59 o Started maven-projecthelp-plugin to help with build analysis (this helped me to visualize profile stuff)
current goals:
     projecthelp:active-profiles
     projecthelp:effective-pom

o Added source attribute to the Profile model class in maven-model, along with code in the normalization utilities (converters from profiles.xml and settings.xml models to maven-model instances) to identify the source of a particular profile.

o Added a activeProfiles cache of the Profiles in effect for the current project, on the MavenProject class



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189612 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 17:54:11 +00:00
Emmanuel Venisse 12cf74a46a git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188733 13f79535-47bb-0310-9956-ffa450edef68 2005-06-07 08:39:24 +00:00
Emmanuel Venisse 92a347519c Don't run surefire for pom project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188732 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 08:36:15 +00:00
Emmanuel Venisse b33c9d140f Generate eclipse project only for projects with packaging != pom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188731 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 08:35:04 +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