Commit Graph

162 Commits

Author SHA1 Message Date
Emmanuel Venisse 8dacb55248 Fix it number in artifact name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201986 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 13:14:49 +00:00
John Dennis Casey e4083dcdea Resolving issue: MNG-522
o Added check for null child pluginManagement section, and setting to parent value if null.
o Added integration test for parent->child pluginManagement inheritance and injection, to prevent regressions.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@201693 13f79535-47bb-0310-9956-ffa450edef68
2005-06-25 00:00:05 +00:00
Brett Leslie Porter a66df4b205 fix bad group id
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193160 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 15:15:09 +00:00
John Dennis Casey b4ece5dbe8 Fixing versions in ITs to -alpha-3 deps.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193108 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 08:14:08 +00:00
John Dennis Casey bea9eca2f6 Resolving issue: MNG-493
o Changed getExecutionsAsMap() in Plugin (within maven.mdo) to throw an IllegalStateException if two PluginExecutions are detected with the same id. This method should always be called during inheritance assembly...

o Changed PluginExecution's id field to have a defaultValue of 'default' within maven.mdo.

NOTE: It may be necessary to double-check the id-collision within MavenProjectBuilder, in case there is no inheritance of plugins...I'll add this, and follow this commit momentarily.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191620 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 03:57:17 +00:00
Brett Leslie Porter e37d95003f put back integration test, update plugin should have wandered over to ibiblio by now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191580 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 22:36:57 +00:00
John Dennis Casey d7e421fd01 Resolving: MNG-496
o Adding extraction of mojo-specific configuration from the merged config for the plugin
o Warning at the DEBUG log-level for unused plugin configuration during the extraction process above
o Added integration test it0028 to test with unused plugin configuration present.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191552 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 20:11:01 +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
John Dennis Casey 3e2449750d PR: MNG-414
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191311 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 23:27:40 +00:00
Brett Leslie Porter 28b5d25b61 fix incorrect test - executing a standalone goal does not invoke executions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191295 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 16:03:20 +00:00
Brett Leslie Porter 331ae735a7 fix incorrect test (execution cannot affect something already bound by packaging)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191294 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 16:01:48 +00:00
Brett Leslie Porter a72409b091 fix pom format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191291 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 15:19:18 +00:00
Brett Leslie Porter a9f174c834 Clean up of the lifecycle executor, simplify configuration and push back into the plugin manager.
This fixed a couple of bugs along the way.

