17e0405ef7
o Added toString() to ease debugging
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780639 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 13:15:12 +00:00
26a35db0c7
o Introduced ModelBuilder component that now hosts most of the logic from the project builder to construct the effective model. With maven-model-builder we now should have a rather slim module that tools can re-use for building models. The project builder is simply layered on top of the model builder.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780627 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 12:17:53 +00:00
89d7b13fd6
o Extended model with fields to track source file and project directory
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778494 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 20:43:01 +00:00
420d44adf6
o Fixed POM (the Site Plugin is a build plugin, not a reporting plugin)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778487 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 20:04:15 +00:00
d8c4c800e7
o Added constants for well-known profile sources
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777958 13f79535-47bb-0310-9956-ffa450edef68
2009-05-23 16:38:36 +00:00
129bcf0e1d
o Extended model merger
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773688 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:53:25 +00:00
f48503a610
o Moved injection of plugin/dependency management into isolated component and decoupled from processors. The new component resembles the ModelDefaultsInjector from 2.x but explicitly focuses on management information. Other defaults like the lifecycle induced plugins should be handled by another component.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773323 13f79535-47bb-0310-9956-ffa450edef68
2009-05-10 10:46:05 +00:00
1e303faceb
o Changed boolean field to String to enable both filtering and three-valued logic for proper merging
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773283 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 22:58:36 +00:00
a5cd3ceb08
o Added boolean accessors for inherited field of plugin execution
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773198 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 10:47:59 +00:00
ed79ce0099
o Fixed toString() to not return null
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773023 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 15:02:05 +00:00
49f72c75e4
o Added some more toString()'s to ease debugging
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773011 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 14:35:17 +00:00
c17cfb0076
o Continued work on model merging
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772980 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 13:31:32 +00:00
51c1cb584c
o Re-introduced 2.x like inheritance assembler and profile injector components which mostly delegate to a common model merger class. First of all, the merger only deals with two models at a time, simplifying its logic compared to the current processors, hopefully allowing us to quickly/easily fix the outstanding POM tests. The ultimate goal is to generate the basic ModelMerger automatically with a new Modello plugin which could be programatically customized via a sub class like MavenModelMerger. It will be interesting to find out how much of the merging rules could be generalized via declarative options in the model. This could allow for generated documentation about how inheritance and profile injection alter the model. Last but not least, generating the merger from the MDO would ease addition of new model elements as these would automatically be considered for inheritance and profile injection.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772827 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 01:28:10 +00:00
6b9ddf7bec
o Fixed typo and restored proper default value
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772760 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 20:10:38 +00:00
1e26baf0a1
o Changed boolean fiels to String to enable both filtering and three-valued logic for proper merging
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772758 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 20:06:41 +00:00
9ac26fc3a2
o Restored original default value for enabled flag of repository
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771316 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 14:28:27 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Benjamin Bentmann
Jason van Zyl
Herve Boutemy
Britton Isbell
Vincent Siveton
John Dennis Casey
Brett Leslie Porter