Commit Graph

1070 Commits

Author SHA1 Message Date
Jason van Zyl 5678f17198 o nuke another big chunk of the old code, looking for available versions is used internally and once all the methods are shed we'll supply a pure metadata resolution for clients, like IDEs, that need to nicely show versions. we'll also provide a graph too so people aren't going to have to do all the extra crap to get decent information.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@751036 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 18:57:41 +00:00
Jason van Zyl c586c81065 o remove the build planner from visibility
o fix a method in the project builder to protect against an error coming from the remote resources plugin, it's asking to resolve a POM from a JAR artifact and the old project building code was doing that for whatever not-right reason


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@751021 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 18:20:52 +00:00
Benjamin Bentmann ba677b1fb9 o Improved error reporting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750906 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 14:03:38 +00:00
Jason van Zyl 1ffdc9286a o start the grand plugin refactoring, just putting it all together in addition to putting all the repository/artifact calls
behind the repository system you can see project and plugins being processed an incredible number of times and the recursion
  in the collector is broken causing POMs for plugins to be processed hundreds of times. The bootstrap under profiling reveals
  the xpp3 parser being used almost 30k times which is pure insanity.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750774 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 05:38:48 +00:00
Britton Isbell 98891350b8 Merged back changes dealing with element ordering.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750756 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 02:41:18 +00:00
Jason van Zyl f4ec59594c o remove more methods to the repository system, starting to get close to the final set of methods and then we can move on to the classes of the binding to the repository system
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750738 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 01:25:43 +00:00
Britton Isbell 3a2c55315c Fixed a number of element ordering problems. Matches up with latest model-builder. Suppoert for tagging elements with orginal pom id.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750701 13f79535-47bb-0310-9956-ffa450edef68
2009-03-06 00:23:35 +00:00
Jason van Zyl 74384e7c63 o more reduction of the repository interface
o cleaning up the project builder


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750677 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 23:27:03 +00:00
Jason van Zyl 8fd147fff0 o get rid of enableLogging method
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750657 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 22:53:43 +00:00
Jason van Zyl 57c1ffabe2 o inject the logger
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750656 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 22:51:53 +00:00
Jason van Zyl 3292b4bdd3 o get rid of a few more buildArtifactRepository uses
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750650 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 22:48:08 +00:00
Jason van Zyl b9f9244f5f o fixed mirror code
o more plugin manager wrangling


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750568 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 19:59:06 +00:00
Jason van Zyl 1a05bdac38 o use the repositories passed into the request
o make sure that mirrors are processed correctly in that the mirror that is defined must use the layout and policies of the repository it is mirroring


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750251 13f79535-47bb-0310-9956-ffa450edef68
2009-03-05 00:15:56 +00:00
Britton Isbell 3b4dd11674 Unit test files.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750157 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 21:26:28 +00:00
Jason van Zyl 83720e04ca o use the remote repos processed by the request
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750152 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 20:53:37 +00:00
Britton Isbell 4af4093d4c Remove dup code for profile creation.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750144 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 20:33:54 +00:00
Britton Isbell a2b9aa8bf3 Cleaned up code - generics
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750104 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 19:08:28 +00:00
Benjamin Bentmann 688573f8ec o Restored backward-compat with maven-assembly-plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749999 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 13:17:45 +00:00
Jason van Zyl beedf0cf7b o restore profile manager location so that the site plugin works ...
o teach the resolution to understand when the root is local with a file present versus retrieving the root as well          


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749924 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 06:58:09 +00:00
Oleg Gusakov 645bfdaeda [MNG-3849] test harness
- legacy system UT placeholder

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749912 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 05:51:33 +00:00
Britton Isbell 1492907f1b Updated to use latest model-builder. Now detect most specialized model through method, not order of domain model list.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749870 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 01:05:58 +00:00
Britton Isbell c5938b5d12 Added unit test for mng-3900
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749774 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 21:52:33 +00:00
Britton Isbell d05439959c Added unit test for mng-3900
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749773 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 21:52:12 +00:00
Benjamin Bentmann 3e7be3ad1f o Restored isolation of model in forked lifecycle
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749738 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 20:39:51 +00:00
Britton Isbell c151f2925f Profile tests. Fixes for negation activation.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749717 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 19:57:01 +00:00
Benjamin Bentmann e417b541e0 o Fixed resolution of local projects from reactor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749687 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 18:42:34 +00:00
Benjamin Bentmann 0c988fc7a9 [MNG-4056] Relax resolution of active project artifacts from the reactor with regard to artifact type
o Merged from r749612

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749616 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 13:47:47 +00:00
Jason van Zyl 47971a16a1 o fixing failing project building tests as a result of consolidating the artifact resolution code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749460 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 22:40:17 +00:00
Jason van Zyl 613253dda7 o trying to use the request/result pattern everywhere
o remove another use of ResolutionGroup in the core
o remove all the deprecated methods in the resolver, we'll see what breaks and we'll restore in maven-compat


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749407 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 18:42:31 +00:00
Benjamin Bentmann 7c537105b2 o Fixed profile injection
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749386 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 17:58:15 +00:00
Benjamin Bentmann 30f5d777c1 o Generified code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749355 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 16:48:29 +00:00
Benjamin Bentmann 87f3f584aa o Fixed encoding error
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749308 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 13:46:51 +00:00
Benjamin Bentmann 494b72ea2c o Fixed NPE
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749293 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 12:37:54 +00:00
Benjamin Bentmann 797e071685 [MNG-2254] the encoding parameter in xml declaration of POM is ignored
o Added UT

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@749076 13f79535-47bb-0310-9956-ffa450edef68
2009-03-01 19:14:05 +00:00
Herve Boutemy c5571a0c78 used http://maven.apache.org/xsd/* for schema location
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748982 13f79535-47bb-0310-9956-ffa450edef68
2009-03-01 08:55:40 +00:00
Britton Isbell 74b67a85d7 Removed artifact resolver. Now just using the repositorySystem directly.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748908 13f79535-47bb-0310-9956-ffa450edef68
2009-02-28 19:22:02 +00:00
Britton Isbell aaf67164e0 Removed deprecated methods and uses of ProfileManager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748893 13f79535-47bb-0310-9956-ffa450edef68
2009-02-28 17:44:51 +00:00
Britton Isbell b487a2fd45 Moved profile classes into main project package.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748889 13f79535-47bb-0310-9956-ffa450edef68
2009-02-28 17:26:56 +00:00
Britton Isbell b216d61448 Got rid of the profile injector and advisor.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748871 13f79535-47bb-0310-9956-ffa450edef68
2009-02-28 16:01:20 +00:00
Britton Isbell 7040079ca9 Replaced the old profile injector code with new profile code. Merged project builders.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748609 13f79535-47bb-0310-9956-ffa450edef68
2009-02-27 17:28:54 +00:00
Britton Isbell 1bc43bf147 Removed profile builder.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748244 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 18:03:57 +00:00
Britton Isbell 29e80ac703 Removed support for profiles.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748226 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 17:46:01 +00:00
Britton Isbell c002a8d22e Removed remaining activator interfaces and uses.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748216 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 17:28:25 +00:00
Britton Isbell ed13b8620d Removed old profile activators.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748211 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 17:12:14 +00:00
Oleg Gusakov de818bc154 organize imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748039 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 06:43:01 +00:00
Oleg Gusakov 4e9c3171cb got rid of project in the API layer
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@748017 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 05:04:07 +00:00
Britton Isbell 55faf1270e Replaced old profile code with new.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747993 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 03:14:14 +00:00
Britton Isbell fac6e8c96d [MNG-4050] - Disabled empty URL check. Failure here is correct behavior, breaks backward compatibility.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747991 13f79535-47bb-0310-9956-ffa450edef68
2009-02-26 02:47:45 +00:00
Benjamin Bentmann dc43d5412f [MNG-4053] [regression] XML attributes in plugin configuration get duplicated to other elements in combination with plugin management
o Added UT

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747943 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 22:28:48 +00:00
Jason van Zyl a965b55cf4 o fixing the tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747925 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 21:10:31 +00:00
Jason van Zyl 7b3b37986c o fixing MavenMetadataSource
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747919 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 21:01:07 +00:00
Jason van Zyl af465cb137 o remove MavenMetadataSource's static call
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747913 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 20:40:28 +00:00
Jason van Zyl 5d70315512 o remove static method from MavenMetadataSource
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747910 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 20:35:29 +00:00
Jason van Zyl 5a0f6b79e2 o remove MavenProject imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747904 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 20:06:32 +00:00
Oleg Gusakov f4249d0a73 refactored the "single repository interface" to get rid of Project - replaced with sudo-repository interface to find reactor artifacts if any
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747901 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 20:01:52 +00:00
Jason van Zyl f2d3908905 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747888 13f79535-47bb-0310-9956-ffa450edef68 2009-02-25 18:28:39 +00:00
Jason van Zyl bb864d028b o remove another unused method from the repository system interface
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747665 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 05:28:17 +00:00
Jason van Zyl 47357091c5 o remove VersionRange from everywhere except the legacy repository system implementation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747662 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 05:22:41 +00:00
Jason van Zyl 4aea96aeb2 o use the artifact resolution request/result method to remove another couple methods from the repository system
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747658 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 04:55:59 +00:00
Jason van Zyl 54da5ce53e o omit the creation of deployment specific repositories, and uniqueVersion = false isn't going to matter in 3.x. everything will be unique to match an osgi versioning scheme. the dichotomy between unique sometimes, and no versions locally is a mess.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747652 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 04:07:40 +00:00
Jason van Zyl 2862516673 o trim out buildArtifactRepositories( Model )
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747639 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 01:27:15 +00:00
Jason van Zyl df4430644b o create a test repository system that has the "special" retrieve method. i'll turn this into a proper test but this
exposed a bug in the plexus test metadata generation -- the production component along with the test component are                       
  put in the generated metadata and the last definition wins which knocks out my test component    


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747618 13f79535-47bb-0310-9956-ffa450edef68
2009-02-25 00:04:51 +00:00
Jason van Zyl d4890344f8 o the problem with the test is the convoluted setup, but this will let the bootstrap carry on
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747602 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 23:11:35 +00:00
Jason van Zyl 781ab3f4c6 o use test annotations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747595 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 22:58:02 +00:00
Benjamin Bentmann 2ce2f9bf2a [MNG-2720] Multiproject dependencies not accurate for project.compileClasspathElements when run from root project
o Basically merged from r741841 but I opted to leave in the resolution from project directories since I am not sure whether this can safely be removed right now

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747588 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 22:38:35 +00:00
Benjamin Bentmann 38aaa7cc5a o Fixed dependency resolution
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747418 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 16:28:06 +00:00
Britton Isbell e668c88d56 Reenable classpath UT.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747413 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 16:18:34 +00:00
Britton Isbell 04475b691b Cleaned up rules. Removed mercury dependencies.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@747378 13f79535-47bb-0310-9956-ffa450edef68
2009-02-24 13:35:47 +00:00
Jason van Zyl 00c302e021 o checking in so that oleg and shane can see the changes, there are three failing tests. i'm fixing in the plane and will check in when i land
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746850 13f79535-47bb-0310-9956-ffa450edef68
2009-02-23 00:04:14 +00:00
Benjamin Bentmann 63c695adaa o Fixed artifact filter propagation
o Added task tag for bug in resolution of system-scope dependencies

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746832 13f79535-47bb-0310-9956-ffa450edef68
2009-02-22 21:58:50 +00:00
Benjamin Bentmann ca7b1b784b o Fixed test descriptors due to r746432
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746807 13f79535-47bb-0310-9956-ffa450edef68
2009-02-22 20:06:57 +00:00
Jason van Zyl b4257bad3b o use RepositorySystem and LegacyRepositorySystem
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746432 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 03:22:21 +00:00
Jason van Zyl 41001b509d o removed all but one component reference of the legacy artifact code in the plugin manager
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746430 13f79535-47bb-0310-9956-ffa450edef68
2009-02-21 02:46:14 +00:00
Jason van Zyl db63dc78c0 o taking more legacy artifact components out of the plugin manager
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746336 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 18:52:57 +00:00
Jason van Zyl f6d25b36f8 o remove legacy artifact component references from the embedder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746311 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 18:03:46 +00:00
Britton Isbell dd676fd685 Cleanup up some methods. Removed mixins from interfaces.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746288 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 16:33:41 +00:00
Jason van Zyl a8cd789425 o first push of a plug point for repository/transport in maven
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746285 13f79535-47bb-0310-9956-ffa450edef68
2009-02-20 16:27:27 +00:00
Britton Isbell c327c94443 Refactored out more uses of modello and moved classes from maven-project to maven-project-builder. Doing this so that maven-mercury will not have direct dependency on modello or maven model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746002 13f79535-47bb-0310-9956-ffa450edef68
2009-02-19 21:22:46 +00:00
Britton Isbell 73c0f41e3b Collapased Transformers into one. Extracted out some rules. Removed some references to Maven model in DomainModels to generalize. Removed Plugin mixins, which are no longer needed. Extension loading appears to be broken from refactoring. Need to fix this.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745712 13f79535-47bb-0310-9956-ffa450edef68
2009-02-19 03:00:52 +00:00
Benjamin Bentmann c53466f406 o Fixed regressions regarding profile de-/activation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745642 13f79535-47bb-0310-9956-ffa450edef68
2009-02-18 20:47:42 +00:00
Herve Boutemy 3d52a23b10 o upgraded Modello version to 1.0
o improved models to use Modello new features (merged from 2.1.x branch r745216)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745260 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 21:46:38 +00:00
Benjamin Bentmann 29df2bf1bf [MNG-3732] [regression] project.getActiveProfiles() has not the same behaviour
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745259 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 21:21:35 +00:00
Britton Isbell 7ed4efcec0 Updated profiles with collection information.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745244 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 20:30:03 +00:00
Britton Isbell 920e6b7f39 [MNG-4040] - Profile module inheritance.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745219 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 19:54:35 +00:00
Britton Isbell fd1d9855df [MNG-4034] - dependency version is not inherited from parent dependencyManagement
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745110 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 14:56:24 +00:00
Benjamin Bentmann fac6b97faf o Generified model/project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744572 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 21:49:23 +00:00
Benjamin Bentmann 90e6b3ecb8 [MNG-4034] dependency version is not inherited from parent dependencyManagement
o Added UT

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@744254 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 21:47:45 +00:00
Britton Isbell 9863957196 [MNG-3862] Remove all plugin configuration manipulation from the plugin manager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743225 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 04:56:35 +00:00
Benjamin Bentmann c303c49d71 [MNG-4027] [regression] Injection of dependencies from profiles crashes project builder
o Added UT

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@743083 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 20:20:47 +00:00
Britton Isbell 6032251645 Fixed path problem on unit test.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742760 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 22:00:52 +00:00
Jason van Zyl 1b36ff52dd o last bit i need to in trunk before merging to my branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742684 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 19:16:02 +00:00
Britton Isbell 778f044ed9 [MNG-2174] Profile bug dealing with dependencies : [MNG-3877] Reporting directory base aligned.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@742594 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 16:10:48 +00:00
Britton Isbell 2f8742ae19 [MNG-3995] Config property lost
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@741596 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 15:38:08 +00:00
Britton Isbell 247efed735 [MNG-3885] [MNG-4009] : Fixed problem of profile info in parents not being applied.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@741282 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 20:38:37 +00:00
Britton Isbell a3461e7fb0 [MNG-3803] - System properties in plugins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@740770 13f79535-47bb-0310-9956-ffa450edef68
2009-02-04 15:33:47 +00:00
Britton Isbell 4267580f46 MNG-4008: Multiple filters.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@740495 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 22:43:53 +00:00
Britton Isbell 5eaab27857 MNG-3976 - Raw Pom Retreival for Mercury.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@740434 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 20:48:07 +00:00
Britton Isbell adfb3ddeb9 Tests for MNG-1943 - interpolation in parent pom and MNG-3567 - pluginManagement inherited. Added additional methods to maven embedder for querying of plugin configs.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@740395 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 19:50:11 +00:00
Britton Isbell d1124333ad Merge: sisbell-plugin-manager. MNG-3631 - Get plugin config, including mojo descriptor info.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739970 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 12:02:44 +00:00
Jason van Zyl ed4f594ac4 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739478 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 01:06:48 +00:00
Jason van Zyl 13fa00ea3f [maven-release-plugin] prepare release maven-3.0-alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@739476 13f79535-47bb-0310-9956-ffa450edef68
2009-01-31 01:06:37 +00:00
Jason van Zyl 557f0a5373 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738777 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 07:13:04 +00:00
Jason van Zyl 7f54cfff61 [maven-release-plugin] prepare release 3.0-alpha-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738775 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 07:12:48 +00:00
Britton Isbell 650b6775d7 MNG-4013: Identical plugin executions are allowed in pom. This can cause failure in Maven 3 (since there is no longer cloning of maven project) on duplicate attached artifacts.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738374 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 05:44:29 +00:00
Britton Isbell 02c557c132 Minor updates to URI and joins.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738340 13f79535-47bb-0310-9956-ffa450edef68
2009-01-28 02:06:27 +00:00
Britton Isbell 93ec09c8a5 MNG-4010: Remove duplicate dependency exclusions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738256 13f79535-47bb-0310-9956-ffa450edef68
2009-01-27 21:48:22 +00:00
Benjamin Bentmann 5888994149 [MNG-3853] [regression] Distribution Management injected by profile is not reflected by MavenProject
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738128 13f79535-47bb-0310-9956-ffa450edef68
2009-01-27 16:18:32 +00:00
Benjamin Bentmann 3e6bc31a03 [MNG-4008] [regression] Build filters are collapsed
o Created UT from IT
o Started attempt to fix but apparently #set isn't enough to get the merging right

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738088 13f79535-47bb-0310-9956-ffa450edef68
2009-01-27 13:32:47 +00:00
Benjamin Bentmann ea2773c5eb [MNG-4007] [regression] Effective model contains paths with non-normalized file separators
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@738074 13f79535-47bb-0310-9956-ffa450edef68
2009-01-27 12:39:03 +00:00
Benjamin Bentmann eb08946492 [MNG-4003] Failed Unit Test on Building Plexus Velocity Component
o Added UT

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737894 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 22:11:15 +00:00
Britton Isbell d93227ad4a Plugin order unit test.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737813 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 20:23:15 +00:00
Britton Isbell 702ed0b0dd Fixed various ordering of element problems during plugin management joins.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737812 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 20:22:20 +00:00
Britton Isbell 1c2b979977 MNG-3887: order of plugin executions, MNG-3864: plugin configs are collapsed, MNG-4000: Plugin executions without id are lost
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737633 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 03:29:07 +00:00
Britton Isbell 379f614660 Fixed regression on MNG-3821. Should not add any subcontainers to the Model Container Info list, which is the one that the ModelTransformerContext uses. This will match ids for subcontainers from different parent containers.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737622 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 01:40:40 +00:00
Britton Isbell dc27facb7e Updated unit tests with assertions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737619 13f79535-47bb-0310-9956-ffa450edef68
2009-01-26 01:23:25 +00:00
Benjamin Bentmann 46ca604411 o Created UT for MNG-4000
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737172 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 20:11:45 +00:00
Britton Isbell 2d5cb58fe9 MNG-3998: Loss of execution configuration. MNG-3886: Goals order.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737156 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 19:24:27 +00:00
Benjamin Bentmann 8bc517009b o Created UT for MNG-2591
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737078 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 16:44:14 +00:00
Benjamin Bentmann 67c93459cc o Created UT for MNG-3836
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737071 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 16:28:48 +00:00
Benjamin Bentmann 2e4285f616 o Created UT for MNG-3864
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737066 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 16:06:37 +00:00
Benjamin Bentmann 04a020ea5a o Created UT for MNG-3827
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@737056 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 15:35:43 +00:00
Britton Isbell 34aceea2eb Added #set to URI configurations. Fixed problem where execution rule was joining all collections, not just goals.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736578 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 06:53:25 +00:00
Britton Isbell 496d8ffcb4 MNG-3997: If one ModelProperty property URI starts with another ModelProperty URI and both are empty and both are consecutive in the pom, then the first tag was not being closed on unmarshalling to XML.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736541 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 03:18:20 +00:00
Britton Isbell 15f10579d7 Fix: MNG-3965
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736386 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 19:31:48 +00:00
Britton Isbell 01e602351c Unit test for MNG-3965
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736373 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 18:53:00 +00:00
Britton Isbell b77af2e2e6 MNG-3985
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736294 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 11:58:50 +00:00
Britton Isbell 68d8ce9d34 MNG-3979.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736252 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 07:35:33 +00:00
Britton Isbell 04833ce768 MNG-3984
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736236 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 06:20:34 +00:00
Britton Isbell 036d5932e1 MNG-3937 - goals inheritance.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@736233 13f79535-47bb-0310-9956-ffa450edef68
2009-01-21 05:58:52 +00:00
Benjamin Bentmann 27d2e3c058 [MNG-2605] Profiles in profiles.xml are active by default
o Merged from r734803

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@734810 13f79535-47bb-0310-9956-ffa450edef68
2009-01-15 20:30:50 +00:00
Benjamin Bentmann 62e2d40504 [MNG-3988] [regression] Profiles.xml is not processed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@734142 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 14:33:39 +00:00
Britton Isbell 192af339c6 Final fix for the problem where snapshot plugin repositories from external profiles were not being used. Added code for setting remote repos to MavenProject, after profile injection.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733655 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 09:02:50 +00:00
Britton Isbell 9c67a22ddc Profile Injector was missing injecting of plugin repositories from settings file. Fixes this.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733648 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 08:22:15 +00:00
Britton Isbell a457427433 Fix: Different types of ID Model containers were being joined if their ids matched. Now we have one ID model container factory instance per type.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733637 13f79535-47bb-0310-9956-ffa450edef68
2009-01-12 07:00:09 +00:00
Benjamin Bentmann 8e3adc631c o Created UT for MNG-3979
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733262 13f79535-47bb-0310-9956-ffa450edef68
2009-01-10 10:46:00 +00:00
Britton Isbell e3bde472f9 Fix: MNG-3978
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733133 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 19:44:19 +00:00
Britton Isbell 647a0112cc Fix: MNG-3943
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733036 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 13:42:37 +00:00
Jason van Zyl fe6d32bd6c MNG-3961: reverted the addition and we'll deal with this later properly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732936 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 06:06:32 +00:00
Jason van Zyl cfbcba22a8 MNG-3586: system scope is working again, the IT does not appear to work on OS/X. Both 2.0.9 and this snapshot fail the first test of the IT. Brian helped me verify and on Windows with 2.0.9 and this snapshot both tests pass.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732929 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 05:34:14 +00:00
Britton Isbell c4782c4a38 Fix: 3944 - we can just use the existence of the project directory to determine whether it is in the build. This will be a contract of the setProjectDirectory method
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732683 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 11:12:11 +00:00
Britton Isbell f3c978e962 Fix: MNG-3938
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732344 13f79535-47bb-0310-9956-ffa450edef68
2009-01-07 14:03:06 +00:00
Jason van Zyl 481cde5756 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731333 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:28 +00:00
Jason van Zyl 6991c79e34 [maven-release-plugin] prepare release maven-3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731331 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:05 +00:00
Jason van Zyl cc38a455f7 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731271 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:29:07 +00:00
Jason van Zyl bab3480d4b [maven-release-plugin] prepare release 3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731269 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:28:42 +00:00
Benjamin Bentmann 970065b4bd [MNG-3424] Respect ordering of elements as given in POM
o Merged from r708871

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730079 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 09:33:02 +00:00
Britton Isbell 269c07916e Removing final from class. Tycho has a case where it needs to extend.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729996 13f79535-47bb-0310-9956-ffa450edef68
2008-12-29 21:04:50 +00:00
Benjamin Bentmann da66dd9fd4 [MNG-3933] Profiles.xml does not pickup OS family
Submitted by: Pawel Paprota

o Merged from r729785

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729787 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 22:09:20 +00:00
Benjamin Bentmann d639132f0b o Fixed file checks
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729517 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 17:55:13 +00:00
Benjamin Bentmann 4cc361f4ff o Created UT from MNG-3944
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729514 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 17:22:22 +00:00