Commit Graph

1957 Commits

Author SHA1 Message Date
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
Emmanuel Venisse 7dab9ff71a Add plexus-utils dep for override version found in transitive dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190042 13f79535-47bb-0310-9956-ffa450edef68
2005-06-11 00:02:11 +00:00
Brett Leslie Porter 6bb22f701c switch to '.' so that the expression can look like ${pom.*} when refid is pom
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190024 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 22:01:03 +00:00
Brett Leslie Porter a91802d46d PR: MNG-463
safety guard against bootstrapping with a Maven Home that is not empty, and not a previous Maven installation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189892 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 04:10:29 +00:00
Brett Leslie Porter a86c54a3dd fix scm since it is not located under parent directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189885 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 03:06:36 +00:00
Brett Leslie Porter 43ff603963 temporary so it will build with alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189883 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 02:45:34 +00:00
Brett Leslie Porter 3fff37a88d update parent reference for access to CI settings
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189882 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 02:44:03 +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 fc0ec82e84 allow no repo in settings.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189875 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 01:56:51 +00:00
Brett Leslie Porter cb291e9fa2 PR: MNG-460
Submitted by: Nicola Ken Barozzi
Reviewed by:  Brett Porter
(applied with modifications)

Replace setProperty by a chained property helper, set up automatically when the POM is first declared.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189873 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 01:43:21 +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
Brett Leslie Porter ed42ac9ad6 ignore target
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189868 13f79535-47bb-0310-9956-ffa450edef68
2005-06-10 00:47:32 +00:00
Brett Leslie Porter 9da4eec756 fix the bootstrap for windows sans cygwin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189859 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 23:36:49 +00:00
Brett Leslie Porter 379863a946 PR: MNG-451
Submitted by: Kenney Westerhof
Reviewed by:  Brett Porter

make configurator configurable!


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189856 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 23:22:34 +00:00
John Dennis Casey e84dc8c753 Fixing reporting problem due to inlining the old per-artifact reports into the repository report. Turned a couple of ERROR's to WARNING's.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189788 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 18:47:37 +00:00
John Dennis Casey 8095007690 Fixing nested iterator confusion that was leading to NoSuchElementException
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189787 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 18:41:31 +00:00
John Dennis Casey d1e7f4d5ad Solving MRM-4. If the source pom doesn't exist, it'll check for the existence of the target pom before writing the skeleton.
It'll always try to verify/patch the MD5/SHA1 for the target pom.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189785 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 18:19:21 +00:00
John Dennis Casey 8a257be6fc Fixed problems with merging profile-defined properties into the project, and fixed the ITs testing profile definitions in the process.
This should finally resolve MNG-421


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189768 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 15:53:31 +00:00
Brett Leslie Porter 2ab04f7c84 don't use cachedModel - it's null first time round, and we want to modify the current model.
Note that this modifies the cached version anyway.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189732 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 08:13:29 +00:00
Brett Leslie Porter 8e5a462035 some clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189727 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 07:55:33 +00:00
Brett Leslie Porter b0bdf5a54e use newer modello
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189725 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 07:38:15 +00:00
Brett Leslie Porter 4a7778d69b ignore target, logs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189724 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 07:37:39 +00:00
Jason van Zyl 78078577a0 adding snippet markers so i can reference with a macro inside doxia doco
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189684 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 02:05:37 +00:00