Commit Graph

876 Commits

Author SHA1 Message Date
Brett Leslie Porter cc20bf6402 merge from branch maven-2.0.x @ rev 367900
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@367902 13f79535-47bb-0310-9956-ffa450edef68
2006-01-11 03:45:10 +00:00
Brett Leslie Porter af1a99198f merge from branch maven-2.0.x, up to rev 365776
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@365790 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 01:14:17 +00:00
Vincent Massol 5282ee4341 Adding 2 new phases related to integration tests:
- before-integration-test: perform actions required before integratiob tests are executed. This may involve things such as setting up the required environment.
- after-integration-test: perform actions required after integration tests have been executed. This may including cleaning up the environment.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@359866 13f79535-47bb-0310-9956-ffa450edef68
2005-12-29 18:19:31 +00:00
Emmanuel Venisse 31a3319419 Fix exit code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@358565 13f79535-47bb-0310-9956-ffa450edef68
2005-12-22 13:47:36 +00:00
Brett Leslie Porter 9ae0914694 flip trunk to 2.1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356316 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 18:22:06 +00:00
John Dennis Casey 8a5fa61b17 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356099 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 01:41:09 +00:00
John Dennis Casey 9cf94e34f2 [maven-release-plugin] prepare release maven-2.0.1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356093 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 01:34:03 +00:00
Jason van Zyl db17a2494b o adding capability to the lifecycle executor to merge in executions which contain
configurations for external plugins. in this particular i've made the adjustments
  so that the corbertura plugin can tell the surefire plugin to fork. not ideal, but
  it will work until we figure out a more elegant solution.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356065 13f79535-47bb-0310-9956-ffa450edef68
2005-12-11 23:35:47 +00:00
John Dennis Casey e983fddf63 Fixing the context classloader for plugin executions. New classloader will delegate to the realm, rather than using only the loader used by the realm of the plugin-container.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@355831 13f79535-47bb-0310-9956-ffa450edef68
2005-12-11 00:39:20 +00:00
John Dennis Casey ee3df7f885 Adding maven-error-diagnoser to the exclusions list in the plugin manager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@355649 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 23:33:01 +00:00
Brett Leslie Porter 65acc94926 implement lax parsing of repository metadata XML files
PR: MNG-1788


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@355404 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 07:58:04 +00:00
John Dennis Casey 2e89dadbce PR: MNG-1311
Added a stack of lifecycle fork-points that will be removed from each successively deeper level of forking in a cumulative manner, to prevent multi-node cycles in addition to simply blocking two-node cycles.

The basic problem with the recursion check that was in there was a type mismatch on the contents of a java.util.List. It's fixed now.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@355383 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 05:37:43 +00:00
John Dennis Casey 125c19fb3a PR: MNG-1265
Submitted By: Allan Ramirez
Reviewed By: John Casey

Applied patch, which will add "built on" timestamp to the --version output.

NOTE: I did not apply the portion of the patch related to mboot, since the bootstrap has been redone. This may need to be added back into the bootstrap later.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354702 13f79535-47bb-0310-9956-ffa450edef68
2005-12-07 04:28:29 +00:00
John Dennis Casey eeb14425c6 PR: MNG-1352
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied this patch, which will ensure that alias != param.getName() before adding a duplicate diagnostic message for configuration.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354464 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 16:34:09 +00:00
John Dennis Casey 0e5015360b PR: MNG-1666
Submitted By: John Casey

Fixed escaped expression handling in the plugin parameter expression evaluator. '$$' was not being replaced by '$' correctly.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348489 13f79535-47bb-0310-9956-ffa450edef68
2005-11-23 17:01:09 +00:00
Jason van Zyl 02902d53a2 --------------------------------------------------------------
Issue: MNG-1470
     URL: http://jira.codehaus.org/browse/MNG-1470
 Summary: mvn can't calculate M2_HOME when mvn is a relative symlink
Reporter: Nicolás Lichtmaier (niqueco)
--------------------------------------------------------------

o patch applied
 


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345559 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 20:12:21 +00:00
Emmanuel Venisse 750e08a984 Fix name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344977 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 11:04:23 +00:00
John Dennis Casey eb1651be3c Fixing CI. Had to move the addPlugin(..) call back to its original spot, and expose a new method in MavenProject to inject PluginManagement info to a Plugin instance that's passed in as a parameter.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344294 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 02:38:33 +00:00
John Dennis Casey 9a0b2544f2 PR: MNG-1424
Fixing addPlugin(..) ordering relative to plugin verification from the lifecycle executor's getMojoDescriptor(..) method, which will ensure that pluginManagement versions take precedence over resolved plugin versions. I'm not sure how to test this  one yet, so I'm not adding anything in that regard yet.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344257 13f79535-47bb-0310-9956-ffa450edef68
2005-11-14 22:55:49 +00:00
Emmanuel Venisse 4b310ef198 Add MAVEN_TERMINATE_CMD.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332782 13f79535-47bb-0310-9956-ffa450edef68
2005-11-12 15:20:21 +00:00
John Dennis Casey ed7cc01b88 PR: MNG-699
Submitted By: Piotr Bzdyl
Reviewed By: John Casey

