Commit Graph

54 Commits

Author SHA1 Message Date
Brett Leslie Porter 9a86709abd PR: MNG-249
make compile and package reactor aware



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225731 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 09:32:32 +00:00
Brett Leslie Porter 826413b74a PR: MNG-598
allow type handlers to be specified by plugin extensions



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225477 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 08:03:33 +00:00
Brett Leslie Porter e78bef0429 PR: MNG-598
implement ability to retrieve packaging handlers (lifecycle mappings) from extension plugins. Remove plugin mapping
metadata for the same
integration tests are in place for type handlers but commented out until implemented (41)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225263 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 09:04:32 +00:00
John Dennis Casey 4b1038de53 Working on: MNG-607
o Added '-f' CLI option, to allow use of non-standard pom files, or spawning of a build from outside of the project dir.
o Added preferential processing of release-pom.xml over pom.xml if it exists (assumes that the current checkout is a release of the software)
o Moved all file discovery from MavenCli to DefaultMaven, to allow embedders to have access to this logic.
o Modified MavenExecutionRequest to add a flag for reactor-activation and the name of a non-standard pom to use, if appropriate.
o Removed getFiles() and getProjectFiles() from MavenExecutionRequest, since file discovery is now done in the DefaultMaven.
o Added integration tests to check preference of release-pom.xml in standalone and '-r' mode
o Added integration tests to check usage of '-f' option within and outside of the project directory
o Added processing for cli-options.txt to maven-core-it-verifier (Verifier.java) to allow specification of '-f' and '-r' in tests


