Commit Graph

6393 Commits

Author SHA1 Message Date
John Dennis Casey 4eb9671e71 [MNG-3682] set project to null after recovering from ProjectBuildingException to prevent infinite loop after one level of relocation.
Submitted by: Tomasz Wysocki


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679844 13f79535-47bb-0310-9956-ffa450edef68
2008-07-25 15:57:31 +00:00
Britton Isbell c8b842c976 Merge of SI_MAVEN_2_1 branch. New builder code.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679609 13f79535-47bb-0310-9956-ffa450edef68
2008-07-24 23:06:59 +00:00
Brett Leslie Porter d52ffdef81 reapplying John's merge of all 2.0.10-RC changes to date by reverting r679244, sans artifact upgrade and user agent parts. Passes all integration tests locally, seeing if Hudson and Continuum agree
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679263 13f79535-47bb-0310-9956-ffa450edef68
2008-07-24 01:56:21 +00:00
John Dennis Casey 24176a08a1 Rolling back merge attempt until I have time to fix failing unit tests (most likely tomorrow will do it).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679244 13f79535-47bb-0310-9956-ffa450edef68
2008-07-24 00:18:09 +00:00
John Dennis Casey 3c9be4bceb Merging changes in from 2.0.10-RC2 release candidate on 2.0.10-RC branch. Still have two failing unit tests in maven-core; I'll take care of those in a few minutes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679229 13f79535-47bb-0310-9956-ffa450edef68
2008-07-23 23:26:00 +00:00
Brett Leslie Porter 1cb6db67de [MNG-3652] minor improvement to the user agent for trunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@679010 13f79535-47bb-0310-9956-ffa450edef68
2008-07-23 07:15:51 +00:00
Benjamin Bentmann a14916cf8c o Considered file extensions in command search to enable tests for Windows
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@677452 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 22:33:58 +00:00
Brett Leslie Porter d046f6039f embedder tests that download artifacts and plugins should use the settings file for now to honour mirrors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@677239 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 11:18:50 +00:00
Brett Leslie Porter e0e55f40ab remove unused shade plugin reference
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@677205 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 09:10:31 +00:00
John Dennis Casey c7dcd1863c rolling back MNG-3503 properly.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@677002 13f79535-47bb-0310-9956-ffa450edef68
2008-07-15 18:23:54 +00:00
John Dennis Casey ecdb87e1f4 Revert MNG-3503 until we can figure out how to deal with linkage error when installing site descriptor during a POM build.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@676986 13f79535-47bb-0310-9956-ffa450edef68
2008-07-15 17:29:22 +00:00
Jason van Zyl 9bd026c6e3 o note a couple todo to clean up the build.xml to a complete mininum
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@676388 13f79535-47bb-0310-9956-ffa450edef68
2008-07-13 18:11:17 +00:00
Jason van Zyl 0b3494a88d o make sure the distribution is removed and the new distribution laid down properly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@676382 13f79535-47bb-0310-9956-ffa450edef68
2008-07-13 17:59:26 +00:00
Benjamin Bentmann fd61a15b62 o Updated to plexus-classworlds:1.2-alpha-13 to get fix for PLX-367
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@676324 13f79535-47bb-0310-9956-ffa450edef68
2008-07-13 14:14:06 +00:00
Jason van Zyl 5e2d60366b o adding some code to detect system executables so that tests which wrap those executables are only run when they are present. in trying to get people to run the ITs from a Hudson bundle it's apparent that not everyone had SVN installed. we need to be more sensitive to different environments for testing if we want more people to participate.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@676103 13f79535-47bb-0310-9956-ffa450edef68
2008-07-12 00:07:06 +00:00
Jason van Zyl 1191f37a33 o make the maven home if we are starting completely from scratch, people using the hudson setup are getting dinged.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@676086 13f79535-47bb-0310-9956-ffa450edef68
2008-07-11 21:32:54 +00:00
Jason van Zyl 667fe087d5 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@676082 13f79535-47bb-0310-9956-ffa450edef68 2008-07-11 21:16:59 +00:00
John Dennis Casey 16ba522c66 Switch to using plexus-interpolation directly to avoid hidden imports.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675618 13f79535-47bb-0310-9956-ffa450edef68
2008-07-10 15:52:53 +00:00
Jason van Zyl 5aad974727 o merge from shane's branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675556 13f79535-47bb-0310-9956-ffa450edef68
2008-07-10 12:55:48 +00:00
Jason van Zyl 4cd0fee87d o merging notes from shane's branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675539 13f79535-47bb-0310-9956-ffa450edef68
2008-07-10 12:10:04 +00:00
Jason van Zyl f37bc59ef0 o merge from shane's branch to allow arbitrary use of integration repository
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675536 13f79535-47bb-0310-9956-ffa450edef68
2008-07-10 12:07:01 +00:00
Jason van Zyl 41e2551718 o add the new ant task jars
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675517 13f79535-47bb-0310-9956-ffa450edef68
2008-07-10 11:22:38 +00:00
Jason van Zyl 9f53c2d46a o change the version of the ant tasks used, update to get rid of the invalid POM message as previous versions of Maven are intolerant of the idea properties setup I have in the POMs here.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675515 13f79535-47bb-0310-9956-ffa450edef68
2008-07-10 11:22:08 +00:00
John Dennis Casey 6faeb46c9e [MNG-3651] Fixing exit code for windows.
Submitted by: Napoleon Esmundo C. Ramirez


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675432 13f79535-47bb-0310-9956-ffa450edef68
2008-07-10 03:58:59 +00:00
John Dennis Casey 3a52d33141 [MNG-3380] Process relocations before attempting to resolve child nodes during artifact collection.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675352 13f79535-47bb-0310-9956-ffa450edef68
2008-07-09 21:44:10 +00:00
John Dennis Casey a3719ed76c Improving the reliability of these two tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@675349 13f79535-47bb-0310-9956-ffa450edef68
2008-07-09 21:42:49 +00:00
John Dennis Casey 104dc17200 forgot a newline.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674906 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 18:08:19 +00:00
John Dennis Casey 9cef694f17 [MNG-3511] Improve output when no goal is specified.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674904 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 18:07:50 +00:00
John Dennis Casey cf01846d8d [MNG-3654] Make sure all plugins are carried over into cloned build instances.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674893 13f79535-47bb-0310-9956-ffa450edef68
2008-07-08 17:37:45 +00:00
Jason van Zyl 1c89925872 o adding yourkit profiling script for hudson and anyone else interested
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674361 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 23:34:59 +00:00
Jason van Zyl cacdd3ecdd o only allow local connections for now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674360 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 23:21:29 +00:00
Jason van Zyl 870feb8497 o add a yourkit enabled mvn so anyone can run the profiler, but most importantly the CI server
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674359 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 23:11:02 +00:00
Brett Leslie Porter e227f55c1d [MARTIFACT-25] cache failed POM downloads in the local repository, obeying the <releases> policy for checking for updates on them
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674333 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 18:43:17 +00:00
Jason van Zyl 668818f6ba MNG-3656: cleanup is complete as far as I can tell. I also got rid of a bunch of deps that said were needed, but the build seems to work fine, and I'm about to try on Mr Hudson.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674319 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 17:21:25 +00:00
Jason van Zyl d960c39994 MNG-3656: Keep pushing artifact and plugin versions up to the parent POM
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674316 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 16:44:06 +00:00
Jason van Zyl 916d026ded o aligning all versions in the parent POM
Issue id: MNG-3656


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674310 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 16:13:25 +00:00
Jason van Zyl f3020e370e o starting to collection all the property versions in one place so that I can start working on promoting successful versions of builds
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674309 13f79535-47bb-0310-9956-ffa450edef68
2008-07-06 16:08:04 +00:00
Jason van Zyl c48e137846 o work around for MNGECLIPSE-607 until the interpolation is fixed, something broke it and is wreaking havoc with platform testing within eclipse
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674211 13f79535-47bb-0310-9956-ffa450edef68
2008-07-05 17:05:45 +00:00
Olivier Lamy e32fd7b10e merge from branch rev 672402 672407
- fix junits on windauze
- add missing license headers



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674182 13f79535-47bb-0310-9956-ffa450edef68
2008-07-05 11:45:56 +00:00
John Dennis Casey a7598be94d [MNG-3503] Adding config to shade MX* classes from plexus-utils.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674093 13f79535-47bb-0310-9956-ffa450edef68
2008-07-04 16:57:57 +00:00
Brett Leslie Porter 278b580c8f [MNG-3652] set a user agent for Maven HTTP requests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@673901 13f79535-47bb-0310-9956-ffa450edef68
2008-07-04 04:32:09 +00:00
Vincent Siveton cf03434a59 o merged from r673797 (MNGSITE-55: Write a document about POM code style)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@673799 13f79535-47bb-0310-9956-ffa450edef68
2008-07-03 20:55:08 +00:00
Milos Kleint b6d1a5d1ac current model's remote repositories need to be calculated before the parent/origin is stored in lineage.
fixes this scenario (as found in svn:https://www.dev.java.net/svn/grizzly/trunk)
project defines remote custom repository and also has build extension that is only available at that remote repository. it defines RELEASE as the version of the extension artifact.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@673664 13f79535-47bb-0310-9956-ffa450edef68
2008-07-03 12:08:42 +00:00
John Dennis Casey 3d6b63bc11 [MNG-3642] Adding internal-only unique id 'mergeId' to build resources, to allow back-propagation of changed resource information from plugin executions to the dynamic version of the POM build section. Also, modified the project-builder's dynamism methods (calculate*, restore*) to use mergeId.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@673417 13f79535-47bb-0310-9956-ffa450edef68
2008-07-02 15:25:22 +00:00
John Dennis Casey 116105ef35 [MNG-2318] Fixing parent id() method to match format from model id method, so relative-path POMs can be validated for correct info.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672839 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 17:51:21 +00:00
John Dennis Casey 9514380003 Updating and commenting out artifact version property until I can get this working on localhost.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672816 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 16:38:11 +00:00
John Dennis Casey ff3312c747 Need to interpolate the plugin configurations that are stored in MojoExecution instances, created during build planning.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672794 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 15:27:16 +00:00
John Dennis Casey 3e03ce0956 Now that we're holding back the plugin config for interpolation just before it's used, we need to accept pom.* expressions in the parameter expression evaluator. Also, setting the maven-distribution finalName for the assembly plugin back to its old expression, which used pom.version not project.version.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672784 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 14:47:09 +00:00
John Dennis Casey 5c32bc6b28 All tests pass on my localhost...committing to see how it works on hudson.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672782 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 14:35:43 +00:00
Brett Leslie Porter 4c5f43abf9 We require the newer version of the surefire plugin or it is possible to get old versions of plexus-utils in the tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672727 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 08:34:38 +00:00