Commit Graph

436 Commits

Author SHA1 Message Date
Stephen Connolly ec14b8ad4c curses upon you IDE for screwing up the formatting 2015-07-22 09:09:31 +01:00
Stephen Connolly 25f5143169 [MNG-5840] The fix for parent version validation caused a regression in the parent version range
- With this change we basically unwind MNG-5840 for the rumoured validation in the workspace resolver
  when dealing with a parent version range. Not ideal but only way for now to retain the version range feature
2015-07-22 08:38:05 +01:00
Karl Heinz Marbaise 15223116a6 Fixed URL's to issue tracking after transition to
Apache Software Foundation.
2015-07-19 09:53:50 +02:00
sugartxy 7f206ef1cc try-with-resources
Reformatted to code style by me. This fixes #53
2015-06-20 14:32:46 +02:00
Kristian Rosenvold 7badeb5b5b Upgraded to java7 language features 2015-06-20 10:56:07 +02:00
Stephen Connolly 40d5087b6b [FIXES MNG-5840] if the pom.xml at <relativePath> is the same groupId:artifactId but different version fall back to the repository for parent resolution 2015-06-05 11:26:13 +01:00
Jason van Zyl be3fb20032 MNG-5775 Make the project graph building code pluggable to allow for new/different implementations. 2015-03-01 12:39:30 -08:00
Joseph Walton b8dcb08731 MNG-5734: Fail, rather than just warning, on empty '<module>' entries.
An incorrect non-blank module is currently treated as an error. Behave
the same way for a blank module, rather than simply warning about
the mistake.

Signed-off-by: Jason van Zyl <jason@tesla.io>
2015-02-21 09:22:27 -05:00
Robert Scholte 786285f1f4 Add @Override on matching methods 2015-01-24 20:45:25 +01:00
Hervé Boutemy d37fbf6011 improve model building documentation 2014-12-26 18:06:02 +01:00
Robert Scholte df21509310 Fix violations reported by checkstyle 2014-12-23 16:49:26 +01:00
Robert Scholte a7ef70181c [MNG-5740]: Add module maven-builder-support
Move Source-code to maven-builder-support and let original classes extend these
2014-12-23 14:09:01 +01:00
Igor Fedorenko 8788c90abe allow custom Model dependency version validation rules
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2014-11-25 19:11:01 -05:00
Michael Osipov 0343c52601 Trimmed trailing whitespace 2014-11-23 13:04:30 +01:00
Hervé Boutemy 366f57c563 updated parent pom (and fixed issues...) 2014-10-24 01:25:49 +02:00
brianf 9216191869 default to ssl for central 2014-08-11 08:41:48 -04:00
markdingram 61c3740425 Fixes MNG-5663 - a regression introduced in 3.2.2 by MNG-5639 that prevents nested import POMs from resolving their dependencies.
The cuplrit was the resetRepositories method in tandem with the repository
list instances being shared between ModelResolvers.

- The copy constructor for the ModelResolvers now creates new lists.
- The resetRepositories method has been removed. Instead there is a
'replace' parameter on the addRepository method that allows the
desired parameter replacement of MNG-5639 to take place.

Signed-off-by: Jason van Zyl <jason@tesla.io>
2014-07-18 19:30:32 -04:00
Hervé Boutemy ffff00e908 fixed errors reported by Checkstyle 2014-06-16 18:30:24 +02:00
Michael Osipov e9e8a20907 Modified index.apt to reflect output changes from MNG-5176. 2014-06-15 21:03:46 +02:00
Michael Osipov cdb8ad6dd1 [MNG-5647] ${maven.build.timestamp} uses incorrect ISO datetime
separator

- Fully utilize extended ISO timestamp
- Added changes to index.apt
2014-06-15 21:01:55 +02:00
Christian Schulte 045bd1503b MNG-2199: Version ranges not supported for parent artifacts
Fixes #21
Signed-off-by: Jason van Zyl <jason@tesla.io>
2014-06-14 16:47:00 -04:00
Hervé Boutemy 6683e8681f code formatting 2014-06-14 00:08:07 +02:00
Jason van Zyl 2a4d172600 MNG-5452: ${maven.build.timestamp} should use UTC instead of local timezone (or be configurable) 2014-06-13 10:25:37 -04:00
Mysterion c6529932f9 Add solution to http://jira.codehaus.org/browse/MNG-4565
Signed-off-by: Jason van Zyl <jason@tesla.io>
2014-06-10 16:46:10 -04:00
Mark Ingram 016932edbc MNG-5639: Support resolution of Import Scope POMs from Repo that contains a ${parameter}
Fix up previous