NOTE: the release plugin still doesn't correctly remove the release-pom.xml from HEAD/trunk, since I don't have access to the SCM remove command from maven-scm. I'm waiting for Emmanuel to finish some API changes before moving to the new maven-scm version, and implementing this final step.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225226 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 03:55:37 +00:00
Brett Leslie Porter 67a2c243fb reenable tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220346 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 15:37:46 +00:00
Brett Leslie Porter aa59559efb PR: MNG-507
implement repository relocation of an artifact


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220220 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:31:44 +00:00
Brett Leslie Porter b2d349adbc PR: MNG-505
add integration tests for version ranges



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219847 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 06:53:47 +00:00
John Dennis Casey 3519e21e97 Resolving: MNG-576...I'm committing Stephane's patch for an integration test. Thanks, Stephane
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219571 13f79535-47bb-0310-9956-ffa450edef68
2005-07-18 21:43:11 +00:00
Brett Leslie Porter 640667a6a2 integration tests for the required maven version test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219474 13f79535-47bb-0310-9956-ffa450edef68
2005-07-18 11:59:46 +00:00
John Dennis Casey 4b53aba3bb Fixing issues related to MNG-377, where the plugins.xml metadata was being mishandled. Separated updating of this metadata into a separate mojo, bound to the 'package' phase, and put in a validator for the POM (POM has to have distributionRepository now for maven-plugin's) which is bound to the 'validate' phase. Put together an integration test that uses modello:java as a case where the pluginGroups must be consulted. Also had to change the Verifier to check a verifier.properties for failOnErrorOutput, which will suppress IT failures based on [ERROR] log output (modello outputs one of these, and kills the IT unnecessarily).
MNG-377 should be resolved at this point.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@215890 13f79535-47bb-0310-9956-ffa450edef68
2005-07-11 22:08:58 +00:00
John Dennis Casey 2a403e4df3 Adding IT to cover a regression on dependencyManagement injection from parent-poms of a dependency's pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209538 13f79535-47bb-0310-9956-ffa450edef68
2005-07-06 23:12:44 +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 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 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
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 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 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 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
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 1166e16562 integration test fix, mmld temporarily out of order
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163948 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 05:00:05 +00:00
Brett Leslie Porter bf22a13e91 add it0019 (currently failing)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163899 13f79535-47bb-0310-9956-ffa450edef68
2005-04-11 12:27:13 +00:00
Brett Leslie Porter f8ba3a48d1 merge from branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163855 13f79535-47bb-0310-9956-ffa450edef68
2005-04-08 04:48:04 +00:00
John Dennis Casey 56969982a1 Added new IT to express the problems with caching the model before interpolation takes place.
Rolled back the changes to suppress usage of the cached model in MavenMetadataSource. Restored original functionality, to pre- last revision.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163848 13f79535-47bb-0310-9956-ffa450edef68
2005-04-08 01:57:06 +00:00
Brett Leslie Porter 72d8486c7c add integration test for plugin configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163643 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 06:40:08 +00:00
Emmanuel Venisse 2ef5d9ad39 initial version of EJB plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163520 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 17:14:39 +00:00
Emmanuel Venisse c25b897413 Fix integration tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163493 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:39:50 +00:00
Brett Leslie Porter f3ffe9a617 comment out it0016 - broken
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163482 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 01:43:37 +00:00
Emmanuel Venisse 482684e3cc Initial version of war plugin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163471 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 21:46:14 +00:00
Brett Leslie Porter 17b616537e 6 was removed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163465 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 08:54:14 +00:00
Brett Leslie Porter 8fc9a29003 integration test updates relating to phases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163434 13f79535-47bb-0310-9956-ffa450edef68
2005-02-28 23:37:19 +00:00
John Dennis Casey 95d01ff572 o Completed marmalade-mojo support, tested with m2 bootstrap with empty local repo and maven-core pegged at 2/26/2005.
Will resolve CI issues as soon as lifecycle is fixed for IT0013.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163430 13f79535-47bb-0310-9956-ffa450edef68
2005-02-28 18:29:47 +00:00
John Dennis Casey db65155072 o Working on getting it0015 (marmalade-mojo support) working...nearly there, it0015 is still disabled.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163415 13f79535-47bb-0310-9956-ffa450edef68
2005-02-25 05:09:14 +00:00
Brett Leslie Porter 5ed8a1306f add it0013
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163396 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 02:51:00 +00:00
Jason van Zyl 1432ed959d o updating tests to reflect the addition of the lifecyle
in most cases this amounts to changing

  "jar:jar" -> "package"
  "jar:install" -> "install"
  "compiler:compile" -> "compile"

  and I also disabled the tests for pre/post goals as we aren't going
  to use those anymore (hopefully).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163358 13f79535-47bb-0310-9956-ffa450edef68
2005-02-16 07:11:14 +00:00
John Dennis Casey 4f8225545e o Added pom interpolation based on regex search-and-replacement with ReflectionValueExtractor pom lookups.
o Moved ReflectionProjectValueExtractor into o.a.m.util package and renamed to ReflectionValueExtractor
o Added unit tests for interpolation
o Added integration test for interpolation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163335 13f79535-47bb-0310-9956-ffa450edef68
2005-02-03 20:54:15 +00:00
John Dennis Casey e687cfed61 o Added dependencyDefaults section to POM.
The nested <dependencyDefault> element closely mirrors the <dependency> element specification.
  It provides the ability to set url, artifact, properties, version for a dependency that matches on
  {groupId, artifactId, type}. Url, artifact, and version will only override the dependency's values if
  the dependency doesn't provide the value, and (in the case of url and artifact) the dependency
  doesn't provide a version (url and artifact are assumed to be version-specific).

  Properties will only be overwritten, and only in the case where the dependency
  doesn't specify them.

  Dependencies are validated after merging with defaults, since version is not required
  on either <dependency> or <dependencyDefault> but is required between the two.

o Added component interface/default impl for injecting project defaults.
o Added unit and integration tests.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163323 13f79535-47bb-0310-9956-ffa450edef68
2005-02-01 22:43:03 +00:00
John Dennis Casey cf2354fee5 o Added it0010 integration test.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163230 13f79535-47bb-0310-9956-ffa450edef68
2004-11-03 22:54:46 +00:00
Jason van Zyl 8eba14b8e1 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163155 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:10:03 +00:00
Jason van Zyl 7d50ca4e22 o active it0008
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163150 13f79535-47bb-0310-9956-ffa450edef68
2004-09-23 17:01:40 +00:00
Jason van Zyl f4e5f175f5 adding it0007
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162952 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 17:56:23 +00:00
John Dennis Casey 0cf96effb2 o Added unit tests for goal decoration/resolution.
o Added integration test featuring a decorated goal.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162861 13f79535-47bb-0310-9956-ffa450edef68
2004-07-19 00:58:14 +00:00