Applied portions of the patch that pertained to the lifecycle mappings and artifact handlers for ejb3/par. The implementations of these plugins is in the sandbox (or soon will be).

Thanks for the patch, Piotr!



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@332151 13f79535-47bb-0310-9956-ffa450edef68
2005-11-09 21:36:10 +00:00
Brett Leslie Porter d848ba2acd PR: MNG-1232
Submitted by: Jerome Lacoste
avoid NPE in error reporting under some circumstances

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330207 13f79535-47bb-0310-9956-ffa450edef68
2005-11-02 08:03:25 +00:00
Brett Leslie Porter 51650e5f15 PR: MNG-1271
Submitted by: Edwin Punzalan
improve error message when pom.xml not found and required


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@329996 13f79535-47bb-0310-9956-ffa450edef68
2005-11-01 07:07:44 +00:00
Brett Leslie Porter 82fd1c6c6b site updates
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@329057 13f79535-47bb-0310-9956-ffa450edef68
2005-10-28 03:03:16 +00:00
John Dennis Casey e244bc5072 Searching for the project-specified plugin instance, to get configuration...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@328899 13f79535-47bb-0310-9956-ffa450edef68
2005-10-27 15:41:33 +00:00
John Dennis Casey 69fda56d91 Adding '$' as an escape character for variable-syntax which should be passed through.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@328885 13f79535-47bb-0310-9956-ffa450edef68
2005-10-27 14:47:55 +00:00
Brett Leslie Porter a9571267db PR: MNG-1244
Submitted by: Mark Hobson
Final fix for paths with spaces in the executable


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@328137 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 19:12:46 +00:00
Brett Leslie Porter 342ea76529 put back javadoc
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327981 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 06:37:36 +00:00
Brett Leslie Porter d8d5807fae PR: MNG-1291
correct the executable name

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327919 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 02:32:29 +00:00
Brett Leslie Porter ea8e16f26d PR: MNG-1244
Submitted by: Mark Hobson
make m2 wrapper script work under cygwin when there are spaces in the path


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327899 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 01:10:00 +00:00
Brett Leslie Porter d7c3795f1c remove unused code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327887 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 23:58:31 +00:00
Brett Leslie Porter 56f566e79e clean some imports and unused code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327885 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 23:50:38 +00:00
Brett Leslie Porter 772bf37124 PR: MNG-1223
error out if there are duplicate modules in the reactor


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327763 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 08:07:38 +00:00
Brett Leslie Porter 3fb76b2014 fix script
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327257 13f79535-47bb-0310-9956-ffa450edef68
2005-10-21 19:50:39 +00:00
Brett Leslie Porter 623efa6119 apply changes from tag maven-2.0 rev 326239
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326240 13f79535-47bb-0310-9956-ffa450edef68
2005-10-18 21:01:19 +00:00
Brett Leslie Porter d48cbfaef3 remove fixed version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326200 13f79535-47bb-0310-9956-ffa450edef68
2005-10-18 18:37:55 +00:00
Brett Leslie Porter 2be4e802b2 don't echo commands
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321473 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 19:17:11 +00:00
Brett Leslie Porter 5c3f720375 include mvn script
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321458 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 19:01:49 +00:00
Brett Leslie Porter c51faea5d1 merg from tag up to r321409
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321412 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 18:27:49 +00:00
Brett Leslie Porter b8a6247c0b fix version on trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321100 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 13:11:04 +00:00
Brett Leslie Porter b4c041a567 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321042 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 07:26:39 +00:00
Brett Leslie Porter d783c5fc41 [maven-release-plugin] prepare release maven-2.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321040 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 07:15:39 +00:00
Brett Leslie Porter 3ef6ba2242 lock in a version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321039 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 07:01:00 +00:00
Brett Leslie Porter ca0e872a5a - fix MojoFailureExceptionDiagnoser so that even under the reactor the long message is shown
- remove long message from BuildFailureException as it was only there for that reason, and caused dual diagnosis

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320990 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 03:48:39 +00:00
Brett Leslie Porter c74d08fa48 if the plugin version is not working with this version of Maven, rollback until one is found.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320983 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 02:57:13 +00:00
Brett Leslie Porter 156464c205 don't need extra message as the exception message is guaranteed to say that
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320964 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 01:31:05 +00:00
John Dennis Casey ed17ce3aba Adding conditional logic to pull out root cause to a couple diagnosers.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320918 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 21:03:54 +00:00
Brett Leslie Porter 1c7c34f027 more error diagnostics improvements
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320869 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 18:49:19 +00:00
John Dennis Casey 62149297e4 Resolving: MNG-1150
Applied patch for configuring Wagon instances via DefaultWagonManager. I reworked the configuration exception to be a derivative of TransferFailedException, since it pertains to the WagonManager usage of maven-wagon.

Thanks to Juan Codagnone for the patch.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320827 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 17:49:41 +00:00
Brett Leslie Porter b4cdb4a785 PR: MNG-122
cleanup formatting

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320812 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 17:21:00 +00:00