Commit Graph

397 Commits

Author SHA1 Message Date
Hervé Boutemy 915b1553f2 changed MavenModelMerger extensions visibility to protected to improve
documentation
2012-12-15 21:12:22 +01:00
Hervé Boutemy a07fdf076c improved javadoc 2012-12-15 21:06:57 +01:00
Hervé Boutemy 950b9b3c58 added more pointers to sources 2012-12-15 11:14:31 +01:00
Hervé Boutemy 38e3de00cb javadoc formatting 2012-12-15 10:56:15 +01:00
Jason van Zyl 73e1445987 [maven-release-plugin] prepare for next development iteration 2012-12-03 19:58:46 -08:00
Jason van Zyl 618d12906d [maven-release-plugin] prepare release maven-3.1.0 2012-12-03 19:58:40 -08:00
Hervé Boutemy b63904c9db fixed errors reported by Checkstyle (once again...) 2012-12-03 02:21:58 +01:00
rfscholte 327e1b7e80 [MNG-5400] Upgrade version of maven-dependency-plugin in superpom to 2.5 2012-12-02 00:02:13 +01:00
rfscholte dbef526ede [MNG-5398] scriptSourceDirectory in superpom is not prefixed with
${project.basedir}/ 
(now with the right expression)
2012-12-01 23:55:16 +01:00
rfscholte e052ebaa7b [MNG-5399] Upgrade version of maven-release-plugin in superpom 2012-12-01 23:22:28 +01:00
rfscholte df162a5a35 [MNG-5398] scriptSourceDirectory in superpom is not prefixed with
${project.basedir}/
2012-12-01 23:20:55 +01:00
Jason van Zyl fcffe3c9d5 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413481 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 05:07:28 +00:00
Jason van Zyl 29c9b29f68 [maven-release-plugin] prepare release maven-3.1.0
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413479 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 05:07:15 +00:00
Jason van Zyl b5f1798f2d - revert the release as we're missing MNG-5381
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413389 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 19:07:27 +00:00
Jason van Zyl 84b15b971b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413381 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 17:59:53 +00:00
Jason van Zyl 7815ab87ad [maven-release-plugin] prepare release maven-3.1.0
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413379 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 17:59:36 +00:00
Herve Boutemy ca584199a5 removed stdout output
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412263 13f79535-47bb-0310-9956-ffa450edef68
2012-11-21 20:00:50 +00:00
Herve Boutemy 6417401054 [MNG-5380] check that whitespace can be preserved in Maven plugin configuration when reading pom (still need to check if content is not trimmed when injected into plugin)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412261 13f79535-47bb-0310-9956-ffa450edef68
2012-11-21 19:59:14 +00:00
Herve Boutemy 4ee13a8a0a added link to profile activators
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1403795 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 17:32:35 +00:00
Herve Boutemy 970035aba4 improved javadoc: added link to model used
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1403794 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 17:30:02 +00:00
Herve Boutemy 0cb1d89974 removed unused import
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1403793 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 17:25:42 +00:00
Herve Boutemy 622b08ef6a code simplification
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1403786 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 17:20:14 +00:00
Herve Boutemy 0312cb0ff8 code formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1403658 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 10:47:30 +00:00
Herve Boutemy 49d8d172d9 next version will be 3.1 (Jira updated accordingly: 3.1 renamed to 3.2)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1395257 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 09:14:21 +00:00
Kristian Rosenvold cba6b32e6a o Changed clumsy collection interpolation into List interpolation, since it's all lists anyway.
Performs twice as fast, but you'll have to be a profiler to appreciate this subtle
performance increase.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1377020 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 18:25:16 +00:00
Kristian Rosenvold b6c679a127 o Removed unused methods/params
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1376648 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 18:55:46 +00:00
Kristian Rosenvold 100bbd031b o Optimized the cache around the hotspot in interpolation somewhat
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1376085 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 14:55:33 +00:00
Stephen Connolly 31285e3b68 [MNG-5280] Inconsistent order of repositories and pluginRepositories from profiles in settings (regression Maven 3)
Submitted by: Anders Hammar

* Applied without change

* This is the fix of the bug.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1373761 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 08:55:53 +00:00
Jason van Zyl 94fde61ad2 MNG-5313: Unnecessary DefaultModelBuilder.build overload
Submitted by: Jesse Glick


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1362735 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 01:07:15 +00:00
Jason van Zyl 1cf318c15c MNG-5314: DefaultModelValidator misuses String.matches
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1362731 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 00:55:48 +00:00
Milos Kleint 4fcfcb8f73 MNG-5306 : introduce ModelProblemCollectorRequest and a new ModelProblem property - version which denotes on which validation level the error/warning applies. Additionally move the logic on failing the ModelBuilding from ModelProblemCollector to ModelBuilder's protected method to allow overriding. Default maven behaviour should stay the same.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1357589 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 13:11:15 +00:00
Olivier Lamy 879d07b1d7 merge -r1222269:1222270 https://svn.apache.org/repos/asf/maven/maven-3/branches/maven-3.0.4-RCx
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1222272 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 15:13:10 +00:00
Olivier Lamy 85ed3a1525 bump version to 3.0.5-SNAPSHOT 3.0.4 is on release branch: feel free to hack :-) here
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1211509 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 16:22:49 +00:00
Olivier Lamy 862ff21440 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210462 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:48:51 +00:00
Olivier Lamy 11c001ba01 [maven-release-plugin] prepare release maven-3.0.4-RC3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210460 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:47:24 +00:00
Olivier Lamy 5259b7b623 back to 3.0.4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210076 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 08:46:27 +00:00
Olivier Lamy 8edd56b679 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1209001 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:44:24 +00:00
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 cc90e67fec added dependency management import step
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1185882 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 21:39:15 +00:00
Benjamin Bentmann 86197aa24a [MNG-5073] ProjectBuilder.build(File,ProjectBuildingRequest) returns null project if dependency version info is missing
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1176414 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 14:55:56 +00:00
Benjamin Bentmann a1d64e71ca [MNG-5157] NPE stemming from DefaultModelBuilder.containsCoordinates
o Revised original fix to prevent duplicate emission of error msg

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1176402 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 14:37:20 +00:00
Herve Boutemy a6b7bc895f use java 6 API docs link
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1175592 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 21:52:34 +00:00
Herve Boutemy 1214d5a7b2 added "since" information for maven.version and maven.build.version values
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1175591 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 21:50:00 +00:00
Herve Boutemy 864e18d531 |MNG-5134] moved settings.* to the end of the list since it is not even evaluated during POM interpolation, but only written here for reference
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172331 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 19:48:52 +00:00
Herve Boutemy 428b17fa4d |MNG-5134] added maven.home property
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172328 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 19:39:21 +00:00
Herve Boutemy 18ec56d4a7 |MNG-5134] moved maven.version and maven.build.version just before Java system properties since they are defined (in MavenCli.java) as system property
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172327 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 19:38:45 +00:00
Paul Gier 671f6349f5 Improvements to model interpolation docs related to available properties.
Issue id: MNG-5134


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172314 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 18:20:10 +00:00