Commit Graph

337 Commits

Author SHA1 Message Date
Jason van Zyl 5d7758b358 o pull from trunky dunk dunk
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@767707 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 23:04:06 +00:00
Herve Boutemy c5571a0c78 used http://maven.apache.org/xsd/* for schema location
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748982 13f79535-47bb-0310-9956-ffa450edef68
2009-03-01 08:55:40 +00:00
Jason van Zyl 54da5ce53e o omit the creation of deployment specific repositories, and uniqueVersion = false isn't going to matter in 3.x. everything will be unique to match an osgi versioning scheme. the dichotomy between unique sometimes, and no versions locally is a mess.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747652 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 04:07:40 +00:00
Herve Boutemy 3d52a23b10 o upgraded Modello version to 1.0
o improved models to use Modello new features (merged from 2.1.x branch r745216)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745260 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 21:46:38 +00:00
Benjamin Bentmann fac6b97faf o Generified model/project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744572 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 21:49:23 +00:00
Jason van Zyl 8ecae9a554 o removing maven 1.x related files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742674 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 18:59:19 +00:00
Jason van Zyl ed4f594ac4 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739478 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 01:06:48 +00:00
Jason van Zyl 13fa00ea3f [maven-release-plugin] prepare release maven-3.0-alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739476 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 01:06:37 +00:00
Jason van Zyl 557f0a5373 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738777 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 07:13:04 +00:00
Jason van Zyl 7f54cfff61 [maven-release-plugin] prepare release 3.0-alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738775 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 07:12:48 +00:00
Jason van Zyl fe6d32bd6c MNG-3961: reverted the addition and we'll deal with this later properly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732936 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 06:06:32 +00:00
Jason van Zyl 481cde5756 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731333 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:28 +00:00
Jason van Zyl 6991c79e34 [maven-release-plugin] prepare release maven-3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731331 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:05 +00:00
Jason van Zyl cc38a455f7 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731271 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:29:07 +00:00
Jason van Zyl bab3480d4b [maven-release-plugin] prepare release 3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731269 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:28:42 +00:00
Benjamin Bentmann 970065b4bd [MNG-3424] Respect ordering of elements as given in POM
o Merged from r708871

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730079 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 09:33:02 +00:00
Britton Isbell a64d505aa3 Fix: MNG-3927
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730028 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 01:33:12 +00:00
Benjamin Bentmann 72a871c1b2 o Consequently used http://maven.apache.org/xsd/* for the schema locations (merged from r729738)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729741 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 14:00:38 +00:00
Herve Boutemy 35472a49f5 o Consequently used http://maven.apache.org/xsd/* for the schema locations (see r729720) (merged from 2.0.10RC branch r729731)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729734 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 13:35:32 +00:00
Benjamin Bentmann 04b358629c [MNG-3921] Extensions are subject to NPEs in their hashCode() impl
o Merged from r727548

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727561 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 22:45:30 +00:00
Herve Boutemy 48d853ad6e [MNG-3898] use models attribute of modello-maven-plugin instead of model (merged from 2.0.x branch r726548)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726552 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 22:07:08 +00:00
Jason van Zyl c82352832a o updating to 3.0-SNAPSHOT
o aparently when we start from scratch the bootstrap wasn't working, so the maven ant tasks will now igore trying to download the projects we
  are actually trying to build.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@684975 13f79535-47bb-0310-9956-ffa450edef68
2008-08-11 23:05:20 +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
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
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
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
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
Milos Kleint 12a125bcad report plugin map flushing shall be synchronized to prevent NPEs in multithreaded envs.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@650807 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 09:28:58 +00:00
Milos Kleint 02367233e1 getKey() is used many-many-many times when loading projects. it's ineffective to construct the key each time.
Ideally the cached key would get reste when groupId or artifactId gets set, I didn't figure how to do it in modello though..

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@650427 13f79535-47bb-0310-9956-ffa450edef68
2008-04-22 09:27:45 +00:00
Herve Boutemy 007fe63a03 added site descriptors to provide modules/parent links (merged from 2.0.x branch r649903)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@649913 13f79535-47bb-0310-9956-ffa450edef68
2008-04-20 11:37:31 +00:00
Milos Kleint 30ea33aefb MEVENIDE-618 synchronize the flushPluginMap and getPluginsAsMap to prevent NPEs in multi thread access.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@643878 13f79535-47bb-0310-9956-ffa450edef68
2008-04-02 12:40:13 +00:00
Dennis Lundberg 6e544a5643 o Merge r611419.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@611425 13f79535-47bb-0310-9956-ffa450edef68
2008-01-12 14:36:33 +00:00
Vincent Siveton 315b258a33 o merged r608896 (MNG-3335: Improvement to "resource" / "targetPath" element in pom.xml)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@608897 13f79535-47bb-0310-9956-ffa450edef68
2008-01-04 15:52:20 +00:00
Carlos Sanchez Gonzalez b63e25a47a [MNG-3240] maven-model RepositoryBase.equals() causes ClassCastException
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@586533 13f79535-47bb-0310-9956-ffa450edef68
2007-10-19 16:52:49 +00:00
Jason van Zyl 3979ed47d3 o removing jdom from the core for the embedder and we will soon have a different tool for writing out POMs, trying to slim
down the core


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@586044 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 18:05:59 +00:00
Jason van Zyl 6db368df4e MNG-1849 Fix Extension.hashCode() throwing NPE if groupId or artifactId is null
Submitted by: David Hawkins



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543381 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 03:47:31 +00:00
Vincent Siveton b88762449b merged r541152 from branch (MNG-2461: Write JavaDoc documentation)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@541153 13f79535-47bb-0310-9956-ffa450edef68
2007-05-24 04:17:41 +00:00
Vincent Siveton cbe352c888 o merged r541141 from branch (reformat before working on MNG-2461)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@541142 13f79535-47bb-0310-9956-ffa450edef68
2007-05-24 02:44:59 +00:00