Signed-off-by: Jason van Zyl <jason@tesla.io>
2014-06-10 08:55:24 -04:00
Hervé Boutemy 6d05ac1adc added raw model validation step 2014-04-19 21:25:34 +02:00
Hervé Boutemy 8e53ed0f65 disable interpolation on full profile activation, not only file based 2014-03-31 21:44:47 +02:00
Hervé Boutemy c175789747 [MNG-5612] avoid fully interpolated values for file based profile
activation values but effective values calculated during activation
2014-03-30 23:46:03 +02:00
Hervé Boutemy fb27b79250 make warning for ${project.basedir} and ${project.*} different: first
should be replaced with ${basedir}, latter is simply not supported
2014-03-30 10:27:44 +02:00
Robert Scholte 06a7d6dd8b MNG-5608: warn if file-based profile activation uses ${project.basedir} since only ${basedir} is supported 2014-03-29 14:36:14 +01:00
Hervé Boutemy a74893f246 improved documentation: ${basedir} for profile activation is Maven 3
only
2014-03-28 08:20:51 +01:00
Hervé Boutemy 64c4195067 [MNG-5608] added a warning on ${project.basedir} use for profile
activation
2014-03-23 19:58:26 +01:00
Hervé Boutemy 3c7744a9a0 [MNG-5590] improved documentation about interpolation on file activation 2014-03-23 16:36:01 +01:00
Hervé Boutemy 4a39c02156 fixed errors reported by Checkstyle 2014-02-08 16:38:31 +01:00
Jason van Zyl 88d0abcd30 MNG-5576 Start allowing continuous delivery friendy versions 2014-02-06 21:55:10 -05:00
Robert Scholte 65c135d529 [MNG-3832] Allow wildcards in dependency exclusions
Already supported since M3.0, now adjust warnings
2013-11-21 22:17:43 +01:00
Arnaud Héritier da48cfff83 Code cleanup - Redundant array creation for calling varargs method 2013-06-11 22:27:26 +02:00
Arnaud Héritier 1f84f8f296 Code cleanup - Maven requires Java 5+ : Replace String.indexOf() by String.contains() 2013-06-11 22:19:20 +02:00
Arnaud Héritier 9e5183f0ad Code cleanup - Various code simplifications (tests, loops, …) 2013-06-11 22:09:51 +02:00
Arnaud Héritier 87a5532eb9 Code cleanup - Remove useless semi-colons 2013-06-11 22:04:29 +02:00
Arnaud Héritier 96db1abbe9 Code cleanup - Maven requires Java 5+ : Remove unnecessary boxing 2013-06-11 21:43:53 +02:00
Stephen Connolly c6c6bdc49f Add ASL license header 2013-05-28 10:19:32 +01:00
Hervé Boutemy f34b4fbdfc [MNG-5477] finally removed reporting plugin version validation since a
warning is issued in maven-site-plugin in case of missing version. Then
removed reporting plugin version injection too
2013-05-23 18:54:08 +02:00
Hervé Boutemy 4db66fd06c [MNG-5477] inject pluginManagement and build plugins versions into
report plugins to avoid validation warnings
2013-05-21 00:17:25 +02:00
Hervé Boutemy ed1501ecb5 [MNG-5477] check warning issued when no version in reporting section 2013-05-20 23:10:31 +02:00
Hervé Boutemy 7d359445d1 [MSITE-484] reporting section cannot be deprecated in Maven core for the
moment
2013-05-18 12:16:51 +02:00
Hervé Boutemy 9404499ccd maven-dependency-plugin 2.8 released, now compatible with Eclipse Aether 2013-05-18 08:34:42 +02:00
Hervé Boutemy 42962fa281 code formatting 2013-03-30 09:37:11 +01:00
Hervé Boutemy e438f1140e added information about encoding configuration 2013-03-19 01:21:13 +01:00
Igor Fedorenko 9b58a3cfdc MNG-5444 fixed building MavenProject from ModelSource
To maintain compatibility with (the extremely unlikely) existing
implementations of ModelSource, the new API methods are provided
via optional ModelSource2 interface. Updated javadoc to encourage
use of the new API.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
2013-03-03 22:03:50 -05:00
Hervé Boutemy ef06aab96d updated ${maven.build.version} example to show the actual git format 2013-03-03 09:43:05 +01:00
olivier lamy 2f97f96fb1 [MNG-5418] Can't activate a profile by checking for the presence of a file in ${myProperty}. 2013-01-24 22:58:39 +01:00
Anders Hammar 77b12f962d Fixed incorrect Maven property example.
Signed-off-by: Anders Hammar <anders@hammar.net>
2013-01-07 11:35:57 +01:00
Hervé Boutemy 89c2524458 ${basedir} is deprecated 2013-01-05 10:29:49 +01:00
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
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
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
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
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
Herve Boutemy 01c2784694 refactored code to ease understanding: extracted methods interpolate<type>Field
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172001 13f79535-47bb-0310-9956-ffa450edef68
2011-09-17 15:04:59 +00:00
Herve Boutemy 1b66b83732 fixed file snippet configuration to support DOXIA-373
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1171261 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 20:35:41 +00:00
Herve Boutemy 4c172dde45 added super-POM reference documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1169965 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 22:21:37 +00:00
Herve Boutemy 872db6267c added documentation on model interpolation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1167649 13f79535-47bb-0310-9956-ffa450edef68
2011-09-10 23:37:57 +00:00
Herve Boutemy b3cd20f126 [MNG-3124] test mailing-list inheritance behaviour
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1165008 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 12:44:39 +00:00
Benjamin Bentmann b0b09940c1 [MNG-5164] Odd <name> of central in superpom
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1164995 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 11:19:31 +00:00
Herve Boutemy 4abb2ac9ab added an introduction to model building steps
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1164921 13f79535-47bb-0310-9956-ffa450edef68
2011-09-03 19:58:05 +00:00
Herve Boutemy fce3462788 fixed errors reported by Checkstyle
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1164912 13f79535-47bb-0310-9956-ffa450edef68
2011-09-03 19:13:12 +00:00
Herve Boutemy a70bfbd89b [MNG-5155] 'inherited' flag of report sets ignored: added unit test
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1163244 13f79535-47bb-0310-9956-ffa450edef68
2011-08-30 14:56:39 +00:00
Herve Boutemy 04f26a7ac8 added plugin configuration inheritance test, particularly combine.children and combine.self attributes
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1161299 13f79535-47bb-0310-9956-ffa450edef68
2011-08-24 21:57:33 +00:00
Herve Boutemy 403d12c51c [MNG-5151] use proper CNAME (continued from r1155270)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1160922 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 23:02:20 +00:00
Herve Boutemy 7da0995250 code formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1160900 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 22:07:44 +00:00
Herve Boutemy 85da703d29 code formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1160072 13f79535-47bb-0310-9956-ffa450edef68
2011-08-21 22:02:29 +00:00