Benjamin Bentmann
d04d6265e8
[maven-release-plugin] prepare release maven-3.0-beta-3
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@989336 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 20:12:52 +00:00
Benjamin Bentmann
ab39d82dd1
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@983204 13f79535-47bb-0310-9956-ffa450edef68
2010-08-07 10:53:09 +00:00
Benjamin Bentmann
99823b034e
[maven-release-plugin] prepare release maven-3.0-beta-2
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@983202 13f79535-47bb-0310-9956-ffa450edef68
2010-08-07 10:51:26 +00:00
Herve Boutemy
2a5fde5cac
updated Modello schema version when necessary
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@982838 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 00:12:58 +00:00
Benjamin Bentmann
2cce5d1bde
o Polished code
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@964708 13f79535-47bb-0310-9956-ffa450edef68
2010-07-16 08:18:05 +00:00
Herve Boutemy
5a6b42d721
fixed ambiguous relative links
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@961902 13f79535-47bb-0310-9956-ffa450edef68
2010-07-08 19:43:43 +00:00
Herve Boutemy
23f2095652
fixed errors reported by Checkstyle
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@958295 13f79535-47bb-0310-9956-ffa450edef68
2010-06-26 23:16:18 +00:00
Benjamin Bentmann
6e7b4226e7
[MNG-1803] Provide line number information when there are errors processing a pom.xml
...
o Merged feature branch
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@949708 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 10:24:20 +00:00
Benjamin Bentmann
f46dc2a538
o Extended documentation
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@938420 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 12:33:00 +00:00
Benjamin Bentmann
b329fdb4e5
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@935667 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 16:55:28 +00:00
Benjamin Bentmann
958b6eced1
[maven-release-plugin] prepare release maven-3.0-beta-1
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@935664 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 16:54:05 +00:00
Benjamin Bentmann
479e0dd366
o Updated documentation
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@932365 13f79535-47bb-0310-9956-ffa450edef68
2010-04-09 11:46:20 +00:00
Benjamin Bentmann
bfaab01874
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@921170 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 22:24:47 +00:00
Benjamin Bentmann
0c78c31304
[maven-release-plugin] prepare release maven-3.0-alpha-7
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@921168 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 22:24:22 +00:00
Benjamin Bentmann
767cc74a6b
[MNG-1144] List 2 or more maven goals in the <defaultGoal> of the POM
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@920469 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 19:24:24 +00:00
Herve Boutemy
58f5740f49
use modelloVersion property instead of direct version override of the plugin
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@901885 13f79535-47bb-0310-9956-ffa450edef68
2010-01-21 22:06:03 +00:00
Herve Boutemy
2b1d264d31
[MNG-4524] upgraded Modello plugin to 1.2 to use the configuration done in r900146
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@901562 13f79535-47bb-0310-9956-ffa450edef68
2010-01-21 06:36:26 +00:00
Herve Boutemy
8b03e32200
[MNG-4534] prepared POM XML elements order configuration, that will be effective when upgrading to Modello 1.2
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@900146 13f79535-47bb-0310-9956-ffa450edef68
2010-01-17 14:27:06 +00:00
Benjamin Bentmann
574641d86c
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@896381 13f79535-47bb-0310-9956-ffa450edef68
2010-01-06 10:49:23 +00:00
Benjamin Bentmann
9e8a9af6ad
[maven-release-plugin] prepare release maven-3.0-alpha-6
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@896377 13f79535-47bb-0310-9956-ffa450edef68
2010-01-06 10:46:24 +00:00
Herve Boutemy
42b849deda
[MNG-3266] make RepositoryBase override not only equals() but hashCode() too (merged from 2.2.x branch r895088)
...
Submitted by: Jared Roberts
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@895089 13f79535-47bb-0310-9956-ffa450edef68
2010-01-01 23:05:47 +00:00
Herve Boutemy
fa6330023c
reordered maven.mdo fields to better match POM Code Convention. (merged from 2.2.x branch r894080)
...
Note: remaining issues cannot easily be fixed since Model inherits from ModelBase, then any field in ModelBase appears at the end of Model (after build and profiles elements)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@894092 13f79535-47bb-0310-9956-ffa450edef68
2009-12-27 18:44:25 +00:00
Benjamin Bentmann
9adfaf82b5
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@883378 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 15:46:44 +00:00
Benjamin Bentmann
c23ce88074
[maven-release-plugin] prepare release maven-3.0-alpha-5
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@883375 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 15:45:11 +00:00
Benjamin Bentmann
8e826033a8
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@835944 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 18:02:13 +00:00
Benjamin Bentmann
f54f1ec409
[maven-release-plugin] prepare release maven-3.0-alpha-4
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@835941 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 18:00:22 +00:00
Benjamin Bentmann
c10f412029
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@834123 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 16:00:39 +00:00
Benjamin Bentmann
98ab96d19b
[maven-release-plugin] prepare release maven-3.0-alpha-3
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@834118 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 15:55:07 +00:00
Benjamin Bentmann
1ef9a7692b
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@834106 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 15:26:12 +00:00
Benjamin Bentmann
7dd84efa0e
[maven-release-plugin] prepare release maven-3.0-alpha-3
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@834104 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 15:24:06 +00:00
Benjamin Bentmann
30ef86e916
o Fixed handling of releative paths
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@830357 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 21:57:59 +00:00
Benjamin Bentmann
704b29c2d4
o Fixed validation of model version
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@817609 13f79535-47bb-0310-9956-ffa450edef68
2009-09-22 11:43:11 +00:00
Herve Boutemy
0553695bcb
added XML schema location for site.xml
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@813781 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 11:34:15 +00:00
Herve Boutemy
a1803e5a48
fixed errors reported by Checkstyle
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@813622 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 22:25:56 +00:00
Benjamin Bentmann
c249a98408
[MNG-4345] [regression] Plugin executions contributed by default lifecycle mapping execute after other plugin executions bound to the same phase
...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@812467 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 11:27:57 +00:00
Benjamin Bentmann
2b5054a347
o Updated to modello:1.1
...
o Used clone() methods generated by Modello for model cloning
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@806855 13f79535-47bb-0310-9956-ffa450edef68
2009-08-22 13:55:25 +00:00
Benjamin Bentmann
c72b9c3098
o Added Plugin.getId()
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@804374 13f79535-47bb-0310-9956-ffa450edef68
2009-08-14 21:08:23 +00:00
Benjamin Bentmann
c36b12739b
[MNG-3265] maven-model Extension.equals causes NPE when any field is uninitialized
...
o Merged from r793311
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@793319 13f79535-47bb-0310-9956-ffa450edef68
2009-07-12 10:38:22 +00:00
Benjamin Bentmann
88062f08dd
o Clarified relevance of ids
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@792073 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 08:58:02 +00:00
Benjamin Bentmann
8d6f2f1139
o Added boolean accessors
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@785641 13f79535-47bb-0310-9956-ffa450edef68
2009-06-17 14:56:19 +00:00
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
Benjamin Bentmann
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
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
Arnaud Heritier
8f3e7a6b15
[maven-scm-plugin] prepare release 3.0.2
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@532098 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 21:49:46 +00:00
Arnaud Heritier
d8e729fed2
Update doc
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@530932 13f79535-47bb-0310-9956-ffa450edef68
2007-04-20 21:50:03 +00:00
Arnaud Heritier
0683008401
Maven-modello-plugin is now bundled in maven
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@530931 13f79535-47bb-0310-9956-ffa450edef68
2007-04-20 21:48:26 +00:00
Arnaud Heritier
b34bd73955
Workaround for MODELLO-87
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@530929 13f79535-47bb-0310-9956-ffa450edef68
2007-04-20 21:47:25 +00:00
Arnaud Heritier
711638217b
~ character doesn't work to represent the user directory. We have to use a variable instead.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@526980 13f79535-47bb-0310-9956-ffa450edef68
2007-04-10 01:05:26 +00:00
Arnaud Heritier
0e4b19259d
Use user account directory instead of full path to deploy staging site
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@526975 13f79535-47bb-0310-9956-ffa450edef68
2007-04-10 00:32:56 +00:00
Arnaud Heritier
7ef8e66ff0
revert change. jdiff report can't be used with generated classes
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@526625 13f79535-47bb-0310-9956-ffa450edef68
2007-04-09 00:53:44 +00:00
Arnaud Heritier
1f17f7123c
add jdiff report
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@526624 13f79535-47bb-0310-9956-ffa450edef68
2007-04-09 00:06:17 +00:00
Arnaud Heritier
528505a662
Fix site
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@522402 13f79535-47bb-0310-9956-ffa450edef68
2007-03-26 02:02:33 +00:00
Arnaud Heritier
96e9f759ca
Update m1 build and generates the schema with the good namespace
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@522393 13f79535-47bb-0310-9956-ffa450edef68
2007-03-26 00:58:18 +00:00
Arnaud Heritier
ea6d67bf0d
Add namespace for maven 2
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@522392 13f79535-47bb-0310-9956-ffa450edef68
2007-03-26 00:57:21 +00:00
Arnaud Heritier
dd48e05bb0
use jar:install as default goal.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@521492 13f79535-47bb-0310-9956-ffa450edef68
2007-03-22 22:05:00 +00:00
Jason van Zyl
6ebfdbd83e
updating license headers
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513030 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 22:50:48 +00:00
Jason van Zyl
e93a9199d3
MNG-2846 Make the output of Model.getId() nicer
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@511339 13f79535-47bb-0310-9956-ffa450edef68
2007-02-24 20:32:36 +00:00
John Dennis Casey
086c589776
Adding default profile-id's.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@509744 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 20:51:15 +00:00
Vincent Siveton
14a8e1f5a4
MNG-967: maven.mdo, settings.mdo, and generated-sources
...
Merged from: r498608 (maven-2.0.x)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@498611 13f79535-47bb-0310-9956-ffa450edef68
2007-01-22 13:30:58 +00:00
John Dennis Casey
dfc4a10c68
Adding the notion of a build-context, and several build-context classes that can be used: ProjectBuildContext, which contains lineage and current-project info, ExecutionBuildContext, which contains the information in the original MavenExecutionRequest, and SystemBuildContext, which contains things like System properties...these use the BuildContextManager to store and retrieve their info from the core container's Context object.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497911 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 19:15:18 +00:00
Dennis Lundberg
f2201fc1be
o Fix typos in descriptions.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@496152 13f79535-47bb-0310-9956-ffa450edef68
2007-01-14 21:10:03 +00:00
Arnaud Heritier
9c95a9e5b5
Forgot to add the repository to find modello snapshots
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494686 13f79535-47bb-0310-9956-ffa450edef68
2007-01-10 02:08:07 +00:00
Arnaud Heritier
502703ae99
Update M1 build :
...
- Use the latest snapshot of modello-plugin
- Update the documentation which will be deployed here : http://maven.apache.org/maven-1.x/reference/maven-model/${pom.currentVersion}/
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494673 13f79535-47bb-0310-9956-ffa450edef68
2007-01-10 00:59:34 +00:00
Jason van Zyl
72e7a4df53
o lining up all the uses of modello and using 1.0-alpha-13 of the modello plugin everywhere
...
o add the generation of a JDOMWriter for use in the embedder so that working with models doesn't
completely whack the existing XML, and allow for outputting the namespace declarations
o add a security manager to the embedder which is off by default but will barf if someone
tries to set system properties. you have to specifically turn this on because it will more then
likely break tons of code like xerces setting a system property named "version", nice.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@493811 13f79535-47bb-0310-9956-ffa450edef68
2007-01-07 19:13:33 +00:00
Arnaud Heritier
f83fa2a5f2
Fix invalid XHTML in a comment
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@490092 13f79535-47bb-0310-9956-ffa450edef68
2006-12-25 00:58:23 +00:00
Brett Leslie Porter
fecd771add
couple of corrections. There are probably more along these lines.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@483797 13f79535-47bb-0310-9956-ffa450edef68
2006-12-08 03:12:51 +00:00
Vincent Siveton
107790bcf5
o documentation improvement
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@471200 13f79535-47bb-0310-9956-ffa450edef68
2006-11-04 14:13:57 +00:00
Arnaud Heritier
5ef703dbac
MAVEN-1755 : New maven-model using dom4j as reader.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@454414 13f79535-47bb-0310-9956-ffa450edef68
2006-10-09 16:08:46 +00:00
John Dennis Casey
45d97d04d3
Adding codeSegment for object identity to Plugin class.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@425905 13f79535-47bb-0310-9956-ffa450edef68
2006-07-26 23:37:55 +00:00
John Dennis Casey
864fbd29e2
Consolidating modello plugin configuration into parent-pom within pluginManagement.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@421308 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 16:31:25 +00:00
Carlos Sanchez Gonzalez
f7a33ca068
POM cleanup, remove inherited fields, added license and xsd
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@419880 13f79535-47bb-0310-9956-ffa450edef68
2006-07-07 12:23:28 +00:00
Brett Leslie Porter
692b2c6d5a
merge r384693 from branch - fix compilation issue
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384694 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 03:48:38 +00:00
Brett Leslie Porter
c5d3edfeb9
[MNG-1479, MNG-1177, MNG-1658] update the project descriptor descriptions
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384682 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 02:41:32 +00:00
John Dennis Casey
eab65e11ad
(merged from branch revId: 379662.)
...
Original URL: http://svn.apache.org/viewcvs?rev=379662&view=rev
[MNG-2095] Adding xsd generation to site phase for modello projects.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379663 13f79535-47bb-0310-9956-ffa450edef68
2006-02-22 03:13:17 +00:00
Brett Leslie Porter
17302c0e24
[MNG-2084] correct doc
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379457 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 14:03:47 +00:00
Brett Leslie Porter
1654963403
upgrade modello
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@375443 13f79535-47bb-0310-9956-ffa450edef68
2006-02-07 01:53:48 +00:00
Emmanuel Venisse
aa91b39316
[MNG-1677] Fix SCM documentation
...
Submitted by: Dennis Lundberg
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@372496 13f79535-47bb-0310-9956-ffa450edef68
2006-01-26 10:19:04 +00:00
Carlos Sanchez Gonzalez
ea7da68e38
Improve pom annotations
...
PR: MNG-1479
Submitted By: Jeff Jensen
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@370889 13f79535-47bb-0310-9956-ffa450edef68
2006-01-20 19:25:38 +00:00
Carlos Sanchez Gonzalez
f713202732
Reverted last change committed with wrong message
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@370888 13f79535-47bb-0310-9956-ffa450edef68
2006-01-20 19:24:33 +00:00
Carlos Sanchez Gonzalez
c8f172a18e
Added classpath usage docs
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@370887 13f79535-47bb-0310-9956-ffa450edef68
2006-01-20 19:23:23 +00:00
Brett Leslie Porter
f34721ad62
correctly describe valida values for checksums
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@370209 13f79535-47bb-0310-9956-ffa450edef68
2006-01-18 18:31:39 +00:00
Brett Leslie Porter
14874b5cca
update snapshots
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@368294 13f79535-47bb-0310-9956-ffa450edef68
2006-01-12 06:47:59 +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
John Dennis Casey
187716230f
Changing the version of modello plugin to the released.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356077 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 01:02:52 +00:00
John Dennis Casey
b9c5816ba9
PR: MNG-1529
...
Added defaultValue to the reportSet's id field, value of "default". This should correct reportSet merging during inheritance assembly.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356044 13f79535-47bb-0310-9956-ffa450edef68
2005-12-11 22:25:51 +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
Emmanuel Venisse
d5eef9bdd7
Add scm url format url.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@355101 13f79535-47bb-0310-9956-ffa450edef68
2005-12-08 14:37:43 +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
ff32b5fdaf
set default to 2.0
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321000 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 04:43:19 +00:00
Brett Leslie Porter
8c8c0c6b9e
updated deps
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@315005 13f79535-47bb-0310-9956-ffa450edef68
2005-10-12 19:09:10 +00:00
Brett Leslie Porter
097005a98f
PR: MNG-1157
...
fix link
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@312867 13f79535-47bb-0310-9956-ffa450edef68
2005-10-11 12:49:21 +00:00
Brett Leslie Porter
0597d785dc
bump up the version
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307347 13f79535-47bb-0310-9956-ffa450edef68
2005-10-09 02:47:45 +00:00
Brett Leslie Porter
bb5f2044b5
PR: MNG-707
...
add alias for organisation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307338 13f79535-47bb-0310-9956-ffa450edef68
2005-10-09 01:36:57 +00:00
Brett Leslie Porter
510de4fe54
upgrade plexus utils to 1.0.4-SNAPSHOT.
...
The group ID has changed, so add a bunch of exclusions to ensure the old is not picked up
fix bugs in mboot that wasn't honoring excludes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307294 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 14:13:31 +00:00
Brett Leslie Porter
192de6841a
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293588 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 11:13:52 +00:00
Brett Leslie Porter
b4e4a1f375
[maven-release-plugin] prepare release maven-2.0-beta-3
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293584 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 11:02:48 +00:00
Brett Leslie Porter
ba94b208d7
PR: MNG-922
...
allow the disablement of timestamping snapshots, reusing the same file in the remote repo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293570 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 08:43:36 +00:00
Brett Leslie Porter
51489cd0fd
PR: MNG-956
...
allow the addition of <dependencies> inside a <plugin> element to introduce plugin specific extensions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293557 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 07:15:36 +00:00
Brett Leslie Porter
9f8c7e326a
PR: MNG-816
...
allow attachment of another jar during the build process
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293542 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 05:43:58 +00:00
John Dennis Casey
def783e4cf
Resolving: MNG-934, MNG-669
...
o Changed default value for usePluginRegistry to 'false' in settings.mdo
o Changed default value for updateInterval to 'never' in plugin-registry.mdo
o Added ActivationOS in settings.mdo, profiles.mdo, maven.mdo
o Added code to the conversion utilities for Settings and Profiles to corresponding maven-model classes for ActivationOS
o Added OS activator for profiles which allows architecture, name, family, and version (with '!' negation of any of these)
o Added ActivationFile to settings.mdo, along with conversion code in the Settings->Model conversion utility
o Added packageWithVersion configuration to the modello plugin definition in maven-settings (this is apparently required now)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293479 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 01:07:36 +00:00
John Dennis Casey
805a5952eb
Resolving: MNG-1052
...
o Added pluginManagement injection to MavenProject.addPlugin(..) so that no Plugin definition added to the project can go without having managed info injected into it.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293454 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 21:38:35 +00:00
Brett Leslie Porter
cbcc49b306
PR: MNG-644
...
allow old syntax, but ignore it
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293337 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:24:39 +00:00
Brett Leslie Porter
fa65152c43
PR: MNG-644
...
remove deprecated repository settings
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293335 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:20:49 +00:00
Brett Leslie Porter
4b6babfbf7
PR: MNG-644
...
remove deprecated goal syntax
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293332 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:13:44 +00:00
Brett Leslie Porter
85fe459856
PR: MNG-644
...
remove deprecated goal syntax
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293328 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 13:10:39 +00:00
Brett Leslie Porter
39cd577f77
remove hardcoded version
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@292934 13f79535-47bb-0310-9956-ffa450edef68
2005-10-01 07:08:22 +00:00
Brett Leslie Porter
27bc0aea4d
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291643 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 15:30:36 +00:00
Brett Leslie Porter
80c8e188b8
[maven-release-plugin] prepare release maven-2.0-beta-2
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291641 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 15:18:55 +00:00
Brett Leslie Porter
f3932e47fa
PR: MNG-947
...
add optional attribute to a dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291507 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 01:17:59 +00:00
Brett Leslie Porter
cbcf2d48e1
PR: MNG-788
...
add filtering to the build element
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290877 13f79535-47bb-0310-9956-ffa450edef68
2005-09-22 02:52:39 +00:00
Brett Leslie Porter
ec2ece5a3b
PR: MNG-902
...
add default reports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290654 13f79535-47bb-0310-9956-ffa450edef68
2005-09-21 08:40:42 +00:00
Brett Leslie Porter
ab13ed39f3
arrr! thievin' release plugin!
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@290060 13f79535-47bb-0310-9956-ffa450edef68
2005-09-19 04:18:33 +00:00
Brett Leslie Porter
06ab86cb54
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289368 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 02:57:16 +00:00
Brett Leslie Porter
5632e45815
[maven-release-plugin] prepare release maven-2.0-beta-1
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289366 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 02:50:12 +00:00
Brett Leslie Porter
d16508ce09
fix spelling mistake
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289350 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 00:23:26 +00:00
Emmanuel Venisse
5817c5298c
Add some sendOn fields in Notifier
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280560 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 14:20:59 +00:00
Kenney Westerhof
4aa55430cf
o Put modello-maven-plugin under dependencyManagement and chose version
...
1.0-alpha-5-SNAPSHOT for all so they're all the same.
o Updated modello plugin invocations in all poms to by adding execution elements
and fixing goals section to get rid of deprecated notation.
o Removed dependency on modello-core in maven-plugin-tools; it seems it
was there because maven-plugin-tools-java used StringUtils from modello -
changed that to use the plexus-utils version.
o Reversed commons-cli version back to 1.0 (brett asked me to, a few days back).
o Updated all models to use fully qualified classnames - do not assume
java.util.* is included! (it won't be anymore from modello
1.0-alpha-5-SNAPSHOT onward).
o Added some <?xml processing instructions to some models that didn't have them
- vim now recognizes these files as XML (so I get syntax highlighting :))
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280539 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 11:41:52 +00:00
Emmanuel Venisse
7af50bb584
Fix Dependency Mechanism url
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280522 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 09:14:00 +00:00
John Dennis Casey
c9b6d83c57
Resolving: MNG-835. Using activateByDefault within activation in the profile.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280476 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 03:23:16 +00:00
John Dennis Casey
6d4537dc97
Adding POM-level properties.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279572 13f79535-47bb-0310-9956-ffa450edef68
2005-09-08 15:08:57 +00:00
Brett Leslie Porter
5cbe290556
target correct JDK
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279537 13f79535-47bb-0310-9956-ffa450edef68
2005-09-08 08:32:10 +00:00
Emmanuel Venisse
86c62cc6b6
Rollback. we need to fix all pom in repo before.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279530 13f79535-47bb-0310-9956-ffa450edef68
2005-09-08 07:45:45 +00:00
Emmanuel Venisse
4956d4fff9
Remove old address field in notifier
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279525 13f79535-47bb-0310-9956-ffa450edef68
2005-09-08 07:15:59 +00:00
Brett Leslie Porter
8f02461a69
consistent property naming
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279348 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 15:33:04 +00:00
Brett Leslie Porter
983f18729a
set version to 3.0.1
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279343 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 15:30:18 +00:00
Brett Leslie Porter
399fa6672e
use tagged sandbox version
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@279341 13f79535-47bb-0310-9956-ffa450edef68
2005-09-07 15:14:59 +00:00
Brett Leslie Porter
6d3dbc96c7
PR: MNG-821
...
Submitted by: Jesse McConnell
Reviewed by: Brett Porter
Add file existence based profile activation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267429 13f79535-47bb-0310-9956-ffa450edef68
2005-09-03 06:59:07 +00:00
John Dennis Casey
8201bb9d18
Adding system scope...uses scope == 'system' and systemPath in dependency. SystemPath was chosen over mappings inside the setings.xml for scalability, heritability, and injectability (via managed deps).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@264960 13f79535-47bb-0310-9956-ffa450edef68
2005-08-31 07:39:01 +00:00
Brett Leslie Porter
7a8c848b01
PR: MNG-788
...
bring back the "filtering" attribute in resources from m1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@263841 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 07:18:35 +00:00
John Dennis Casey
4ccb9068fb
Resolving: MNG-717
...
o Dependencies don't have a default scope value, to allow DependencyManagement to set the scope if null...then, the metadata source sets the scope to 'compile' when it constructs the artifacts from deps that still have a null scope. Oh, and it will at that point back-propagate the 'compile' scope to these dependency instances, for later reference...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@240428 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 15:44:48 +00:00
Vincent Massol
0ef80f1227
Bump version to 3.0.1-SNAPSHOT for fixing MAVEN-1669 (support for new ejb-client type)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239416 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 14:36:52 +00:00
Vincent Massol
59cfb344a6
MAVEN-1669: Added support for the ejb-client type.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@239415 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 14:36:09 +00:00
John Dennis Casey
88d49cb04f
o Improving toString for Dependency in the 4.0.0 version codeSegment in maven.mdo
...
o Improving error messages for ResourceDoesNotExistException in the transformations
o Adding specificity to the dependency validation stuff, to output which dependency is offending...
o Added it1013 to show off the new dependency validation stuff.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232399 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 21:55:00 +00:00
John Dennis Casey
155c0a69a7
Resolving: MNG-686...Moving <directory/> specification from Build to BuildBase to allow profiles inline within the POM to change this setting.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232336 13f79535-47bb-0310-9956-ffa450edef68
2005-08-12 17:06:38 +00:00
Kenney Westerhof
d396f24642
o Put all m2 core dependencies (plexus-container-default and plexus-utils)
...
under dependencyManagement of m2 and maven-plugins, and removed
versions in all poms having either as a parent.
Used version 1.0.2-SNAPSHOT for plexus-utils as that was used in maven-core
and is not overridable.
o Bumped maven-archiver version to 2.0-beta-1-SNAPSHOT for maven-ear-plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227084 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 21:34:54 +00:00
Brett Leslie Porter
c897ac5f3b
add profile for building all
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@226755 13f79535-47bb-0310-9956-ffa450edef68
2005-08-01 06:39:59 +00:00
Brett Leslie Porter
231c6a7a1d
PR: MNG-615
...
implement repository confidence levels. currently updates poms daily if they are not deployed or verified
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225714 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 06:35:47 +00:00
Brett Leslie Porter
84696bc3e4
fix incorrect key construction that hosed the build
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225537 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 15:59:38 +00:00
Brett Leslie Porter
eedd050414
PR: MNG-649
...
add classifier to dependency. it becomes part of the dependency key along with type when not null
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225524 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 14:17:41 +00:00
Brett Leslie Porter
8b01ca10f7
PR: MNG-226
...
implement extension mechanism
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225463 13f79535-47bb-0310-9956-ffa450edef68
2005-07-27 06:14:20 +00:00
John Dennis Casey
31ac06f7e2
Working on: MNG-521
...
o Cleaned up output from discovery of MavenProjectBuilder instance in MavenProjectTestCase.
o Added <relativePath/> to parent in maven.mdo (default value is '../pom.xml')
o Added filesystem parent-POM search using <relativePath/>...if discovered pom doesn't match the parent specification (g🅰️ v), then it's not used - the parent is resolved - and search for ancestor POMs on disk goes no further.
NOTE: Next thing is to reactor-ize the release plugin, then MNG-521 should be implemented.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225379 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 19:45:45 +00:00
Brett Leslie Porter
e78bef0429
PR: MNG-598
...
implement ability to retrieve packaging handlers (lifecycle mappings) from extension plugins. Remove plugin mapping
metadata for the same
integration tests are in place for type handlers but commented out until implemented (41)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225263 13f79535-47bb-0310-9956-ffa450edef68
2005-07-26 09:04:32 +00:00
Brett Leslie Porter
086463b5b4
PR: MNG-456
...
allow separate snapshot and release repositories
deprecate existing snapshotPolicy and checksumPolicy in favour of updatePolicy and checksumPolicy within the <releases> and <snapshots> elements in the <repository> element.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224707 13f79535-47bb-0310-9956-ffa450edef68
2005-07-25 09:51:12 +00:00
Brett Leslie Porter
f313b209dd
logo not in 4.0.0
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@221839 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 16:02:11 +00:00
Brett Leslie Porter
6e6c12a647
general cleanup
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220319 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 13:43:45 +00:00
Brett Leslie Porter
aa59559efb
PR: MNG-507
...
implement repository relocation of an artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220220 13f79535-47bb-0310-9956-ffa450edef68
2005-07-22 00:31:44 +00:00
Brett Leslie Porter
511af3d3e2
PR: MNG-596
...
add XSD definition to m2 poms and archetypes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220079 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 13:58:42 +00:00
John Dennis Casey
99bdd48d92
Bumping plexus-utils version to 1.0.1
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219984 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 02:17:16 +00:00
Brett Leslie Porter
cbf519695c
PR: MNG-558
...
use modello alpha-4: corrected parsing
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219950 13f79535-47bb-0310-9956-ffa450edef68
2005-07-20 17:11:13 +00:00
Brett Leslie Porter
4c45989dcb
PR: MNG-404
...
add ability to have a minimum Maven version for a project build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219473 13f79535-47bb-0310-9956-ffa450edef68
2005-07-18 11:57:29 +00:00
John Dennis Casey
ca59227be1
Working on: MNG-377
...
o Added maven-plugin-mapping project to handle repository metadata that contains prefix-to-artifactId mappings for groups of plugins
o Added builder classes for plugin mappings
o Modified maven-artifact and maven-artifact-manager to handle the concept of repository metadata in addition to artifact metadata.
o Added pluginGroups section to settings.xml, new code to merge these lists of plugin groups, and a unit test to ensure that this merge is taking place properly.
o Added maven-plugin-mapping to dependencies of maven-core, along with the list of builds to be performed by mboot.
Should be ready to incorporate plugin mapping consultation into the lifecycle executor and the deploy mojo...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@209550 13f79535-47bb-0310-9956-ffa450edef68
2005-07-07 00:17:37 +00:00
Emmanuel Venisse
a029d766ce
Update all versions to beta-1-SNAPSHOT
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@202001 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 15:29:14 +00:00
John Dennis Casey
fcbc5e7d6f
Resolving: MNG-495
...
o Pressing [ENTER] at a plugin update prompt should result in the plugin being registered, as indicated by the prompt.
o Use CLI switch '--no-plugin-updates' to suppress usage of the plugin registry
o Use CLI switch '--update-plugins' to force updated/resolved plugin versions to be registered
o Neither of these has a short CLI option, since we're starting to run out of sensible char options for these types of things.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193082 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:03:10 +00:00
Brett Leslie Porter
78d46ab057
fix broken link
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191809 13f79535-47bb-0310-9956-ffa450edef68
2005-06-22 11:47:44 +00:00
John Dennis Casey
bea9eca2f6
Resolving issue: MNG-493
...
o Changed getExecutionsAsMap() in Plugin (within maven.mdo) to throw an IllegalStateException if two PluginExecutions are detected with the same id. This method should always be called during inheritance assembly...
o Changed PluginExecution's id field to have a defaultValue of 'default' within maven.mdo.
NOTE: It may be necessary to double-check the id-collision within MavenProjectBuilder, in case there is no inheritance of plugins...I'll add this, and follow this commit momentarily.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191620 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 03:57:17 +00:00
John Dennis Casey
fda77afb12
Resolving issue: MNG-339
...
o Added checksumPolicy to artifact repository construction, which meant changing all the places where the factory was called.
o Added two command-line switches (-C=strict-checksum-checking, -c=lax-checksum-checking, or warning)
o Added checksum policy to all repository definitions (profiles.mdo, settings.mdo, maven.mdo)
o Changed the maven-artifact-ant stuff to use a Repository definition with checksumPolicy added to it
NOTE: I just realized that I haven't touched the inheritance/conversion of repository stuff from profiles/settings.xml to the model. I'll do this, and commit the additional changes.
Currently, the default checksum policy is to warn, since there are still bad checksums out there that prevent bootstrapping. Once we chase these down, we can change to default-strict checking. When verifying checksums, SHA-1 is attempted first, with MD5 acting as a backup verification method. If the checksum verification fails legitimately (not related to the process of retrieving/reading the checksum file), then the verification process is repeated ONCE ONLY.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191536 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 18:53:53 +00:00
Brett Leslie Porter
53820cd3cb
update to use executions
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191381 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 03:18:43 +00:00
Brett Leslie Porter
a9f174c834
Clean up of the lifecycle executor, simplify configuration and push back into the plugin manager.
...
This fixed a couple of bugs along the way.
One change that this has brought to bear from the document is you now must specify a goal for it to be bound to the LC
(see it0008)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191285 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 13:01:26 +00:00
John Dennis Casey
fdfb9d5a2d
Changing <reporter/> to <plugin/> in the reporting section.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191266 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 04:23:20 +00:00
John Dennis Casey
60750dede2
Working on issue: MNG-469
...
o Changed <reports/> in the Model to <reporting/>, to accommodate the <reports/> inside of <reportSet/>.
o Changed the report-plugin class <plugins/> inside of <report[ing]/> to <reporters/>, which means using a new class called Reporter (this is meant to be a Plugin-like model for reports, with reportSets rather than executions...)
o Changed the MavenProject to reflect these two model changes
o Added support to the inheritance assembler to perform deep inheritance of the reporting model (complete with calculations based on the <inherit/> attributes on Reporter and ReportSet).
o Updated DoxiaMojo, Pom, and DefaultPluginVersionManager to reflect the new model classes and MavenProject methods.
This is only round one of the changes for this issue. The next step is to start binding report configuration to the plugin manager via the lifecycle executor (it will traverse the reporting section, and verifyPlugin() to enable direct calls to the report's mojo).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191239 13f79535-47bb-0310-9956-ffa450edef68
2005-06-18 00:43:00 +00:00
Emmanuel Venisse
4aeca8e8a9
Add TODO for address taf in notifiers
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190907 13f79535-47bb-0310-9956-ffa450edef68
2005-06-16 13:12:38 +00:00
John Dennis Casey
1fc7419f03
o Added <properties/> for profiles configured in the pom.xml
...
o Split ModelNormalizationUtils into two utility classes in the maven-profile and maven-settings projects, to be used for converting Profile instances from the settings.xml and profiles.xml into maven-model instances.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190344 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 04:21:27 +00:00
John Dennis Casey
d2e1f3c975
o Adding support for <executions/>, which means multiple runs of the same goal/set-of-goals with different configs.
...
o Adding @phase declarations for those mojos that seem to be part of the main build, just for completeness
o Added two ITs, to test that <executions/> doesn't mess up the normal operation, and to test multi-execution for a goal.
Should resolve: MNG-172.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190335 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 02:47:57 +00:00
John Dennis Casey
8a257be6fc
Fixed problems with merging profile-defined properties into the project, and fixed the ITs testing profile definitions in the process.
...
This should finally resolve MNG-421
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189768 13f79535-47bb-0310-9956-ffa450edef68
2005-06-09 15:53:31 +00:00
John Dennis Casey
30b1434723
Resolving: MNG-421
...
o External profiles (from settings.xml, profiles.xml) are now available before the main MavenProject is constructed, which allows repositories defined in external profiles to be used to resolve project parents and dependencies.
NOTE: I need to double-check whether the profile-defined repos are actually used to resolve the parent project(s)...there may be another commit following on the heels of this one.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189667 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 23:34:35 +00:00
John Dennis Casey
921d4ced59
o Started maven-projecthelp-plugin to help with build analysis (this helped me to visualize profile stuff)
...
current goals:
projecthelp:active-profiles
projecthelp:effective-pom
o Added source attribute to the Profile model class in maven-model, along with code in the normalization utilities (converters from profiles.xml and settings.xml models to maven-model instances) to identify the source of a particular profile.
o Added a activeProfiles cache of the Profiles in effect for the current project, on the MavenProject class
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189612 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 17:54:11 +00:00
Brett Leslie Porter
b1ed3d90a6
update modello plugin
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189526 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 05:22:30 +00:00
John Dennis Casey
a58b76e2e4
Adding profiles.xml and settings.xml support for profiles, along with integration tests for each.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189510 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 03:27:43 +00:00
John Dennis Casey
29878afcc6
o pom-level profiles are working now
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189464 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 22:36:44 +00:00
Brett Leslie Porter
d6d65fc75a
add quick support for exclusions
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188779 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 14:22:38 +00:00
Brett Leslie Porter
420d9a5fca
remove old cvs ignore files
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@188697 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 05:24:51 +00:00
Brett Leslie Porter
63ee875b13
improved descriptions
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@180238 13f79535-47bb-0310-9956-ffa450edef68
2005-06-06 06:18:45 +00:00
Brett Leslie Porter
57642d207a
forgot CDATA
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179699 13f79535-47bb-0310-9956-ffa450edef68
2005-06-03 02:24:03 +00:00
Brett Leslie Porter
1a962903da
add a link to the better description
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179692 13f79535-47bb-0310-9956-ffa450edef68
2005-06-03 01:18:35 +00:00
Brett Leslie Porter
83b6e17c2d
cut release
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179552 13f79535-47bb-0310-9956-ffa450edef68
2005-06-02 07:53:09 +00:00
Brett Leslie Porter
347d361a77
generate both so it can be used in maven 1.0 as well
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179541 13f79535-47bb-0310-9956-ffa450edef68
2005-06-02 07:17:52 +00:00
Brett Leslie Porter
1af2ee3f6d
reduce what is in <build> in a profile according to John's previous change
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179496 13f79535-47bb-0310-9956-ffa450edef68
2005-06-02 03:29:34 +00:00
Brett Leslie Porter
112fccd46e
o refactor common elements to a base class
...
o fix some typos in versions related to profiles
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179493 13f79535-47bb-0310-9956-ffa450edef68
2005-06-02 03:01:16 +00:00
John Dennis Casey
9d7e54c042
o Added model and builder support for Profiles specified in settings.xml, profiles.xml, and the POM.
...
o Changed MBoot and Verifier accordingly.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179233 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 16:24:34 +00:00
Emmanuel Venisse
4e6b33d359
o upgrade plexus-container to alpha-4-SNAPSHOT
...
o upgrade plexus-utils to alpha-3 until xpp stuff is fix in 1.0.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179122 13f79535-47bb-0310-9956-ffa450edef68
2005-05-30 18:24:32 +00:00
John Dennis Casey
fda1ed95c9
o changed the inheritanceApplied flag to be set by default, and unset if the plugin is merged to the child without <inherit/> being specified...this makes it work with isolated POMs.
...
o changed the semantics of when the unsetInheritanceApplied() method is called...it's now only when <inherit/> is NOT set.
o changed the default inheritByDefault attribute on MojoDescriptor to be true
o added inheritByDefault to PluginDescriptor (even though we don't have tools supporting it yet), with semantics identical to MojoDescriptor
o added generator/builder support for the inheritByDefault attribute of PluginDescriptor
o added calculation of inheritanceApplied || inheritByDefault to lifecycle executor before allowing plugins/mojos to bind.
o Everything builds, but we need some sort of IT to test the finer points.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178836 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 23:05:09 +00:00
John Dennis Casey
6ca4de295d
Added inheritance of Plugins according to the rules we decided upon. This consists of:
...
- inheritanceApplied flag on Plugin and Goal (NOT fields, just a code-only flag)
- flushGoalMap/flushPluginMap to clear caching of these calculated attributes
- ModelUtils.mergePluginLists() and ModelUtils.mergePluginDefinitions() for use in both
* DefaultModelInheritanceAssembler (Plugin/PluginManagement lists)
* DefaultModelDefaultsInjector (PluginManagement -> Plugin merges)
- Also added a few unit tests for basic Plugin inheritance stuff. This could be more thoroughly tested...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178825 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 21:47:12 +00:00
John Dennis Casey
239439bb04
o Added inherited field to the Plugin and Goal classes in maven.mdo
...
o Added annotation inheritedByDefault (looks like: @inheritedByDefault true|false) for java mojos
o Added support for inheritedByDefault to MojoDescriptor, descriptor generator and builder
o Factored the plugin combinatorial logic into ModelUtils in o.a.m.project, for later reuse in a plugin-aware model inheritance builder
o Refactored the DefaultModelDefaultsInjector to use the new ModelUtils for plugin merging (this is factored into a utility for reuse in inheritance assembly)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178733 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 03:27:55 +00:00
Brett Leslie Porter
fd49b1e857
remove default excludes, the directory scanner has it built in
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178571 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 03:08:27 +00:00