Commit Graph

6602 Commits

Author SHA1 Message Date
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
Brett Leslie Porter 134fcbfd3c [MNG-3634] revert portion of this change that caused a backwards compatibility problem
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672693 13f79535-47bb-0310-9956-ffa450edef68
2008-06-30 03:17:46 +00:00
Vincent Siveton 6f656edaba o merged r672624 (replaced logical tag to be more consistent)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672625 13f79535-47bb-0310-9956-ffa450edef68
2008-06-29 13:57:39 +00:00
Vincent Siveton 7253bd1d29 o merged r672622 (removed unnecessary CDATA in description tags)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672623 13f79535-47bb-0310-9956-ffa450edef68
2008-06-29 13:38:36 +00:00
Vincent Siveton 98f892344d o merged r672527 (MNG-3634: Improve the maven model to change the order of the POM elements)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672528 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 14:17:29 +00:00
Vincent Siveton 1a69ff6cbf o merged from r672519 (specified XML encoding UTF-8)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672520 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 13:05:23 +00:00
Vincent Siveton effc5ad73f o merged from r672517 (removed empty comment)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672518 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 13:03:05 +00:00
Vincent Siveton 3e98bddec3 o merged from r672514 (minor comments)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672515 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:50:16 +00:00
Vincent Siveton 6a54ebc92f o merged from r638671 (MNG-3469: add Resource.toString() method for debugging. patch from Wayne Fay)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672513 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:45:50 +00:00
Vincent Siveton f43ec427f0 o merged from r638669 (MNG-3468: add FileSet.toString() method for debugging. patch from Wayne Fay)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672512 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:44:00 +00:00
Vincent Siveton bd379f7e01 o merged from r638668 (MNG-3467: add toString() method for debugging. patch from Wayne Fay)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672510 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:40:45 +00:00
Vincent Siveton 64f6e7aa88 o one line for namespace
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672508 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:36:25 +00:00
Vincent Siveton a8e8c1991d o merged from r672506 (fixed typo)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672507 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:35:33 +00:00
Vincent Siveton 188bd7a943 o merged from r672501 (updated to last modello-maven-plugin 1.0-alpha-18)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672502 13f79535-47bb-0310-9956-ffa450edef68
2008-06-28 12:23:59 +00:00
Vincent Siveton 2fe4b23801 o added <file-release/> tags
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672412 13f79535-47bb-0310-9956-ffa450edef68
2008-06-27 22:41:26 +00:00
Vincent Siveton d1e9381724 o validates DOAP file using the w3.org rdf validator
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@672411 13f79535-47bb-0310-9956-ffa450edef68
2008-06-27 22:40:23 +00:00
John Dennis Casey cd2602d9e6 Adding -V|--show-version, and cleaning up interpolation to correspond with recent refactoriing in 2.0.x branch. Also, changing super-POM to use basedir/build.directory expressions in build paths, to enable paths to respond to changes in other, more basic paths (like outputDirectory responding to a change in build.directory). This is in preparation for merging over the dynamicBuild behavior.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@671936 13f79535-47bb-0310-9956-ffa450edef68
2008-06-26 16:34:27 +00:00
Brett Leslie Porter 179ce1a925 [MNG-3622] upgrade to wagon 1.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@670353 13f79535-47bb-0310-9956-ffa450edef68
2008-06-22 13:03:37 +00:00
Brett Leslie Porter c49d930eba add license
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@670349 13f79535-47bb-0310-9956-ffa450edef68
2008-06-22 12:38:42 +00:00
Brett Leslie Porter 726e4adbba this causes plexus-utils clashes, remove
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@670348 13f79535-47bb-0310-9956-ffa450edef68
2008-06-22 12:38:31 +00:00
Brett Leslie Porter cec28aabe8 ordering is not important, and can vary
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@670347 13f79535-47bb-0310-9956-ffa450edef68
2008-06-22 12:38:03 +00:00
John Dennis Casey 16a288c93a rolling back to maven-parent 8 until later, to keep this stable for now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@670059 13f79535-47bb-0310-9956-ffa450edef68
2008-06-20 21:00:03 +00:00
John Dennis Casey 46e229ef71 Bumping to 9-snap or maven-parent, to get clirr changes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@669250 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 18:28:08 +00:00
Brett Leslie Porter 825448f10e [MARTIFACT-6] The deployer should detect previous deployments of the same version and die
This corrects the test case and implementation, utilising the previous changes made to ensure mirrors
and other repository metadata are not consulted for metadata


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@669227 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 17:06:57 +00:00
Brett Leslie Porter 5be7ffdd23 moving to 5.0, as it's required at runtime for maven-artifact now anyway
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@669226 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 17:04:33 +00:00
Brett Leslie Porter 3bce57d8c7 license header
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@669225 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 17:00:14 +00:00
Brett Leslie Porter e06cccb23b ignores
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@669223 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 16:59:50 +00:00
Brett Leslie Porter 3acaa63cf8 adjust the embedder tests:
- remove a number of downloads from central that were slowing the build significantly
- ensure the tests will run with a repo manager and no central access
- ensure the tests will run offline if the local repository is populated

