Commit Graph

2380 Commits

Author SHA1 Message Date
Brett Leslie Porter dedfacf69a remove unused code and empty directories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191267 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 05:20:21 +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 d82ab9aed6 clarification of order
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191261 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 03:16:52 +00:00
Brett Leslie Porter 54d1ee227a ignore
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191259 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 03:00:18 +00:00
Brett Leslie Porter b76388e3c4 PR: MNG-486
use correct wagon for mirror

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191257 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 02:45:05 +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
Jason van Zyl 819c70975c adding note about general resources
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191221 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 22:34:09 +00:00
John Dennis Casey 1a89a7b751 Resolving issue: MNG-480
o Added support for -Dmaven.repo.local command line override of the local repo
o Propagating local repository location (either maven.repo.local, or from settings.xml) to ITs in Verifier
o Re-enabled it0023 and it0026
o Removed warning in README.txt for maven-core-it.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191163 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 14:34:18 +00:00
Brett Leslie Porter 98b00e8004 add objectweb
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191119 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 09:31:57 +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 f4fb75176a remove old docs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191110 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 08:31:45 +00:00
Brett Leslie Porter 07ddeab2d1 ignore project file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191109 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 08:31:33 +00:00
Brett Leslie Porter 2d7f97bc31 avoid NPE when no settings.xml file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191104 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 08:03:16 +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
Brett Leslie Porter 3c2de055e8 ignore larget and togs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191093 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 06:43:34 +00:00
Brett Leslie Porter 7fc8dfba9d make the artifact type handlers configurable
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191079 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 03:55:50 +00:00
John Dennis Casey 3c6c0c7a2c Taking out redundant sample settings.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191051 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 02:25:25 +00:00
John Dennis Casey af66c7a376 Adding sample settings.xml files. One goes in the maven distro, the other is in the maven-settings project dir, for reference. The one in maven-settings is intended to be authoritative.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191043 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 01:17:36 +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
Jason van Zyl f749c3a5aa o adding apt reference to the site
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191019 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 22:37:03 +00:00
Brett Leslie Porter e57f2dbb44 fix possible NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190975 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 18:09:17 +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
Emmanuel Venisse 4aeca8e8a9 Add TODO for address taf in notifiers
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190907 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 13:12:38 +00:00
Brett Leslie Porter 9ebc9a7c0d finish lifecycle doco
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190880 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 06:47:21 +00:00
Brett Leslie Porter 21a22a1f46 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190877 13f79535-47bb-0310-9956-ffa450edef68 2005-06-16 06:08:34 +00:00
Brett Leslie Porter 8de5475d5a first cut of lifecycle user doc
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190871 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 05:25:15 +00:00
Brett Leslie Porter 49ea8e4001 tweak the available phases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190870 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 05:24:43 +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 d15513bd60 o Added sourceLevel (meaning global vs. user) to most base classes in the model, to track for the purposes of rewriting the user-level settings ONLY.
o Added an identity base class for many of these same base classes, to allow sorting/merging based on id (shallow merging) using a common piece of code.

o Added support for pluginUpdates (first pass) within the settings.xml, and support for merging this new section based on plugin key (g:a)

Working toward: MNG-379



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190704 13f79535-47bb-0310-9956-ffa450edef68
2005-06-15 03:01:48 +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 fc378a7ade Fixing code to locate the settings files.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190610 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 15:11:26 +00:00
John Dennis Casey 140e01d80a Removing old component definition for MavenSettingsBuiler - this is provided by the maven-settings artifact now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190600 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 14:47:01 +00:00
John Dennis Casey 1ed708a97b Fixing for package rename in maven-profile from the other day...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190541 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 01:13:09 +00:00
Brett Leslie Porter b4cfe56711 PR: MNG-261
Submitted by: Rahul Thakur
Reviewed by:  Brett Porter
Create artifact directories in the wagon so that they are only created when the file will actually be downloaded.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190539 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 00:42:59 +00:00
John Dennis Casey ce3665851c o Re-adding support for user-level settings which are not assumed to be in ~ (for continuum and other server-style apps' convenience)
o Adding support for global (installation-level) settings.xml file which is identical to the one in ~/.m2, and which will be overridden by user-level settings. The default location for this is ${maven.home}/settings.xml.

o Adding IT to test merging of global- and user-level settings.xml files

o Moved DefaultMavenSettingsBuilder/MavenSettingsBuilder to maven-settings project, to make them more generally available (to ant, for instance)

Resolves issue: MNG-294



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190517 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 21:56:00 +00:00
John Dennis Casey eb0a46b6bb Fixing flaw from previous commit, where artifacts provided by the maven distro are excluded from the plugin artifact list.
Now, we're using all artifacts referenced by the plugin in the artifacts list for that PluginDescriptor...the only drawback is since we're not using a repository layout for the maven /lib, there is no good way to include the artifact-path from /lib...we're using the artifact-file from the local repo for those deps. This SHOULDN'T cause a problem, but it's possible...




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190414 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 15:05:28 +00:00
John Dennis Casey a55fd04696 o Adding ${plugin.*} expression support for mojos. Specifically, added support for ${plugin.artifacts} to retrieve the plugin's classpath artifacts. NOTE: There may be artifacts which are FILTERED by the resolution process, since they are provided in the maven distro. NOT SURE HOW BEST TO RESOLVE THAT...but it'll cause problems with people forking certain mojos, undoubtedly.
May resolve: MNG-455



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190413 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 14:49:49 +00:00
John Dennis Casey 64ac374aea Reordered builds to allow maven-profile and -settings to have a fresh maven-project when the local repo is erased.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190404 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 14:00:01 +00:00
John Dennis Casey 1fc7419f03 o Added <properties/> for profiles configured in the pom.xml
o Split ModelNormalizationUtils into two utility classes in the maven-profile and maven-settings projects, to be used for converting Profile instances from the settings.xml and profiles.xml into maven-model instances.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190344 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 04:21:27 +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 0d8c115acf update FAQ
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190221 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 05:31:31 +00:00
Brett Leslie Porter 73d9813ee6 update default values
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190220 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 05:21:38 +00:00
Brett Leslie Porter cc0099bccd fix broken link
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190219 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 05:19:22 +00:00
Brett Leslie Porter 8918d09b75 remove MAVEN_OPTS - no need for such a high setting, and make it consistent with the shell script
also, the form of MAVEN_OPTS did not work when it was already set due to extra quoting


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190218 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 05:16:59 +00:00
Brett Leslie Porter 1c0f134fa5 add building doc
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190215 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 04:51:48 +00:00
Brett Leslie Porter d2b6e095ab add location of svn repo, and instructions for building Maven 2.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190212 13f79535-47bb-0310-9956-ffa450edef68
2005-06-12 04:47:32 +00:00
Brett Leslie Porter f51bb22433 correct doc, import
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190072 13f79535-47bb-0310-9956-ffa450edef68
2005-06-11 04:59:15 +00:00