One change that this has brought to bear from the document is you now must specify a goal for it to be bound to the LC
(see it0008)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191285 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 13:01:26 +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 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 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 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 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
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
John Dennis Casey eba2327c66 commenting out ITs 22 and 23 until I get the chance to fix them.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189680 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 01:29:30 +00:00
John Dennis Casey a58b76e2e4 Adding profiles.xml and settings.xml support for profiles, along with integration tests for each.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189510 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 03:27:43 +00:00
John Dennis Casey 29878afcc6 o pom-level profiles are working now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189464 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 22:36:44 +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 e1bcc79d16 more parameter consistency. MAVEN_OPTS goes to java, $@ goes to the args.
This will mean implementing -D -> sys property handling in mboot and verifier to allow passing of sys props on the command line if that is needed again


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188655 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 01:32:11 +00:00
Brett Leslie Porter 15a3cdc7cd pass MAVEN_OPTS on to the verifier
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@180298 13f79535-47bb-0310-9956-ffa450edef68
2005-06-06 11:49:50 +00:00
Brett Leslie Porter 68595a32c2 move system property specification to system.properties in itests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177983 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 13:37:34 +00:00
Brett Leslie Porter 48cf14a656 PR: MNG-378
Only deploy the release information at the point of release

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@177934 13f79535-47bb-0310-9956-ffa450edef68
2005-05-23 06:43:12 +00:00
Brett Leslie Porter cc9daca698 use built verifier plugin in itest
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@171225 13f79535-47bb-0310-9956-ffa450edef68
2005-05-21 15:46:15 +00:00
Brett Leslie Porter 0253ccc305 PR: MNG-164
Add Beanshell mojo support

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170608 13f79535-47bb-0310-9956-ffa450edef68
2005-05-17 15:11:41 +00:00
Brett Leslie Porter 7ed8a746d3 update to released versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169961 13f79535-47bb-0310-9956-ffa450edef68
2005-05-13 07:01:57 +00:00
Brett Leslie Porter ccb9ae4b97 remove bad parent
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169855 13f79535-47bb-0310-9956-ffa450edef68
2005-05-12 17:37:09 +00:00
Brett Leslie Porter fcb7b5a294 align versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169852 13f79535-47bb-0310-9956-ffa450edef68
2005-05-12 17:10:21 +00:00
Brett Leslie Porter 53d6c53cb6 more work on that quoting. seems to finally have come good, at least in bash...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169467 13f79535-47bb-0310-9956-ffa450edef68
2005-05-10 13:34:16 +00:00
Brett Leslie Porter 26622164f4 PR: MNG-372
more fixes for paths with spaces

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169293 13f79535-47bb-0310-9956-ffa450edef68
2005-05-09 11:38:38 +00:00
Brett Leslie Porter 0a7842482f PR: MNG-372
Submitted by: Mark Hobson
Reviewed by:  Brett Porter
deal better with spaces in paths on windows
(applied with modifications)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169184 13f79535-47bb-0310-9956-ffa450edef68
2005-05-08 22:50:01 +00:00
Brett Leslie Porter d6eed0b7a6 note about IT 14
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169178 13f79535-47bb-0310-9956-ffa450edef68
2005-05-08 22:07:46 +00:00
Brett Leslie Porter 48e11d225f add test compilation to integration test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169171 13f79535-47bb-0310-9956-ffa450edef68
2005-05-08 21:39:30 +00:00
Brett Leslie Porter e3442d7969 add integration test for pom configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169170 13f79535-47bb-0310-9956-ffa450edef68
2005-05-08 21:26:13 +00:00
John Dennis Casey 6e8cde754c Updating README.txt with it1005
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168484 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 00:37:27 +00:00
John Dennis Casey 6de708da59 IT for testing failure when duplicate goal names are specified in multiple mojos...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168483 13f79535-47bb-0310-9956-ffa450edef68
2005-05-06 00:36:00 +00:00
John Dennis Casey e095874576 Cleaned up plugin descriptor generation/reading to be more consistent, and to include some things that were being left out. Removed more deprecated behavior from annotations support and expression support. Wrote up the first pass on the mojo api and annotations spec. Fixed the mmld-mojo suppport to accommodate the new expression syntax and collisions with the default expression evaluator for mmld. Added an exception to plugin configuration in DefaultPluginManager to not look for a Field when the configurator == map-oriented.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168233 13f79535-47bb-0310-9956-ffa450edef68
2005-05-05 01:33:42 +00:00
Brett Leslie Porter a5d3dad778 fixes for it0013, it0015 and reinclude 15
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168131 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 14:16:48 +00:00
John Dennis Casey 5345ee5fc6 Removed backward compat for plugin class-level parameter annotations and '#' expressions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168070 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 04:20:36 +00:00
Brett Leslie Porter 6dd94566ab PR: MNG-348
Submitted by:	Vincent Massol
Reviewed by:	Brett Porter (applied with some changes)
Add a verifier plugin, for doing integration tests


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165612 13f79535-47bb-0310-9956-ffa450edef68
2005-05-02 09:17:30 +00:00
Brett Leslie Porter f214098416 fix expected class name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165600 13f79535-47bb-0310-9956-ffa450edef68
2005-05-02 07:27:56 +00:00
Brett Leslie Porter 4406b6b378 improve tests of war plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165599 13f79535-47bb-0310-9956-ffa450edef68
2005-05-02 07:23:37 +00:00
John Dennis Casey ea5cd13285 Fixing IT's broken by Plugin->Mojo rename
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@165246 13f79535-47bb-0310-9956-ffa450edef68
2005-04-29 01:06:58 +00:00
John Dennis Casey 61406495be o Refactored the MavenSettings code into the settings.mdo/Settings class.
o Added code to cache the active proxy and profile inside the Settings instance for quicker lookup.

o Added a method to initialize a new active profile for a Settings instance in the event one didn't exist.

o Started adding offline mode. So far, I've implemented:

  - Warning when a mojo declares a requirement for connectivity, but we're offline.

  - INFO message stating when maven is running in offline mode.

  - Addition to the Profile class in o.a.m.settings package to allow specification of offline mode by declaring: <offline>true</offline>


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163969 13f79535-47bb-0310-9956-ffa450edef68
2005-04-18 21:50:55 +00:00