Commit Graph

931 Commits

Author SHA1 Message Date
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