Commit Graph

488 Commits

Author SHA1 Message Date
Olivier Lamy 790169b9a5 [maven-release-plugin] prepare release maven-3.0.4
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1208998 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:43:14 +00:00
Olivier Lamy 1fe4016cf1 vote cancelled back to 3.0.4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1207843 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 12:09:14 +00:00
Olivier Lamy 272c17979b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1206076 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 08:15:06 +00:00
Olivier Lamy 6d375983a4 [maven-release-plugin] prepare release maven-3.0.4
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1206073 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 08:14:04 +00:00
Herve Boutemy 5b544d3105 fixed elements order of parent: groupId, artifactId, version
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1187777 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 20:53:40 +00:00
Herve Boutemy 3944b81734 updated title of introduction pages
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1164922 13f79535-47bb-0310-9956-ffa450edef68
2011-09-03 20:02:14 +00:00
Benjamin Bentmann decce3a120 [MNG-5153] ModelMerger omits relativ path
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1156671 13f79535-47bb-0310-9956-ffa450edef68
2011-08-11 16:45:55 +00:00
Herve Boutemy ceac25c39b added description for every module
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1148953 13f79535-47bb-0310-9956-ffa450edef68
2011-07-20 22:10:09 +00:00
Herve Boutemy 116dc7c7a6 [MNG-5108] added combine.children and combine.self attributes information in model descriptor documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1142230 13f79535-47bb-0310-9956-ffa450edef68
2011-07-02 14:28:18 +00:00
Herve Boutemy 69bbf28ea4 updated javadoc since some classes are provided in this package by other modules
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1140290 13f79535-47bb-0310-9956-ffa450edef68
2011-06-27 19:42:39 +00:00
Herve Boutemy 799d63bf87 [MNG-5119] added Javadocs and JXR links in left menu for every module to give easy access to code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1137154 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 10:00:46 +00:00
Herve Boutemy e777f5d5ab improved documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1134989 13f79535-47bb-0310-9956-ffa450edef68
2011-06-12 21:42:48 +00:00
Benjamin Bentmann e2ad36018b [MNG-5046] Remove $Id$ from sources
Submitted by: Jesse Glick

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1084807 13f79535-47bb-0310-9956-ffa450edef68
2011-03-23 23:30:11 +00:00
Benjamin Bentmann 5460ff9559 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1075438 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 17:26:44 +00:00
Benjamin Bentmann 98924fcc17 [maven-release-plugin] prepare release maven-3.0.3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1075436 13f79535-47bb-0310-9956-ffa450edef68
2011-02-28 17:25:08 +00:00
Benjamin Bentmann 2986a12cba [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1074306 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 21:31:36 +00:00
Benjamin Bentmann 435da1600e [maven-release-plugin] prepare release maven-3.0.3-RC1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1074303 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 21:29:33 +00:00
Benjamin Bentmann 39e9e35c3d o Extended API docs
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1073829 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 17:06:41 +00:00
Benjamin Bentmann 88349565ec o Improved location tracking
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1072163 13f79535-47bb-0310-9956-ffa450edef68
2011-02-18 21:47:54 +00:00
Benjamin Bentmann 45d1e985aa o Unified inheritance hierarchy of POM model classes
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1059189 13f79535-47bb-0310-9956-ffa450edef68
2011-01-14 22:33:29 +00:00
Benjamin Bentmann 8e60779cbb [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1056850 13f79535-47bb-0310-9956-ffa450edef68
2011-01-09 00:49:39 +00:00
Benjamin Bentmann 0023226958 [maven-release-plugin] prepare release maven-3.0.2
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1056847 13f79535-47bb-0310-9956-ffa450edef68
2011-01-09 00:48:15 +00:00
Benjamin Bentmann 499e2d7ee7 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1055634 13f79535-47bb-0310-9956-ffa450edef68
2011-01-05 20:42:41 +00:00
Benjamin Bentmann c4f1c5ca4d [maven-release-plugin] prepare release maven-3.0.2-RC1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1055631 13f79535-47bb-0310-9956-ffa450edef68
2011-01-05 20:40:50 +00:00
Benjamin Bentmann f19569365b [MNG-4945] Remove mergeId from public POM
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1050721 13f79535-47bb-0310-9956-ffa450edef68
2010-12-18 21:37:43 +00:00
Benjamin Bentmann cb00f26998 o Fixed target version for code segments
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1041652 13f79535-47bb-0310-9956-ffa450edef68
2010-12-02 23:48:54 +00:00
Benjamin Bentmann d79293e61e o Added toString() for InputLocation and InputSource to ease debugging
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1041649 13f79535-47bb-0310-9956-ffa450edef68
2010-12-02 23:43:47 +00:00
Benjamin Bentmann fb52cac08b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1038046 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23 10:47:01 +00:00
Benjamin Bentmann 308d4d45e5 [maven-release-plugin] prepare release maven-3.0.1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1038043 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23 10:44:18 +00:00
Benjamin Bentmann 7e57e9ea83 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1036683 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18 23:52:24 +00:00
Benjamin Bentmann 93af60e038 [maven-release-plugin] prepare release maven-3.0.1-RC1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1036681 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18 23:50:08 +00:00
Vincent Siveton 3c3459c44c MPIR-171: support "TimeZones" as a timezone
o improved timezone description in the M3 POM model (exactly timezone are between -12 and +14 or a valid timezone id)
o support timezone ids in the teamListReport
o added joda (ASF2.0) as dependency in MPIR
o updated faq


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1029846 13f79535-47bb-0310-9956-ffa450edef68
2010-11-01 21:27:56 +00:00
Benjamin Bentmann 03789c3155 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1004207 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 11:45:32 +00:00
Benjamin Bentmann eaf528f2ce [maven-release-plugin] prepare release maven-3.0
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1004204 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 11:43:40 +00:00
Benjamin Bentmann 388e659a17 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1001464 13f79535-47bb-0310-9956-ffa450edef68
2010-09-26 16:09:27 +00:00
Benjamin Bentmann 8f839aef4c [maven-release-plugin] prepare release maven-3.0-RC3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1001462 13f79535-47bb-0310-9956-ffa450edef68
2010-09-26 16:07:40 +00:00
Benjamin Bentmann 0707794c27 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1000118 13f79535-47bb-0310-9956-ffa450edef68
2010-09-22 18:18:54 +00:00
Benjamin Bentmann eecf91a606 [maven-release-plugin] prepare release maven-3.0-RC2
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1000115 13f79535-47bb-0310-9956-ffa450edef68
2010-09-22 18:17:16 +00:00
Benjamin Bentmann 62b1a5ffb0 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@997478 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 19:53:16 +00:00
Benjamin Bentmann 6da76b975a [maven-release-plugin] prepare release maven-3.0-RC1
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@997476 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 19:50:30 +00:00
Benjamin Bentmann 2df157de23 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@990787 13f79535-47bb-0310-9956-ffa450edef68
2010-08-30 12:36:40 +00:00
Benjamin Bentmann 546399c38d [maven-release-plugin] prepare release maven-3.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@990785 13f79535-47bb-0310-9956-ffa450edef68
2010-08-30 12:34:49 +00:00
Benjamin Bentmann e75d39f41a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@989402 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 23:13:09 +00:00
Benjamin Bentmann 26dde61f15 [maven-release-plugin] prepare release maven-3.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@989400 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 23:11:42 +00:00
Benjamin Bentmann ae04af8e05 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@989338 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 20:14:23 +00:00
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