The technique for populating the repository is very hacky. We really need the tests to be doing this themselves. Perhaps moving these IT-like tests into the IT section and alongside the core ITs is the way to go - but this is a start.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@669222 13f79535-47bb-0310-9956-ffa450edef68
2008-06-18 16:56:56 +00:00
John Dennis Casey 08f3ac7ab4 Upgrade to plexus-interpolation 1.0.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@668296 13f79535-47bb-0310-9956-ffa450edef68
2008-06-16 20:44:25 +00:00
Brett Leslie Porter c13526d15a ignores
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@667531 13f79535-47bb-0310-9956-ffa450edef68
2008-06-13 13:36:12 +00:00
John Dennis Casey 016cfaca59 Remove explicit version from here.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@667286 13f79535-47bb-0310-9956-ffa450edef68
2008-06-12 22:37:01 +00:00
John Dennis Casey 376715986a Adding XMLNS info and license header where needed.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@667262 13f79535-47bb-0310-9956-ffa450edef68
2008-06-12 22:08:22 +00:00
John Dennis Casey be00b00c70 Use latest plexus-container-default, to correct a NPE with ant-based mojos.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@667207 13f79535-47bb-0310-9956-ffa450edef68
2008-06-12 19:33:26 +00:00
Vincent Siveton db3a5a12d9 o added Maven 2.0.9
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@667053 13f79535-47bb-0310-9956-ffa450edef68
2008-06-12 11:52:48 +00:00
Brian E Fox c5de066d3c add schema to settings
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@661552 13f79535-47bb-0310-9956-ffa450edef68
2008-05-30 02:05:59 +00:00
Jason van Zyl ac4c940711 MNG-3598: Allow custom dependency resolution
Submitted by: Igor Fedorenko



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@660244 13f79535-47bb-0310-9956-ffa450edef68
2008-05-26 17:33:49 +00:00
John Dennis Casey e26974da98 [MNG-2739] Adding validation logic to DefaultMavenTools and ProjectUtils, to make sure repositories have id and url before constructing an ArtifactRepository instance...this code is used ahead of normal model validation, so it needs to be included here. Also, introducing a new exception to handle the errors when these elements are missing.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@659680 13f79535-47bb-0310-9956-ffa450edef68
2008-05-23 21:52:24 +00:00
Milos Kleint ca2bb6a32f MNG-3574 - project plugin meta version needs to be replaced with the resolved one.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@659463 13f79535-47bb-0310-9956-ffa450edef68
2008-05-23 07:45:41 +00:00
John Dennis Casey e458d85616 Disable the pluginRepository deprecation message until the first release of 2.1 is imminent, to avoid confusion when using IDEs that use 2.1 snapshots (where the CLI still uses 2.0.x).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@659236 13f79535-47bb-0310-9956-ffa450edef68
2008-05-22 20:15:52 +00:00
Paul Gier 9dd2e54583 Improve description of activeByDefault.
Issue id: MNG-2609


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@657078 13f79535-47bb-0310-9956-ffa450edef68
2008-05-16 14:27:12 +00:00
Paul Gier 9f84e95bab Allow use of ! to deactivate a profile. Remove use of E: and D: for enabling and disabling.
Issue id: MNG-3571


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@656846 13f79535-47bb-0310-9956-ffa450edef68
2008-05-15 21:21:31 +00:00
Paul Gier 07a035b146 Profiles should be activated if any of the activators return true.
Issue id: MNG-3106


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@656827 13f79535-47bb-0310-9956-ffa450edef68
2008-05-15 20:42:27 +00:00