Commit Graph

632 Commits

Author SHA1 Message Date
Benjamin Bentmann e49d091bc4 [MNG-5157] NPE stemming from DefaultModelBuilder.containsCoordinates
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1158623 13f79535-47bb-0310-9956-ffa450edef68
2011-08-17 11:02:03 +00:00
Mark Struberg b76d7bb39a MNG-5151 use proper CNAME
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1155270 13f79535-47bb-0310-9956-ffa450edef68
2011-08-09 09:04:49 +00:00
Benjamin Bentmann e7f78f4cae o Improved POM location tracking
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1151430 13f79535-47bb-0310-9956-ffa450edef68
2011-07-27 11:22:07 +00:00
Benjamin Bentmann f8ca95ef39 [MNG-5113] NullPointerException on javadoc site generation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1151420 13f79535-47bb-0310-9956-ffa450edef68
2011-07-27 10:36:18 +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 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
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 a8ce74df45 [MNG-5000] [regression] child distributionManagment.site.url not correct in a flat directory layout when child's artifactId doesn't match its module name
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1072613 13f79535-47bb-0310-9956-ffa450edef68
2011-02-20 15:34:42 +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 7403318f91 [MNG-4975] [regression] plugin executions injected from profile run before instead of after existing executions in the POM
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1059192 13f79535-47bb-0310-9956-ffa450edef68
2011-01-14 22:40:53 +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 e45d82e196 [MNG-4966] Preserve double slashes in the scm connection url - identifies absolute repository paths for mercurial
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1056720 13f79535-47bb-0310-9956-ffa450edef68
2011-01-08 14:46:27 +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 be26167029 [MNG-4957] Emit validation warning when project version uses irregular SNAPSHOT version string
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1054743 13f79535-47bb-0310-9956-ffa450edef68
2011-01-03 20:45:41 +00:00
Benjamin Bentmann 32dd64f76e [MNG-4953] Issue a warning when a system-scope dependency refers to the project basedir
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1053111 13f79535-47bb-0310-9956-ffa450edef68
2010-12-27 17:19:32 +00:00
Benjamin Bentmann 142b1ed1e9 o Properly tracked input source location for all types of model sources
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1041651 13f79535-47bb-0310-9956-ffa450edef68
2010-12-02 23:47:21 +00:00
Benjamin Bentmann 1c3abfba3b [MNG-4915] Versions in pom.xml are not checked for invalid characters
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1038838 13f79535-47bb-0310-9956-ffa450edef68
2010-11-24 21:36:06 +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 c00f454a9b [MNG-4909] Emit warning when dependency with scope import but inproper type is declared
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1037689 13f79535-47bb-0310-9956-ffa450edef68
2010-11-22 12:17:29 +00:00
Benjamin Bentmann a702225a31 [MNG-4907] Wrong error message when relativePath wrong
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1037475 13f79535-47bb-0310-9956-ffa450edef68
2010-11-21 15:20:54 +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
Benjamin Bentmann 11bae42268 o Set svn:keywords
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1028881 13f79535-47bb-0310-9956-ffa450edef68
2010-10-29 19:05:52 +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 069a4a7985 o Improved error message in case of dependency resolution
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1002574 13f79535-47bb-0310-9956-ffa450edef68
2010-09-29 10:43:56 +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 3fca2bb2d6 [MNG-4837] Interpolation error due to cyclic expression for one of the POM coordinates gets needlessly repeated
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1000601 13f79535-47bb-0310-9956-ffa450edef68
2010-09-23 20:05:09 +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 1be90a985a [MNG-4825] Relative path errors could be more explicit
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@998850 13f79535-47bb-0310-9956-ffa450edef68
2010-09-20 09:40:51 +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 a7c10dcb30 [MNG-4793] Unable to obtain archiver for extension 'zip'
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@997467 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 19:23:59 +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 44c35b0510 [MNG-4749] Move from Plexus to Guice as IoC container
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@988484 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 11:18:30 +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
Benjamin Bentmann 33a81408e1 o Fixed javadoc
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@983198 13f79535-47bb-0310-9956-ffa450edef68
2010-08-07 10:29:09 +00:00
Benjamin Bentmann 97bf1f10bc [MNG-4744] Validate coordinates of dependency exclusions
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@980725 13f79535-47bb-0310-9956-ffa450edef68
2010-07-30 10:41:52 +00:00
Benjamin Bentmann d7ae6ad6c1 o Removed unused imports
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@965982 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 20:12:30 +00:00
Benjamin Bentmann ce6ae6e8cf o Completed manual wiring
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@965431 13f79535-47bb-0310-9956-ffa450edef68
2010-07-19 11:23:52 +00:00
Benjamin Bentmann 85ef559859 [MNG-4717] Repository Ids containing ":" will lead to checksum errors on Windows machines
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@965233 13f79535-47bb-0310-9956-ffa450edef68
2010-07-18 14:23:06 +00:00
Benjamin Bentmann 260867adc2 [MNG-4732] Version string validation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@965141 13f79535-47bb-0310-9956-ffa450edef68
2010-07-17 21:53:47 +00:00
Benjamin Bentmann bcde4d89a4 o Tweaked API
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@965131 13f79535-47bb-0310-9956-ffa450edef68
2010-07-17 20:50:25 +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
Benjamin Bentmann 4bc3491706 o Added a factory to manually wire/setup a model builder for convenient use in non-ioc envs
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@963073 13f79535-47bb-0310-9956-ffa450edef68
2010-07-11 13:51:21 +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 d782b61e83 o Improved validation message
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@957180 13f79535-47bb-0310-9956-ffa450edef68
2010-06-23 13:04:08 +00:00
Benjamin Bentmann 1a59d57746 o Removed dead code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@949832 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 18:48:45 +00:00
Benjamin Bentmann bb39b48044 [MNG-4695] Missing Error during pom validation: "You cannot have two plugin executions with the same (or missing) <id/> elements."
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@949720 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 11:27:00 +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 698339ef06 o Added setters to allow manual wiring of components, making model builder usable outside of plexus
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@948551 13f79535-47bb-0310-9956-ffa450edef68
2010-05-26 19:32:04 +00:00
Benjamin Bentmann 80903fa4d1 [MNG-4684] distributionManagment section in profiles do not override default one (maven 3 regression)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@946980 13f79535-47bb-0310-9956-ffa450edef68
2010-05-21 12:11:53 +00:00
Benjamin Bentmann bdecdcf64a [MNG-4677] [regression] Plugin configuration incorrectly inherited from parent pom
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@945294 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 18:39:46 +00:00
Benjamin Bentmann 90027ef75a [MNG-4658] Relax validation of repository ids and only warn upon conflict with "local"
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@940790 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 09:57:46 +00:00
Benjamin Bentmann 83389c3402 [MNG-4648] NullPointerException thrown from DefaultPluginRealmCache#pluginHashCode method if project-level plugin dependency misses version
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@938410 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 11:09:54 +00:00
Benjamin Bentmann dea099cdef o Fixed javadoc
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@937234 13f79535-47bb-0310-9956-ffa450edef68
2010-04-23 10:29:12 +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 419a1d4627 o Refactored code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@934861 13f79535-47bb-0310-9956-ffa450edef68
2010-04-16 13:18:48 +00:00
Benjamin Bentmann d8a1cb1b9a o Improved validation messages
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@934853 13f79535-47bb-0310-9956-ffa450edef68
2010-04-16 12:50:18 +00:00
Benjamin Bentmann 4bddf292f5 o Allowed inspection of erroneous model
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@934451 13f79535-47bb-0310-9956-ffa450edef68
2010-04-15 15:31:08 +00:00
Benjamin Bentmann 41eb59fdd1 o Fixed handling of missing project artifact id
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@934440 13f79535-47bb-0310-9956-ffa450edef68
2010-04-15 15:09:40 +00:00
Benjamin Bentmann a315a9dac3 o Refactored code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@934381 13f79535-47bb-0310-9956-ffa450edef68
2010-04-15 12:04:02 +00:00
Benjamin Bentmann effd92055c o Removed redundant/superfluous option
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@934372 13f79535-47bb-0310-9956-ffa450edef68
2010-04-15 11:34:55 +00:00
Benjamin Bentmann 0c20759680 [MNG-4453] [regression] Plugin versions defined in a lifecycle mapping are not respected
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@932609 13f79535-47bb-0310-9956-ffa450edef68
2010-04-09 20:59:09 +00:00
Benjamin Bentmann 3efaadf440 o Added short-circuit to disable local parent resolution via <relativePath/>
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@932366 13f79535-47bb-0310-9956-ffa450edef68
2010-04-09 11:48:37 +00:00
Benjamin Bentmann a3bcfe7d11 [MNG-4629] [regression] POM validation fails upon non-existing system-scope dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@931860 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 10:41:38 +00:00
Benjamin Bentmann fc7636db41 [MNG-4623] model parsing errors can be less helpful in Maven 3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@931492 13f79535-47bb-0310-9956-ffa450edef68
2010-04-07 10:21:05 +00:00
Benjamin Bentmann 997c3110c6 [MNG-2103] Inheritance of <plugin> overrides that of <execution>
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@931125 13f79535-47bb-0310-9956-ffa450edef68
2010-04-06 12:44:16 +00:00
Benjamin Bentmann 5aa2078ab1 o Improved model validation to ignore super POM for plugin version check
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@930720 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 17:25:00 +00:00
Benjamin Bentmann a123fce495 o Refactored code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@930708 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 16:18:47 +00:00
Benjamin Bentmann df8e313981 o Cleaned up code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@930689 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 13:41:38 +00:00
Benjamin Bentmann 8286769834 [MNG-4619] Issue warning in case parent.relativePath points at POM with different groupId/artifactId
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@930665 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 11:44:43 +00:00
Benjamin Bentmann aa0b4f4618 [MNG-3133] DefaultModelInheritence::appendPath assumes it is operating on interpolated/literal paths
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@930411 13f79535-47bb-0310-9956-ffa450edef68
2010-04-02 22:07:04 +00:00
Benjamin Bentmann 8daea5f1a7 [MNG-2276] profile activation by property doesn't work with properties defined in settings
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@929483 13f79535-47bb-0310-9956-ffa450edef68
2010-03-31 11:38:44 +00:00
Benjamin Bentmann e45fa790c7 [MNG-4418] Dependency resolution appears to misbehave if a remote repository uses the id "local"
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@929329 13f79535-47bb-0310-9956-ffa450edef68
2010-03-30 22:53:01 +00:00
Benjamin Bentmann 9020e459a1 [MNG-2187] Improve error message when the pom is encoded in the wrong charset
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@929140 13f79535-47bb-0310-9956-ffa450edef68
2010-03-30 13:48:08 +00:00
Benjamin Bentmann b16a005106 [MNG-4005] Throw Validation Error if pom contains a dependency with two different versions
o Relaxed to warning for now to ease migration

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@928485 13f79535-47bb-0310-9956-ffa450edef68
2010-03-28 19:47:30 +00:00
Benjamin Bentmann fbaa48e658 [MNG-1701] Validate that a plugin is not configured twice in the pom
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@928426 13f79535-47bb-0310-9956-ffa450edef68
2010-03-28 15:05:40 +00:00
Benjamin Bentmann 10f90c7b3d [MNG-4610] Bump maven-release-plugin to v2.0 in super POM
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@927965 13f79535-47bb-0310-9956-ffa450edef68
2010-03-26 16:52:54 +00:00
Benjamin Bentmann 51d640d13b [MNG-4162] Removal of all reporting logic from the core of Maven
o Finished converter for reporting section

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@927602 13f79535-47bb-0310-9956-ffa450edef68
2010-03-25 21:54:04 +00:00
Benjamin Bentmann 38b4606a18 o Cleaned up validation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@927436 13f79535-47bb-0310-9956-ffa450edef68
2010-03-25 15:03:50 +00:00
Benjamin Bentmann 8fe6c6d551 o Restored warning for empty <module>
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@927364 13f79535-47bb-0310-9956-ffa450edef68
2010-03-25 12:17:53 +00:00
Benjamin Bentmann 699fc5b81d [MNG-4600] [regression] Optional flag from dependency management applied to dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@925481 13f79535-47bb-0310-9956-ffa450edef68
2010-03-19 23:20:31 +00:00
Benjamin Bentmann 0bbebeae70 o Updated default plugin versions
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@923724 13f79535-47bb-0310-9956-ffa450edef68
2010-03-16 13:14:35 +00:00
Benjamin Bentmann d7d94af169 o Added copy constructor
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@923403 13f79535-47bb-0310-9956-ffa450edef68
2010-03-15 19:35:45 +00:00
Benjamin Bentmann c13cd3abc4 o Polished code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@923402 13f79535-47bb-0310-9956-ffa450edef68
2010-03-15 19:35:10 +00:00
Benjamin Bentmann 5aaed1919b [MNG-4590] [regression] System properties are no longer interpolated in imported POMs
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@923400 13f79535-47bb-0310-9956-ffa450edef68
2010-03-15 19:33:48 +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
Kristian Rosenvold c0fbdc5f9c Fixed flaky test by improving focus on supported use-case
Test was failing intermittently

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@917741 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 21:42:55 +00:00
Benjamin Bentmann 8b6616cf3b [MNG-4464] Improve handling of relative paths with backslashes
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@904931 13f79535-47bb-0310-9956-ffa450edef68
2010-01-31 00:27:21 +00:00
Kristian Rosenvold f2c08ee302 [MNG-4542] StringSearchModelInterpolator concurrency problem
Replaced WeakHashmap + synchronized with a ConcurrentHashMap. This was done after observing no change in memory profile
after running all the IT's in the maven embedder with and without this patch. Discussed change with original author
of code.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@902473 13f79535-47bb-0310-9956-ffa450edef68
2010-01-23 20:04:29 +00:00
Kristian Rosenvold 97d25dc1d9 [MNG-4542] StringSearchModelInterpolator concurrency problem
Shameful removal of printStackTrace in catch block

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@902085 13f79535-47bb-0310-9956-ffa450edef68
2010-01-22 13:46:49 +00:00
Kristian Rosenvold 0bfae6deed [MNG-4542] StringSearchModelInterpolator concurrency problem
Revived test from 2.2.X code base, fixed concurrency issue and added concurrency test

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@902080 13f79535-47bb-0310-9956-ffa450edef68
2010-01-22 13:35:34 +00:00
Benjamin Bentmann 9168e66222 o Fixed regression introduced by r900021
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@900965 13f79535-47bb-0310-9956-ffa450edef68
2010-01-19 21:25:08 +00:00
Benjamin Bentmann 531384ee21 o Simplified code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@900023 13f79535-47bb-0310-9956-ffa450edef68
2010-01-16 20:47:17 +00:00
Benjamin Bentmann 03a383e30e [MNG-4529] maven fails on IBM JDK 1.5.0 with exception IllegalAccessException: Field is final
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@900021 13f79535-47bb-0310-9956-ffa450edef68
2010-01-16 20:31:38 +00:00
Benjamin Bentmann 5a51823501 o Optimized code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@900019 13f79535-47bb-0310-9956-ffa450edef68
2010-01-16 20:20:00 +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
Benjamin Bentmann f5ebc72d12 [MNG-4518] Profile activation based on JRE version misbehaves if java.version has build number
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@896102 13f79535-47bb-0310-9956-ffa450edef68
2010-01-05 15:44:35 +00:00
Benjamin Bentmann 8cb042536e [MNG-4512] [regression] Profile activation based on JDK version range fails if current version is close to range boundary
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@895185 13f79535-47bb-0310-9956-ffa450edef68
2010-01-02 12:54:12 +00:00
Benjamin Bentmann ed4f6d1094 [MNG-4488] [regression] Parent POMs resolved from repository are validated in strict mode
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@888390 13f79535-47bb-0310-9956-ffa450edef68
2009-12-08 13:13:39 +00:00
Benjamin Bentmann 411fd3c42b o Improved handling of circular parents
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@885106 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 16:08:32 +00:00
Benjamin Bentmann f918716071 [MNG-4472] [regression] Circular self-referential POM causes network access
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@885105 13f79535-47bb-0310-9956-ffa450edef68
2009-11-28 16:06:32 +00:00
Benjamin Bentmann b1482a3cb4 o Improved error message in case of empty plugin version (i.e. <version/>, not to be confused with a completely missing <version>)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@883551 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:58:44 +00:00
Benjamin Bentmann 6de5f3f3de [MNG-4466] Plugin Metaversion Compatibility
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@883537 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:09:20 +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 b442714004 o Polished code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@882685 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 19:13:32 +00:00
Benjamin Bentmann f2d48a06ad [MNG-4456] Deprecate fully qualified pathnames in system path
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@882677 13f79535-47bb-0310-9956-ffa450edef68
2009-11-20 19:05:13 +00:00
Benjamin Bentmann 1068ab557c [MNG-4454] Incomplete <parent> element causes NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@881784 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 14:08:28 +00:00
Benjamin Bentmann 8b21cd1567 [MNG-4450] [regression] Stub project for missing dependency POMs is not properly created
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@881563 13f79535-47bb-0310-9956-ffa450edef68
2009-11-17 22:05:28 +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 05a2e7db6b o Removed inherited version
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@834111 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 15:42:01 +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 e61887bbc2 o Fixed NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@833726 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 18:16:36 +00:00
Benjamin Bentmann bd2ec16785 [MNG-4430] [regression] Presence of distribution management status in POM of local project does not cause validation error
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@833465 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 16:45:50 +00:00
Benjamin Bentmann ed43cef785 o Tuned code
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@833044 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 13:15:54 +00:00
Benjamin Bentmann c980cfb28d [MNG-4427] Bad error message with duplicate dependencies that don't declare a version
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@833040 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 12:37:30 +00:00
Benjamin Bentmann 002f0a4432 [MNG-4421] Warn regarding old-style references when used in a project build
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@831579 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 18:25:48 +00:00
Benjamin Bentmann defd0cc82a [MNG-4416] [regression] Plugins are not properly ordered after merging with profile plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@830915 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 12:33:36 +00:00
Benjamin Bentmann 4d5a89d0d6 [MNG-4415] [regression] Plugins are not properly ordered after merging with inherited parent plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@830809 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 00:24:56 +00:00
Benjamin Bentmann e463a9626f o Updated some default plugin versions
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@830756 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 20:43:13 +00:00
Benjamin Bentmann 96990da133 o Improved validation message
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@830558 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 14:28:25 +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 6ce5060ddc o Extended error message
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@830222 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 15:04:19 +00:00
Benjamin Bentmann 7d6257748e o Polished model validation messages
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@829625 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 18:49:25 +00:00
Benjamin Bentmann 67c7dc2168 [MNG-4405] Uninterpolated expressions should cause an error for plugin versions
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@829403 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 16:34:48 +00:00
Benjamin Bentmann 077c0be9a9 [MNG-4404] Throw validation error upon duplicate profile id
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@829390 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 15:43:30 +00:00
Benjamin Bentmann 01b1b16386 [MNG-4402] Improve duplicated modules error
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@829383 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 14:53:54 +00:00
Benjamin Bentmann fce4db9c9c [MNG-4400] [regression] Repository order from settings.xml is not respected during artifact resolution
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@829009 13f79535-47bb-0310-9956-ffa450edef68
2009-10-23 11:43:38 +00:00
Benjamin Bentmann d2728ba0cd o Bumped warning about <reporting> section to a higher validation level to allow for smoother co-existence of 2.x and 3.0
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@826672 13f79535-47bb-0310-9956-ffa450edef68
2009-10-19 13:56:06 +00:00
Benjamin Bentmann 0514606a44 o Improved error reporting
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@825944 13f79535-47bb-0310-9956-ffa450edef68
2009-10-16 15:33:34 +00:00
Benjamin Bentmann 66ed105e02 o Fixed option handling
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@825061 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 09:01:14 +00:00
Jason van Zyl 57f45121c3 o patch to pass along the source and location
Submitted by: Jason Dillon


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@824998 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 02:05:28 +00:00
Benjamin Bentmann d74d8f4a4d [MNG-4393] [regression] Parent POMs resolved from repository are parsed in strict mode
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@824842 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 17:06:17 +00:00
Jason van Zyl eb16f89312 o new model processor
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@824608 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 06:53:06 +00:00
Jason van Zyl 787008b34a o changes to allow polyglot maven to work
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@824607 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 06:49:25 +00:00
Benjamin Bentmann d4ca575f08 o Added new settings builder that uses request/result pattern to allow for better problem reporting
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@824172 13f79535-47bb-0310-9956-ffa450edef68
2009-10-11 21:25:11 +00:00
Jason van Zyl 07398e00bc o push all pom format specific handling up to the front-end, internally inside maven we do not care what the source of POM information is
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@824098 13f79535-47bb-0310-9956-ffa450edef68
2009-10-11 16:18:10 +00:00
Benjamin Bentmann 737bc0f63b o Replaced hard-coded use of "pom.xml" with a component to enable customizers using other formats to use other file names as well
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@823852 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 13:26:44 +00:00
Benjamin Bentmann 9644d27e64 o Improved robustness against bad profile activation
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@823345 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 22:15:18 +00:00
Benjamin Bentmann 0f3d4d243f [MNG-4383] Uninterpolated expressions should cause an error
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@821772 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 12:30:09 +00:00
Benjamin Bentmann 2169c4a3a1 [MNG-3991] POM validator allows <scope>optional</scope> but it is not valid.
o Relaxed validation to only output warnings instead of errors for unknown scopes

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@821758 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 11:16:35 +00:00
Benjamin Bentmann cfdc74af79 o Made lifecycle bindings injector optional
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@820822 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 22:17:24 +00:00
Olivier Lamy 1f98233630 start transformation of reportSet.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@820116 13f79535-47bb-0310-9956-ffa450edef68
2009-09-29 22:45:16 +00:00
Benjamin Bentmann f82e1fb06c o Adjusted warning
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@820093 13f79535-47bb-0310-9956-ffa450edef68
2009-09-29 21:22:58 +00:00
Benjamin Bentmann 40e7df8454 [MNG-4162] Removal of all reporting logic from the core of Maven
o Started converter to populate new site plugin configuration from legacy reporting section

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@819974 13f79535-47bb-0310-9956-ffa450edef68
2009-09-29 14:51:28 +00:00
Olivier Lamy 9bc16f0dc1 remove unused imports.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@819706 13f79535-47bb-0310-9956-ffa450edef68
2009-09-28 20:19:13 +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
Benjamin Bentmann 8f12f77873 [MNG-4204] Remove support for legacy style repositories
o Made validator output a deprecation warning

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@814342 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 16:49:16 +00:00
Benjamin Bentmann 7fee6483b3 o Revised ModelProblem to provide more detailed information about problem location
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@814330 13f79535-47bb-0310-9956-ffa450edef68
2009-09-13 15:09:33 +00:00
Herve Boutemy 05b59c8935 fixed errors reported by Checkstyle
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@813627 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 22:47:12 +00:00
Benjamin Bentmann ad6b0e4e44 o Fixed error reporting
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@812719 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 22:59:11 +00:00
Benjamin Bentmann 326e14b853 o Refactored profile activators to use problem collector
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@810452 13f79535-47bb-0310-9956-ffa450edef68
2009-09-02 11:12:43 +00:00
Benjamin Bentmann f527d87078 o Fixed typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@810006 13f79535-47bb-0310-9956-ffa450edef68
2009-09-01 12:40:05 +00:00
Benjamin Bentmann 0299085031 o Properly reported cycles in the imported models
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@810004 13f79535-47bb-0310-9956-ffa450edef68
2009-09-01 12:36:12 +00:00
Benjamin Bentmann 3870ab0e60 o Restored release profile for the sake of backward-compat (its removal needs to be deferred until we bump the model version)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@809769 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 22:40:12 +00:00
Benjamin Bentmann d45b4e09a5 o Synced plugin versions with super POM from 2.2.x branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@809754 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 21:36:29 +00:00
Benjamin Bentmann ab9f726596 o Formatted POM
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@809753 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 21:32:38 +00:00
Benjamin Bentmann 26f1a5bfda [MNG-4332] [regression] Default plugin executions contributed by packaging execute after executions from plugin management
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@809751 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 21:31:01 +00:00
Benjamin Bentmann 1e33cb56fe o Simplified code (multi-cast can be realized by a delegating listener if required)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@809399 13f79535-47bb-0310-9956-ffa450edef68
2009-08-30 18:34:46 +00:00
Benjamin Bentmann 3badf71251 [MNG-3991] POM validator allows <scope>optional</scope> but it is not valid
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@808364 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 10:57:11 +00:00
Benjamin Bentmann 8ce8b462d0 o Added validation error upon bad scope for plugin dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@808182 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 20:48:48 +00:00
Benjamin Bentmann 4b904e1005 o Revised error handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@807736 13f79535-47bb-0310-9956-ffa450edef68
2009-08-25 18:03:51 +00:00
Benjamin Bentmann 8b381cdbd6 o Fixed model builder to expand plugin management configuration, too
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@807669 13f79535-47bb-0310-9956-ffa450edef68
2009-08-25 15:25:42 +00:00
Benjamin Bentmann c7142215c2 o Fixed generics
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@807144 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 10:45:58 +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 7cae21ebf5 o Refactored code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@805332 13f79535-47bb-0310-9956-ffa450edef68
2009-08-18 09:36:45 +00:00
Benjamin Bentmann 7f02ae07d2 o Made QDox happy
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@804900 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 08:40:48 +00:00
Benjamin Bentmann eb8b7072a8 o Refactored code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@804894 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 08:19:55 +00:00
Benjamin Bentmann f2946af284 [MNG-4297] Disallow use of properties in the project coordinates
o For Maven 3.0, started to produce a warning

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@803995 13f79535-47bb-0310-9956-ffa450edef68
2009-08-13 19:17:19 +00:00
Benjamin Bentmann b3a4fcc490 o Extended validation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@801987 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 13:13:30 +00:00
Benjamin Bentmann 84dc78cbe4 o Extended error reporting to provide the id of the POM that failed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@801449 13f79535-47bb-0310-9956-ffa450edef68
2009-08-05 22:45:14 +00:00
Benjamin Bentmann 7de1280968 [MNG-4283] [regression] Parent POM with packaging other than "pom" is not rejected
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@801424 13f79535-47bb-0310-9956-ffa450edef68
2009-08-05 21:43:24 +00:00
Benjamin Bentmann 23862001bd o Improved validation message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800495 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 19:05:18 +00:00
Benjamin Bentmann b454fb7cb6 o Polished error reporting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800482 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 18:08:55 +00:00
Benjamin Bentmann 62e07ca349 o Refactored model building components to use problem collector
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800468 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 17:15:11 +00:00
Benjamin Bentmann bbc25fe83b o Removed dead class
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800462 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 16:45:32 +00:00
Benjamin Bentmann f4fa9e3838 o Refactored model validator to use problem collector
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800451 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 16:20:06 +00:00
Benjamin Bentmann c612913a70 o Refactored profile selector to use problem collector
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800426 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 15:30:37 +00:00
Benjamin Bentmann 975ac84b45 o Refactored model building listener to use problem collector
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800418 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 15:13:46 +00:00
Benjamin Bentmann 5e36879dd4 o Reworked handling of model problems to allow for easier reusage across all the other model diddling components
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800413 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 14:58:05 +00:00
Benjamin Bentmann 0373dfb46b o Extended lifecycle injector to collect model problems
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@800353 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 13:16:41 +00:00
Benjamin Bentmann ea10476bf9 o Fixed extension realm to consider project-level plugin dependencies as well
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@799831 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 11:06:14 +00:00
Benjamin Bentmann c2078c65b1 o Enabled model cache
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@799470 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 23:03:32 +00:00
Benjamin Bentmann 299a4c0843 [MNG-4052] import scope dependencies prefer to download pom rather than find it in the current project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@798221 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 17:09:51 +00:00
Benjamin Bentmann fb0d4c3de9 o Enabled two-phase model building which allows to address inter-model dependencies within a reactor build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@798077 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 08:33:11 +00:00
Benjamin Bentmann 34e1fa627f o Enabled two-phase model building which allows to address inter-model dependencies within a reactor build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797988 13f79535-47bb-0310-9956-ffa450edef68
2009-07-26 20:36:32 +00:00
Benjamin Bentmann 38cec71dcf o Revised API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797968 13f79535-47bb-0310-9956-ffa450edef68
2009-07-26 18:18:47 +00:00
Benjamin Bentmann 70f22200a0 o Moved dependency management importer into package dedicated to mixin composition
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797961 13f79535-47bb-0310-9956-ffa450edef68
2009-07-26 17:43:50 +00:00
Benjamin Bentmann 57f82d7694 o Introduced model cache to avoid repeated building of models that can occur multiple times during a reactor build (e.g. parents and imported POMs)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797959 13f79535-47bb-0310-9956-ffa450edef68
2009-07-26 17:36:59 +00:00
Benjamin Bentmann 6d2b09b14f o Refactored code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797809 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 18:04:24 +00:00
Benjamin Bentmann fe4d70448e o Made model validation fail upon imported POM with classifier (which isn't supported)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797808 13f79535-47bb-0310-9956-ffa450edef68
2009-07-25 18:03:13 +00:00
Benjamin Bentmann 4286488981 o Polished API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@797477 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 14:23:00 +00:00
Benjamin Bentmann 93b2746fe5 o Added UT for PropertyProfileActivator
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@796912 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 23:36:22 +00:00
Benjamin Bentmann 88216c6532 o Re-introduced distinction between user properties and system properties. We have use cases like interpolation and SUREFIRE-121 where we would like to handle user-specified props specially so a single properties soup is not up to the job. However, I opted not to follow the approach from 2.x where we also collect both system properties and user properties in a combined set called execution properties. Code that embeds Maven and programmatically creates an execution request should be not required to assemble such a mixed properties instance, it would enable bad behavior from Maven by subtle API misuse. Also, for things like the lifecycle participant that wants to inject properties, it should be cristal clear whether it injects a user or a system property, the semantics of something like getExecutionProperties().setProperty() would be unclear however.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@796900 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 22:43:05 +00:00
Benjamin Bentmann fa40714be3 o Revised error handling, API misuse is really not a model/network problem
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@795622 13f79535-47bb-0310-9956-ffa450edef68
2009-07-19 21:24:44 +00:00
Benjamin Bentmann a48742bc1a [MNG-3220] Allow managed dependencies to be imported into other projects
o Restored import scope for 3.x

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@795611 13f79535-47bb-0310-9956-ffa450edef68
2009-07-19 21:14:17 +00:00
Benjamin Bentmann 01f7692db0 o Replaced usage of StringBuffer with StringBuilder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@795584 13f79535-47bb-0310-9956-ffa450edef68
2009-07-19 18:20:09 +00:00
Benjamin Bentmann 70ae109093 o Added method to clone/fork model resolver which is a prerequisite for importing other POMs/mixins during the model building where the model builder basically recurses and we want the resolution processes for these sub POMs to be isolated
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@795227 13f79535-47bb-0310-9956-ffa450edef68
2009-07-17 21:07:11 +00:00
Benjamin Bentmann 1759fb3979 o Consolidated all inputs of the model builder in the building request
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@793891 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 12:54:16 +00:00
Benjamin Bentmann faa082995e o Introduced model building listener
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@793842 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 10:42:34 +00:00
Benjamin Bentmann f3ba964d55 o Refactored management injection to allow for proper extension loading
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@793578 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 13:19:45 +00:00
Benjamin Bentmann abca2a5252 o Moved model builder classes into dedicated package such that o.a.m.model is reserved for the generated Modello classes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@790350 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 20:04:48 +00:00
Benjamin Bentmann 2b44c968f0 o Extended model validator to support more than two validation levels
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@790338 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 19:33:40 +00:00
Benjamin Bentmann 512d83070a [MNG-4173] Remove automatic version resolution for POM plugins
o Reduced validation error to warning because this change seems to cause troubles for many projects out there
o Extended lifecylce executor to take care of non-versioned plugins

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@790202 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 14:55:06 +00:00
Benjamin Bentmann 22516c9fa7 o Extended model validation to support distinction between warnings and errors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@790131 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 11:56:44 +00:00
Benjamin Bentmann b91f837e12 o Distinguished different severity levels of model problems, allowing warnings to be collected but still have the build request succeed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@790109 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 10:45:29 +00:00
Benjamin Bentmann 49acd30848 o Fixed NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@790099 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 10:23:32 +00:00
Benjamin Bentmann e3463be3d1 [MNG-2363] <profile><activation><file><exists/> does not work in a multi-project build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@788334 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 12:03:55 +00:00
Benjamin Bentmann dd635ca490 o Moved super POM retrieval into dedicated component to provide an extension point for integrators like Tycho that need different/further values in the super model
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@788309 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 10:00:21 +00:00
Benjamin Bentmann 262ff7908f [MNG-4214] [regression] Parent POMs cannot be resolved from mirrored repos
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@786910 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 21:22:54 +00:00
Benjamin Bentmann 2260cb2f58 o Fixed buggy anti-pattern
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@786892 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 19:39:56 +00:00
Benjamin Bentmann 4b0c8ac908 o Synced resource directory of super POM with base package of module
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@786855 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 16:52:06 +00:00
Benjamin Bentmann 6a63fb495f o Removed super POM handling from project builder and did a proper call to the model builder instead
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@786853 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 16:40:21 +00:00
Benjamin Bentmann 7f526ca65d o Extended model builder to report the ids of the models from the lineage and used these ids as keys to pull infos from the building result
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@786838 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 15:00:45 +00:00
Benjamin Bentmann fed83d80b8 o Polished documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@786837 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 14:51:45 +00:00
Benjamin Bentmann a51aba1cd6 [MNG-4208] [regression] CLI properties can't override project properties during interpolation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@785752 13f79535-47bb-0310-9956-ffa450edef68
2009-06-17 18:44:19 +00:00
Benjamin Bentmann 3843481a3b o Fixed order of inherited plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@785644 13f79535-47bb-0310-9956-ffa450edef68
2009-06-17 15:00:06 +00:00
Benjamin Bentmann cd9056d1fd o Kept active external and POM profiles separate in model building result
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@784583 13f79535-47bb-0310-9956-ffa450edef68
2009-06-14 16:46:16 +00:00
Benjamin Bentmann 8a43011d41 [MNG-4005] Throw Validation Error if pom contains a dependency with two different versions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@784241 13f79535-47bb-0310-9956-ffa450edef68
2009-06-12 19:22:41 +00:00
Benjamin Bentmann 425f632772 o Restored backward-compat with regard to handling of duplicate dependencies during metadata retrieval
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@784227 13f79535-47bb-0310-9956-ffa450edef68
2009-06-12 18:45:37 +00:00
Benjamin Bentmann b04e3aa641 o Avoided creation of interpolation value sources that only apply to local builds when we have no project directory
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@783831 13f79535-47bb-0310-9956-ffa450edef68
2009-06-11 16:17:49 +00:00
Benjamin Bentmann e72965d38e [MNG-2562] expose current time as a property for POM interpolation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@783808 13f79535-47bb-0310-9956-ffa450edef68
2009-06-11 15:01:55 +00:00
Benjamin Bentmann 56d0392994 o Took the build timestamp formatting stuff out of the public API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@783777 13f79535-47bb-0310-9956-ffa450edef68
2009-06-11 14:10:33 +00:00
Benjamin Bentmann db5d449c33 o Fixed inheritance of <developers>, <contributors>, <licenses> and <mailingLists>
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@783556 13f79535-47bb-0310-9956-ffa450edef68
2009-06-10 22:30:55 +00:00
Benjamin Bentmann 424b7ef1b0 o Fixed inheritance of <prerequisites>
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@783542 13f79535-47bb-0310-9956-ffa450edef68
2009-06-10 22:02:56 +00:00
Benjamin Bentmann 5cde8bfe4b [MNG-4193] Throw validation error upon multiple repository declarations with the same id
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782796 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 21:38:45 +00:00
Benjamin Bentmann d07123e796 o Fixed model building to account for default values that can't be set in the MDO. The use case we have for this is the scope for dependencies: Setting this in the MDO would cause injection of the default in the raw model and would interfere with the superposition of dependency management. The 2.x code handles this via a side effect of MavenMetadataSource.createArtifact() which doesn't look like a clean way to go.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782376 13f79535-47bb-0310-9956-ffa450edef68
2009-06-07 12:12:54 +00:00
Benjamin Bentmann 04f14b08d8 o Clarified state of internal util class
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782354 13f79535-47bb-0310-9956-ffa450edef68
2009-06-07 09:29:08 +00:00
Benjamin Bentmann bfe55515a0 o Updated profile selector to support collecting activation errors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782293 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 18:09:42 +00:00
Benjamin Bentmann a35801fd1d o Set POM file before validation to provide better source hint for validation problems
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782283 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 17:40:50 +00:00
Benjamin Bentmann b5e672f92b o Revised exception handling of model builder to collect as much as possible in ModelProblem instances that are stored in the ModelBuildingException when it eventually bails out. This should enable IDE integrators to provide more extensive error feedback.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782282 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 17:28:10 +00:00
Benjamin Bentmann 97e57944f8 o Improved propagation of parse errors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782243 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 12:37:34 +00:00
Benjamin Bentmann b273dab333 o Fixed aggregation of remote repositories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782231 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 11:35:57 +00:00
Benjamin Bentmann 73f3c915d1 o Decoupled project building request from model building request
o Moved model resolver into model building request

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782223 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 10:38:42 +00:00
Jason van Zyl 09f970f178 MNG-4041: maven core returns stale project state during extended use. this is a patch which provides intelligent caching and yields a very substantial performance improvement.
Submitted by: Igor Fedorenko



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782014 13f79535-47bb-0310-9956-ffa450edef68
2009-06-05 13:49:25 +00:00
Benjamin Bentmann 2d7b1977d9 o Used same junit version as in all the other modules
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781172 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 21:13:51 +00:00
Benjamin Bentmann 1e730aa8ad o Minor tweaks to the interpolation post process:
- Excluded it completely if it has nothing to do
  - Switched contains() test to use hash-based lookup rather than linear search

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781168 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 21:06:57 +00:00
Benjamin Bentmann a65f6d71f0 o Polished generics
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781153 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 20:35:15 +00:00
Benjamin Bentmann 1d3df2ed0c o Decoupled model building request from profile activation context
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781144 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 20:07:26 +00:00
Benjamin Bentmann 2b12aab7e1 o Extended API docs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781137 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 19:39:12 +00:00
Benjamin Bentmann 7a2d55b8d1 o Gave each model diddling component access to the building request to easy future extensions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781133 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 19:31:34 +00:00
Benjamin Bentmann a47090cd84 o Added some API docs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781127 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 19:10:40 +00:00
Benjamin Bentmann 99a0a12c46 o Removed utility classes from public API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781123 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 18:53:27 +00:00
Benjamin Bentmann 34dfd48922 o Added some API docs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781120 13f79535-47bb-0310-9956-ffa450edef68
2009-06-02 18:49:44 +00:00
Benjamin Bentmann ff62ba92a6 o Used non-deprecated classes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780769 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 18:33:24 +00:00
Benjamin Bentmann c8a5c2d89a o Renamed packages for consistency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780763 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 18:06:17 +00:00
Benjamin Bentmann 0968ba79f3 o Flipped interpolation over to use the in-memory based interpolator from 2.2.x which makes the overall building twice as fast as before
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780749 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 17:49:34 +00:00
Benjamin Bentmann 9501ad8835 o Resurrected the path translator component (on this occasion, splitting it to separate the single path translation from the model translation)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780698 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 15:55:41 +00:00
Benjamin Bentmann bdcb479015 o Fixed resolution of local parents
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780642 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 13:19:20 +00:00
Benjamin Bentmann a28e69ee47 o Polished exceptions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780636 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 12:48:22 +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 48eccf5d3b o Validated repositories upfront as these are required for parent resolution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780622 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 12:09:01 +00:00
Benjamin Bentmann faf4083cb9 o Moved interface for lifecycle injection into model-builder component
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780524 13f79535-47bb-0310-9956-ffa450edef68
2009-05-31 22:45:30 +00:00
Benjamin Bentmann 0e34f1958a o Moved tests for model validator into proper module
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@779307 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 20:48:13 +00:00
Benjamin Bentmann 421e6ca656 o Added dedicated exception for POM parsing errors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@779299 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 20:28:12 +00:00
Benjamin Bentmann 41e54938d5 o Moved model validator into o.a.m.model and moved old impl into compat module
o Added method to validate raw POM

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@779289 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 19:59:17 +00:00
Benjamin Bentmann 1e2d19ab1a o Deleted DomainModel
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778500 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 20:59:59 +00:00
Benjamin Bentmann 3446be4828 o Decoupled project builder from DomainModel, we will directly use the model to keep track of the bits
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778495 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 20:44:38 +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 1ace747678 o Guarded against NPE in case no project directory is available as in the case of repo artifacts
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778491 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 20:07:57 +00:00
Benjamin Bentmann f82b30a6a1 o Clarified API
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778489 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 20:05:02 +00:00
Benjamin Bentmann f2fad6d4d7 o Decoupled interpolator from DomainModel
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778449 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 16:18:07 +00:00
Benjamin Bentmann bbc97f4eb9 o Removed static processor context and move its remaining bits into the project builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778441 13f79535-47bb-0310-9956-ffa450edef68
2009-05-25 15:49:43 +00:00
Benjamin Bentmann a28bb83b54 o Moved profile manager to compat module
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777998 13f79535-47bb-0310-9956-ffa450edef68
2009-05-23 19:44:18 +00:00
Benjamin Bentmann 4bd0aad1dc o Deleted old profile matches
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777989 13f79535-47bb-0310-9956-ffa450edef68
2009-05-23 19:05:00 +00:00
Benjamin Bentmann ff7d13487d o Used more descriptive name for component
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777965 13f79535-47bb-0310-9956-ffa450edef68
2009-05-23 17:08:57 +00:00
Benjamin Bentmann c3f9346b47 o Introduced ProfileSelector component which will replace the profile manager (the new component is stateless and focuses on the task to determine the active profiles from a given input collection). The long term goal is to use the project builder configuration as the profile activation context as this holds basically all the bits required for profile activators.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777961 13f79535-47bb-0310-9956-ffa450edef68
2009-05-23 16:52:48 +00:00
Benjamin Bentmann 3f59f88d86 o Fixed inheritance to exclude project name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777237 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 19:58:13 +00:00
Benjamin Bentmann efb59873a5 [MNG-4129] Execution's inherited is not working as expected.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777205 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 18:19:22 +00:00
Jason van Zyl 9aae6eaa67 o using mojo executions as the placeholders in the lifecycle instead of string representations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@777120 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 14:00:34 +00:00
Benjamin Bentmann 59224daa9e o Fixed interpolation of system properties
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@776073 13f79535-47bb-0310-9956-ffa450edef68
2009-05-18 20:10:06 +00:00
Jason van Zyl 01a13a3ffd o remove the profile manager and profile activation context from public view
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@775281 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 18:32:59 +00:00
Benjamin Bentmann 27afcb3aff o Introduced components to abstract from the Modello generated XPP reader/writer such that we can more easily switch the underlying XML parser
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@774057 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 20:03:31 +00:00
Benjamin Bentmann cff6ab0d02 o Added model normalizer for things like merging duplicate plugin declarations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773869 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 12:40:57 +00:00
Benjamin Bentmann 3f08e048a9 o Moved expansion of plugin configuration into component
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773692 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 20:56:32 +00:00
Benjamin Bentmann 4fdc5512eb o Deleted processors which have been replaced by mergers. To recap, the mergers operate on two instead of three models which reduces complexity. While the mergers are currently not overly beauty either, the plan is to have them generated by Modello via merge rules that would be annotated to the model classes/associations.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773428 13f79535-47bb-0310-9956-ffa450edef68
2009-05-10 22:29:31 +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 0c5208ac25 o Fixed merging of plugin executions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773212 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 12:15:26 +00:00
Benjamin Bentmann 4116ac3f0b o Decoupled calculation of child path adjustment from filesystem which would make the effective model depend on the user's environment and breaks with our goal of reproducible builds
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773047 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 17:00:45 +00:00
Benjamin Bentmann d36a4ab8eb o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773031 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 15:19:51 +00:00
Benjamin Bentmann 24cf91d858 o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773019 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 14:58:26 +00:00
Benjamin Bentmann 6e2798f2e9 o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@773012 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 14:40:47 +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 f6401b60b5 o Continued work on model merging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772964 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 13:10:51 +00:00
Jason van Zyl a73c5abc9c o in the middle of a ReactorArtifactRepository but ben and igor need access so checking in
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772832 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 03:24:55 +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 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 81006b21aa o Migrated from StAX to XPP to have us focus on a single XML parser for now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@772013 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 23:31:09 +00:00
Britton Isbell 383a8b006a Plugin was picking up default plugin groupId, which was causing resolve of plugins to fail.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770433 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 20:26:13 +00:00
Britton Isbell 12ffdd1277 Fixes for merging in plugin config. Needed to do copy of plugins and config.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770395 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 18:55:26 +00:00
Jason van Zyl 36e43b2951 o cleaning up project builder, removed signatures that i've corrected in the RR plugin, moved properties injection up to the main Maven component
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770390 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 18:49:42 +00:00
Britton Isbell 01f79cf31a Cleanup of unused methods.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769953 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 21:46:24 +00:00
Britton Isbell 612db0a8af Moved interp tag to private class (small and only used one place). Added final to fields in ProjectUri. Since this is only used by DefaultInterpolator, don't care if values are inlined during compile
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769945 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 21:30:16 +00:00
Britton Isbell c0306a2ef4 Checking in work on populating plugins configs. Some problem with finding wagon for http protocol is causing build to fail.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769934 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 21:10:03 +00:00
Britton Isbell f27610741f Removed unneeded class.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769868 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 18:39:20 +00:00
Britton Isbell 16fc5b6fd3 Moved the PomInterpolatorTag and Interpolator classes to package scope.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769859 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 18:04:44 +00:00
Britton Isbell 5a7ab7d748 Removed uses of interpolator property from the profiles. This was more of a convenience since InterpolatorProperty was used in multiple places. Not needed anymore.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769856 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 17:59:09 +00:00
Britton Isbell 440b268447 Removed more references to ProjectUri. This is now an internal class in the interpolator package.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769841 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 17:20:47 +00:00
Britton Isbell a6d2ac847a Having a DomainModel interface doesn't makes sense in the current context. We no longer have general transforms.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769836 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 17:12:08 +00:00
Britton Isbell baf09a4148 Cleanup of interpolator, removing references to PomClassicDomainModel, these aren't needed anymore.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769827 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 17:00:17 +00:00
Jason van Zyl be02d72fe6 o only one used interpolator method now, and it's generalized to taking the model and passing in properties so we can make different implementations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769682 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 06:52:50 +00:00
Britton Isbell ae9248e642 Interpolator with properties in method sig.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769666 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 05:25:45 +00:00
Britton Isbell 7d85e92007 Removed hard-coding of plugins. Plugins come into builder with default configs. Need to null these out so that pluginMng will be applied.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769456 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 16:50:21 +00:00
Britton Isbell cb51cfc270 Removed hard-coding of plugins. Plugins come into builder with default configs. Need to null these out so that pluginMng will be applied.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769453 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 16:31:56 +00:00
Britton Isbell 850b047c6d Disabled UTs in maven-project.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769237 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 04:40:54 +00:00
Britton Isbell c3715849bf Default plugins.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769235 13f79535-47bb-0310-9956-ffa450edef68
2009-04-28 04:12:32 +00:00
Jason van Zyl 2805dee2cf o trying to merge manually
git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@768842 13f79535-47bb-0310-9956-ffa450edef68
2009-04-27 00:43:53 +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