5fc3d35ce0
Removing maven-build-context, and replacing it with caching aspects for model-lineage stuff and project instances. Still needs caching for artifact resolution, and I have an aspect for this too, but it's not enabled yet, since it's still buggy.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@595215 13f79535-47bb-0310-9956-ffa450edef68
2007-11-15 05:37:55 +00:00
775ee6c5bb
Remove UnsupportedOperationExceptions, ignore invalid mutator methods so we will continue to derive information from the parent artifact where necessary and still work in the changing maven-artifact framework.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@594363 13f79535-47bb-0310-9956-ffa450edef68
2007-11-13 00:30:39 +00:00
fc28a41097
Moving a comment to a place where it will be more useful.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@594300 13f79535-47bb-0310-9956-ffa450edef68
2007-11-12 21:17:00 +00:00
1a286e2325
o adding PomMetadataSource for the changes to maven-artifact
...
o adding in all the artifact handlers here as they are Maven specific and don't belong in maven-artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@593857 13f79535-47bb-0310-9956-ffa450edef68
2007-11-11 08:10:35 +00:00
7946e31f40
reinstate the project cache, until we can find a better method of caching.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@593698 13f79535-47bb-0310-9956-ffa450edef68
2007-11-10 00:17:44 +00:00
cc47645398
Fixing a unit test.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@593694 13f79535-47bb-0310-9956-ffa450edef68
2007-11-09 23:35:24 +00:00
f1973980a5
Clean up the caching to use weak hashmaps, to conserve some memory in large builds.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@593287 13f79535-47bb-0310-9956-ffa450edef68
2007-11-08 20:15:20 +00:00
febce07c90
Adding more context information to existing exceptions, cleaning up construction in exceptions, and adjusting the inheritance hierarchy for exceptions to make them make a little more sense for error reporting. Also, adding improved (but not complete, yet) reporting for BuildFailureExceptions and ProjectBuildingExceptions, with some tests to make sure pertinent information is in the output.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@592859 13f79535-47bb-0310-9956-ffa450edef68
2007-11-07 19:24:30 +00:00
c141200c39
MNG-3274: Adding a flag to the metadata source so that at some point soon we can start turning on a strict mode that is just not going to allow a system without POMs.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@592260 13f79535-47bb-0310-9956-ffa450edef68
2007-11-06 03:59:37 +00:00
d206986023
[MNG-3272] Fixing URI construction for reading the super-POM in cases where maven is in a directory structure where there are spaces in the path.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@592157 13f79535-47bb-0310-9956-ffa450edef68
2007-11-05 21:40:11 +00:00
083a7dd4f0
fixed NPE in exception msg
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@591938 13f79535-47bb-0310-9956-ffa450edef68
2007-11-05 09:49:13 +00:00
fe8c4071a6
Switching back to selectively import extensions into a project-specific ClassRealm, except this time extension realms will be shared (the origin of the aforementioned imports) to conserve memory tied up by classloading. Similarly, plugin realms are managed using a key produced from g 🅰️ v of the plugin, plus the hashcode of all g 🅰️ v of the plugin-level dependencies aggregated into one string, to distinguish the deploy plugin 2.0 with no deps from the deploy plugin 2.0 with a plugin-level dep on wagon-webdav. Plugin realms have their parent realms managed by the pluginManager now prior to lookup or execution of the mojo instance, and PluginDescriptor.(classRealm|artifacts) attributes are set for each execution. Likewise, the MavenPluginCollector now tracks plugin descriptors with their version information included, instead of just using g:a.
...
Had to bump the plexus-container-default version up to alpha-36 to fix a problem in ClassicSingletonComponentManager. All realms for extensions, plugins, and projects (which contain only imports from extensions) are now managed by the MavenRealmManager.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@591391 13f79535-47bb-0310-9956-ffa450edef68
2007-11-02 16:44:00 +00:00
bcb1ebe0e0
use managed versions when resolving project dependencies from the plugin manager before executing a mojo, and include system path in system-scoped artifacts within the managed version map.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@588326 13f79535-47bb-0310-9956-ffa450edef68
2007-10-25 19:58:14 +00:00
324c1fcd1c
Add an artifact field to ArtifactMetadataRetrievalException to store the artifact causing the problem
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587996 13f79535-47bb-0310-9956-ffa450edef68
2007-10-24 20:06:08 +00:00
f4207feee2
Port to JDK 1.4
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587777 13f79535-47bb-0310-9956-ffa450edef68
2007-10-24 04:26:36 +00:00
880785ac04
Kept John's constructors but still use File/URL instead of String
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587693 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 23:26:30 +00:00
f3398365f1
Kept John's constructors but still use File/URL instead of String
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587691 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 23:23:19 +00:00
bfd273cb0f
Keep backwards compatibility by deprecating old methods
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587678 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 22:20:33 +00:00
e3dee74168
restoring these changes for backward compat.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587663 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 21:32:24 +00:00
90e62086d1
Forgot one.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587647 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 20:25:50 +00:00
936b87590b
Rollback changes generalizing exception ctors; this destroys traceability in the code for which combinations of exceptions are used in the system to produce an error.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587638 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 20:07:03 +00:00
a44c4c99c0
Simplify ProjectBuildingException constructors and store the original File/URI instead of a String
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587596 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 18:36:50 +00:00
487bf01ca2
Keep backwards compatibility by deprecating old methods
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587569 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 17:39:10 +00:00
2207068fe3
Keep backwards compatibility by deprecating old methods
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587567 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 17:38:12 +00:00
4aeb99b92b
Plugins now load per-project, which means they can have different plugin-level dependencies and configurations per-project, even if they're running in the same reactor.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@586515 13f79535-47bb-0310-9956-ffa450edef68
2007-10-19 16:02:31 +00:00
2ba9bbfd23
Fixing it0112 and it0115, and cleaning up extension isolation further. Also, adding a flag to tell whether an accompanying profiles.xml file is valid for any given POM file...when loaded from a repository (or stubbed), this flag should always be false.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@586061 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 18:38:06 +00:00
b3c99db34a
Fixing it0022
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585699 13f79535-47bb-0310-9956-ffa450edef68
2007-10-17 21:01:50 +00:00
64fdbabf5b
rolling back broken tests
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585548 13f79535-47bb-0310-9956-ffa450edef68
2007-10-17 16:01:23 +00:00
fe1e81cc25
MNG2025 patch to add encoding unit tests
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585318 13f79535-47bb-0310-9956-ffa450edef68
2007-10-17 01:35:37 +00:00
f6186d77c3
MNG2045 applying patch from Paul Gier to fix test jar dependencies from sibling projects.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585316 13f79535-47bb-0310-9956-ffa450edef68
2007-10-17 01:30:12 +00:00
eecea0895e
[MNG-2254] support XML file encoding when reading/writing settings and pom files
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585265 13f79535-47bb-0310-9956-ffa450edef68
2007-10-16 21:26:43 +00:00
0d0f7396b2
Cleaning up exception wrapping to allow better reporting of errors to end users. Also implementing the beginnings of a new error reporter, and bumping the version of plexus-container-default up to 1.0-alpha-33-SNAPSHOT to improve the accessibility to ClassRealm info for ComponentLookupException.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@584343 13f79535-47bb-0310-9956-ffa450edef68
2007-10-13 00:10:29 +00:00
ea31f3e3f7
unit test for parent POMs in repositories brought in by profiles from outside the pom.xml.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@583258 13f79535-47bb-0310-9956-ffa450edef68
2007-10-09 18:41:42 +00:00
616c6f1c0f
Fixed usage of repositories from active profiles in settings.xml for model-lineage building, which is fundamental to the build.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@583248 13f79535-47bb-0310-9956-ffa450edef68
2007-10-09 18:10:05 +00:00
e6a6476ad7
o cleaning up the project builder, deprecating maven 1.x repository support, it will be 3 years by the time this is actually released
...
so tough noogies for people still trying to use Maven 1.x repositories with Maven 2.x.
The next series of refactoring I will be doing with GIT.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@580609 13f79535-47bb-0310-9956-ffa450edef68
2007-09-29 17:25:19 +00:00
0c84fd3f65
Revert 578553
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@579086 13f79535-47bb-0310-9956-ffa450edef68
2007-09-25 06:27:01 +00:00
71aa8e7f51
Allow the managed dependencies of projects to be imported into the managed dependencies of other projects.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@578553 13f79535-47bb-0310-9956-ffa450edef68
2007-09-23 07:20:24 +00:00
a05e9f9884
o we don't need to run processProjectLogic on the super pom but we do need to make sure the plugin repositories are populated
...
for plugins like archetype which have no POM to start with but need repositories.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573736 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 22:29:34 +00:00
d72b8bc88a
o put the profile manager back into place as the project build is exposed in a ton of plugin. arrrg.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573718 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 21:29:08 +00:00
9c8903441f
o profiles are now decoupled from settings. so that i don't do this is one huge commit i need to move settings stuff into the core
...
while i transform the settings components to take a MavenSession. Any component executing within Maven should be able to use
a session. the session will contain everything required and any new component added to the system should only take the
session as a parameter. same pattern for all components. that's the goal. it will take a few hops.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573462 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 05:25:49 +00:00
c417b0c490
o dead import
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573455 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 04:44:46 +00:00
d5f5abeb57
o dead import
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573453 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 04:42:55 +00:00
d61face8fd
o removing dead class
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573452 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 04:42:43 +00:00
c8ab5fb076
o decoupled Settings from the profile manager
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573436 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 03:47:53 +00:00
f785811d57
[MNG-2061] DistributionManagement properties don't get copied in cloned executionProject while lifecycle fork
...
Submitted by: jan ancajas
Merged from: r573424 on maven-2.0.x branch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573426 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 01:42:39 +00:00
99bd5ac68f
o trying to get a grasp of the entire profile mechanism, especially in relation to how they deal with repositories.
...
here i am just collecting all the profile code into one place as it's scattered over several packages and is
hard to determine what the profile system as a whole is doing. the first task i would like to do is decouple
the profile system from the Settings. this can be done at the front-end i.e the profile information from Settings
can be fed into the profile manager up front.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573325 13f79535-47bb-0310-9956-ffa450edef68
2007-09-06 17:09:36 +00:00
cfa367dff1
MNG-2871: improve handling for EJB artifacts so that the build will work correctly without having to install the attached client JAR. This should be handled generally but we have no way of know what plugins product attached artifacts that should be handled this way.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572207 13f79535-47bb-0310-9956-ffa450edef68
2007-09-03 00:54:19 +00:00
0a36e611f2
o turn on envar support in 2.1, we just can't turn it off now at this point.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572190 13f79535-47bb-0310-9956-ffa450edef68
2007-09-02 23:21:23 +00:00
4005482797
MNG-2935: make sure build tanks if the settings are bad (user and global)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@572180 13f79535-47bb-0310-9956-ffa450edef68
2007-09-02 22:48:43 +00:00
f196fefba4
o as the profile has been removed from the super pom, we do not need to inject or process any profiles
...
related to it. this great simplifies a lot of code
o caching the super project in the default project builder as it's never going to change now as no profiles
are inject so it will only have to be constructed once an instance.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571910 13f79535-47bb-0310-9956-ffa450edef68
2007-09-02 00:56:30 +00:00
e0dbac1e24
o removing the release profile from the Super POM, this is for our particular flavor of releasing and the Super POM should stand as defaults for everyone using Maven. We should never again put profiles into the Super POM, it's just a bad idea. It forces us to inject the profile manager into the reading of the SuperPOM which is also bad.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571907 13f79535-47bb-0310-9956-ffa450edef68
2007-09-02 00:11:37 +00:00
884f70085e
o integrate changes made in maven-artifact for non fail-fast and request/result usage in the embedder for
...
use in IDE integration to provide as much feedback as possible.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@571862 13f79535-47bb-0310-9956-ffa450edef68
2007-09-01 19:23:17 +00:00
07c6e661f9
buildWithDependencies in the embedder shouldn't check for distribution status by default. Add test.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@570550 13f79535-47bb-0310-9956-ffa450edef68
2007-08-28 19:53:59 +00:00
1bb845492e
o now that i can get online, i can adjust for the movement of m-a
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@566927 13f79535-47bb-0310-9956-ffa450edef68
2007-08-17 06:01:00 +00:00
eb6f1b00dd
o merged r566641 from branch (added more warn stuff)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@566642 13f79535-47bb-0310-9956-ffa450edef68
2007-08-16 10:15:45 +00:00
b1517c1421
[MNG-3134] Use childPathAdjustment when calculating distributionManagement/site/url just like we do for url and scm/*Url.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@565777 13f79535-47bb-0310-9956-ffa450edef68
2007-08-14 14:41:16 +00:00
c08d1fa49b
Fixing some extraneous debug output.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@565775 13f79535-47bb-0310-9956-ffa450edef68
2007-08-14 14:38:16 +00:00
c5a74a8242
Fixing a few problems with the model-lineage builder, where it was stubbing models inappropriately and other minor logical problems.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@564761 13f79535-47bb-0310-9956-ffa450edef68
2007-08-10 20:49:14 +00:00
db3f9be45e
Fixing a problem where parent POMs that are not found during model-lineage discovery were not previously stubbed out, and caused the build to fail where it didn't in 2.0.7
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@564299 13f79535-47bb-0310-9956-ffa450edef68
2007-08-09 17:45:37 +00:00
5ec1f2d3cc
Fix it0088 / MNG-2124 etc.. (regression)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561173 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 22:49:24 +00:00
e87621fa6c
PR: MNG-3118
...
Description: test classes dir comes before classes dir
Submitted by: Paul Gier
Reviewed by: /me
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559042 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 13:14:50 +00:00
a7a3f55f18
fix the super-pom - this caused all the warnings about deprecated expressions. Should be pretty quiet now ;)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@553283 13f79535-47bb-0310-9956-ffa450edef68
2007-07-04 17:56:49 +00:00
ef22e43b64
reduced warning-noise: only print warnings for SNAPSHOT models, and removed deprecation for project.* expressions, see comment in code
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@553144 13f79535-47bb-0310-9956-ffa450edef68
2007-07-04 09:48:06 +00:00
5da9d28906
[MNG-2919] Add fix for depMan scope overwriting to the trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@552182 13f79535-47bb-0310-9956-ffa450edef68
2007-06-30 17:31:45 +00:00
99ba1e7e85
PR: MNG-2339 - ${project.*} evaluated badly
...
This commit makes sure that pom.* and project.* are resolved using the model reflector,
but if the prefix isn't pom or project, context and model properties are consulted.
If the value still isn't found, the model reflector is used as a legacy fallback,
and a warning is printed.
Also, project.* is deprecated in favour of pom.*.
TODO: env.*.
N.B.: there's loads of warnings about ${artifactId}. I can turn these off,
but if you specify -DartifactId on the commandline, all hell breaks loose.
See http://docs.codehaus.org/display/MAVEN/Refactoring+Interpolation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@549786 13f79535-47bb-0310-9956-ffa450edef68
2007-06-22 11:34:53 +00:00
aa9368044a
Fix test that fails on windows
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@547488 13f79535-47bb-0310-9956-ffa450edef68
2007-06-15 02:17:38 +00:00
182220d00c
Fixing per Mark Hobson's suggestion.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545519 13f79535-47bb-0310-9956-ffa450edef68
2007-06-08 14:26:57 +00:00
8ec3ac8a97
OPEN - issue MNG-2591: Plugins are merged incorrectly
...
http://jira.codehaus.org/browse/MNG-2591
Added tests to verify the XML attribute that switches merge-mode from replace/merge to append for children...then, fixed append semantics to force the dominant children (those given by the child POM, in this case) to be appended to those of the recessive/parent-POM configuration.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545315 13f79535-47bb-0310-9956-ffa450edef68
2007-06-07 21:11:29 +00:00
bfce771633
Replacing JDK 1.5 api call.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@545241 13f79535-47bb-0310-9956-ffa450edef68
2007-06-07 16:54:58 +00:00
cc5f2f954b
Reverting the package changes
...
Issue id: MNG-2943
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543753 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 15:35:57 +00:00
6d3984551c
OPEN - issue MNG-2671: Parent/modules relative file path compression
...
http://jira.codehaus.org/browse/MNG-2671
Applied, with small changes so it will not swallow exceptions. If this causes a problem with broken symlinks, we can address that later.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543682 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 00:43:15 +00:00
53acf2858f
[MNG-2943] Avoid using package names used in other artifacts: org.apache.maven
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543670 13f79535-47bb-0310-9956-ffa450edef68
2007-06-02 00:05:35 +00:00
f136fa7ace
OPEN - issue MNG-2619: building from the middle pom of a (parent,child,grandchild) heirarchy fails
...
http://jira.codehaus.org/browse/MNG-2619
Added tests from the included patch. Main code didn't apply any longer, but this shows that the new ModelLineageBuilder code solves the problem. Will apply the original patch to the 2.0.x branch...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543637 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 22:10:03 +00:00
1a0b546e7f
MNG-2690 Some maven-project tests fail under maven-surefire-plugin 2.3
...
Submitted by: Mark Hobson
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543614 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 21:01:48 +00:00
b4f380dd3c
MNG-2683 Better exception messages
...
Submitted by: Mark Lundquist
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543604 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 20:46:48 +00:00
5401fb4c64
OPEN - issue MNG-2784: Multiple executions of the same plugin at the same life cycle phase in a multi-module profile mixed up
...
http://jira.codehaus.org/browse/MNG-2784
NOT applying this patch, as there is a much simpler solution. The processing is currently in the correct order, so all we need to do is make sure the Map.values() method retains this order. Therefore, I changed the Map implementation for plugin executions to LinkedHashMap.
I've also added a test for this issue...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543599 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 20:35:44 +00:00
09553c6ff3
REOPENED - issue MNG-1910: Allow jdk 1.4+ as profile requirement
...
http://jira.codehaus.org/browse/MNG-1910
Applied.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543579 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 19:12:58 +00:00
e12fbd08e9
o fix typo
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543382 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 04:19:59 +00:00
6cb79190cd
MNG-2813: Fix OutOfMemoryError when using profiles and pom inheritance
...
Submitted by: Jochen Kuhnle
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543373 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 03:11:29 +00:00
82146b83f0
MNG-2921 Fixing the ejb-client dependency problem introduced by MNG-1577
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543349 13f79535-47bb-0310-9956-ffa450edef68
2007-06-01 01:31:29 +00:00
a55e9c24fe
Making resolution of artifacts from the reactor work with classifiers (hopefully).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@541942 13f79535-47bb-0310-9956-ffa450edef68
2007-05-26 21:22:10 +00:00
3481d0f425
o need mr wagon
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@532025 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 17:42:59 +00:00
40e2c95113
artifact-manager is no longer used
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@532008 13f79535-47bb-0310-9956-ffa450edef68
2007-04-24 16:59:28 +00:00
05986fc6f2
o remove maven-artifact-test, not used anywhere
...
o fix shade plugin so the new uber is produced
o allow plexus-utils back into the mix
o take out the dep.xml assembly descriptor as shade is making the uber jar now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@531259 13f79535-47bb-0310-9956-ffa450edef68
2007-04-22 19:58:09 +00:00
04d3f322fe
Add javadocs for getArtifacts and getDependencyArtifacts
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@521825 13f79535-47bb-0310-9956-ffa450edef68
2007-03-23 17:47:47 +00:00
05162de0d0
o bits for mng-1577
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@521543 13f79535-47bb-0310-9956-ffa450edef68
2007-03-23 00:11:31 +00:00
17a7a726c5
MNG-2868 The behavior in MNG-1577 is now available on the trunk
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@520923 13f79535-47bb-0310-9956-ffa450edef68
2007-03-21 16:00:17 +00:00
34bf67ecf1
Merging revIds: 515814:520600 from 2.1-lifecycle-refactor branch to trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@520609 13f79535-47bb-0310-9956-ffa450edef68
2007-03-20 21:40:59 +00:00
7d17a9c108
MNG-2877 resolve attached artifacts from reactor that are not in repo
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@519740 13f79535-47bb-0310-9956-ffa450edef68
2007-03-18 23:40:05 +00:00
f03d8d662f
o testing repeatedly with an empty repository
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@516820 13f79535-47bb-0310-9956-ffa450edef68
2007-03-11 00:48:53 +00:00
badcd2287f
o roll back to wagon beta-2 to fix the rash of problems with m2eclipse plugin
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@516654 13f79535-47bb-0310-9956-ffa450edef68
2007-03-10 05:38:50 +00:00
94ba392461
Copy the ArtifactMetadataSource to use the 'default' hint as well as the, deprecated, 'maven' one. This will mean that with the new plexus components don't have to hint to get the default impl
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@514652 13f79535-47bb-0310-9956-ffa450edef68
2007-03-05 11:48:15 +00:00
1f9709694d
More role-hint fixes
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@514019 13f79535-47bb-0310-9956-ffa450edef68
2007-03-02 23:43:49 +00:00
cf8cb43998
use the correct role hint
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513881 13f79535-47bb-0310-9956-ffa450edef68
2007-03-02 18:41:39 +00:00
cd8c1d61a2
Fix unit tests.
...
The order of the tests is important since the same groupId/artifactId/version
combinations are used in different local repositories in the tests, containing
different poms. The DefaultMavenProjectBuilder caches models with g🅰️ v,
so it can serve a model from another local repo.
Solved this by changing groupId's in the poms and repositories so they don't
conflict.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513720 13f79535-47bb-0310-9956-ffa450edef68
2007-03-02 12:05:15 +00:00
7ddabf5a2d
Remove svn:executable from pom and java files
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513701 13f79535-47bb-0310-9956-ffa450edef68
2007-03-02 10:55:05 +00:00
3dcf943dfc
updating license headers
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513038 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 22:54:19 +00:00
fb03e03672
o optimizing imports, trying to clean up settings use so i can track them down and purge them
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512775 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 14:47:51 +00:00
d3deb61421
o remove maven-tools and put the utility code in the only module that now depends on it, maven-project
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512763 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 14:20:13 +00:00
f37ff7ef4d
o use FileUtils for copying the POM.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512749 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 13:17:02 +00:00
7d69da0eea
o unrequired cast
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512552 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 01:30:44 +00:00
f4b3eedc8a
Fixing some lingering dependency ordering problems from artifact resolution, and adding settings-builder advice to the CLI.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512339 13f79535-47bb-0310-9956-ffa450edef68
2007-02-27 17:47:30 +00:00
b8289153a1
Adding read/writeSettings() api to the maven-tools and the embedder along with unit tests in each place, and adding a cache object for the settings that is based on the build-context.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@510335 13f79535-47bb-0310-9956-ffa450edef68
2007-02-22 01:01:54 +00:00
2b95701a5c
Rearranging project-builder caching so it's done externally and available for use in the model-lineage builder and during artifact resolution as well.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@509692 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 18:09:53 +00:00
b994579133
Bumping plexus-utils dep to 1.4.1-snapshot, and commenting out some of the debug statements from the default model lineage builder, to limit the debug output on a build back to some sane[r] level.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@506742 13f79535-47bb-0310-9956-ffa450edef68
2007-02-12 23:33:43 +00:00
fae3cb98c8
MNG-2820 Leave the POM intact which means no interpolating and no license header whacking
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@506108 13f79535-47bb-0310-9956-ffa450edef68
2007-02-11 19:52:44 +00:00
33f23db7de
* Migrating to wagon-manager 1.0-beta-3-SNAPSHOT
...
* Created org.apache.maven.artifact.manager.ArtifactManager
* Deprecated org.apache.maven.artifact.manager.WagonManager in favor of new ArtifactManager
* Updated the rest of maven to utilize this new ArtifactManager.
* The default wagon providers list is now managed from within wagon-manager's dependency list.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@505520 13f79535-47bb-0310-9956-ffa450edef68
2007-02-09 21:53:27 +00:00
ad35b458bf
Fixing project-loading to process inheritance in the correct direction, and finishing support for custom profile activators...also moving /project/build/extensions handling out to a separate extension scanner component, for later reuse elsewhere.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@501186 13f79535-47bb-0310-9956-ffa450edef68
2007-01-29 21:26:30 +00:00
08825262be
Adding custom profile activator support, using the <custom/> tag in the <activation/> section of a profile.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@499911 13f79535-47bb-0310-9956-ffa450edef68
2007-01-25 19:02:16 +00:00
8831e55e78
Fixing project inheritance and profile-injection now that we've moved to the model lineage builder. Iteration was backward.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@499603 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 22:53:00 +00:00
dfc4a10c68
Adding the notion of a build-context, and several build-context classes that can be used: ProjectBuildContext, which contains lineage and current-project info, ExecutionBuildContext, which contains the information in the original MavenExecutionRequest, and SystemBuildContext, which contains things like System properties...these use the BuildContextManager to store and retrieve their info from the core container's Context object.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497911 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 19:15:18 +00:00
87226eab2e
Stop re-applying profiles to models that have already had profiles applied.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497556 13f79535-47bb-0310-9956-ffa450edef68
2007-01-18 20:07:23 +00:00
3e3b0fd239
Fixing caching of Model files, in case it's brought in via reactor and the current relativePath of a parent is wrong...it can still be found, as required by IT0103.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@497554 13f79535-47bb-0310-9956-ffa450edef68
2007-01-18 19:58:42 +00:00
c7738df560
Splitting model-lineage loading and profile-application out into separate components...profile-application, so the model-lineage builder can run properly, and the model-lineage builder, so we can pre-scan for models with extensions that may contain things like profile activators, which would be used during project-loading.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@496910 13f79535-47bb-0310-9956-ffa450edef68
2007-01-17 01:36:07 +00:00
c416a33a4c
[MNG-2745,MNG-2753] more completely remove env vars - no point in populating them if they are never used
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494710 13f79535-47bb-0310-9956-ffa450edef68
2007-01-10 04:40:39 +00:00
bd608ed4cf
remove env var tests since the handling was removed. Note that the functionality needs to be re-enabled via the CLI: see MNG-2753
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494704 13f79535-47bb-0310-9956-ffa450edef68
2007-01-10 04:32:43 +00:00
bf7d7a01a0
MNG-2746 fixing an obvious NPE when parent path is a directory and pom is not found. Also reported in MNGECLIPSE-184 and CONTINUUM-1000
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494085 13f79535-47bb-0310-9956-ffa450edef68
2007-01-08 15:01:21 +00:00
a966656f38
o Code from netbeans integration that will write out changes to a model and preserve the existing structure for the most part.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@493824 13f79535-47bb-0310-9956-ffa450edef68
2007-01-07 19:53:06 +00:00
2327f170e6
Added a note on project sorting and cycles.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@489114 13f79535-47bb-0310-9956-ffa450edef68
2006-12-20 15:30:10 +00:00
cc5a658907
o update the deps to the new releases of wagon wheels and plexus
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@486535 13f79535-47bb-0310-9956-ffa450edef68
2006-12-13 07:42:00 +00:00
8b0f212ffa
fix a crappy error message. It said that a POM referenced itself, when the problem was that the expression referenced itself.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@475132 13f79535-47bb-0310-9956-ffa450edef68
2006-11-15 06:08:40 +00:00
edde7a1b58
PR: MNG-2603
...
Revert accidental commit on ProjectSorter.java in revision r462868.
I locally modified the ProjectSorter to exclude the build plugins from the DAG
to fix some cycles in the reactor when importing the entire trunk (components,
shared, scm, plugins etc..) in Eclipse. This was never meant to be committed.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@463922 13f79535-47bb-0310-9956-ffa450edef68
2006-10-14 12:50:36 +00:00
f286c9fbc6
Create artifact directory as the Get task doesn't create them
...
NOTE: accidently commited other files too. Only build.xml was
supposed to be committed.
- it0074/pom.xml: leave as is; it fixes a <depedencies> section;
- maven-plugin-tools-java/pom.xml was fixed by jason at revision 462919;
- ProjectSorter.java is fixed in revision 463922;
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@462868 13f79535-47bb-0310-9956-ffa450edef68
2006-10-11 17:20:57 +00:00
7286e853ae
put a resolved parent artifact in the final mavenproject instance
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@448095 13f79535-47bb-0310-9956-ffa450edef68
2006-09-20 06:37:40 +00:00
5d99b35cfe
[MNG-1797][MNG-2420] Fixing exclusions that bleed over into other dependencies, and modifying DefaultProfileManager to (a) deprecate constructor that takes Settings but no properties, and (b) add a constructor that takes Settings and properties.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@438189 13f79535-47bb-0310-9956-ffa450edef68
2006-08-29 20:17:14 +00:00
136739b708
Changing constructor with Settings back to public.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@438132 13f79535-47bb-0310-9956-ffa450edef68
2006-08-29 17:57:46 +00:00
7c43aa27d7
Merging fix for loss of dependency ordering from branch.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@430573 13f79535-47bb-0310-9956-ffa450edef68
2006-08-10 22:43:48 +00:00
d70e316446
Removing incorrect FIXME comment and returning import ordering to normal.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@426114 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 16:08:51 +00:00
75c7380801
[MNG-2302] Added code to nullify parent's descriptor location in cases where the parent MavenProject instance was loaded from the repository. In these cases, the descriptor location value is incorrect anyway, and it was causing an incorrect null return value for MavenProject.getModulePathAlignment(..), which in turn produces an incorrect URL path calculation for multi-tiered inheritance where the top tiers are resolved from the repository.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@426112 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 16:02:26 +00:00
3e8d1f934c
[MNG-2314] Added unit tests to verify that this issue cannot be reproduced.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@425924 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 01:00:03 +00:00
5d50ceac1f
[MNG-1891] Fixed plugin ordering in profile injection AND model inheritance, to be consistent and to preserve as much ordering information as possible, to make plugin ordering more predictable. Also added several unit tests to express the problem(s) and verify the solutions. Ordering is in javadoc comments, and should be added to the plugin-configuration documentation on the site.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@425919 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 00:36:31 +00:00
bf2a316d91
[MNG-1562] Added unit test confirming the necessity of groupId:artifactId:type for non-jar dependency references. Will update site documentation as well.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@425863 13f79535-47bb-0310-9956-ffa450edef68
2006-07-26 21:56:35 +00:00
4028c67c5a
[MNG-1697] Added a new null check and unit test to addEdgeWithParentCheck(..), just to make sure this is fixed. (I think it was already fixed, but this is just to be extra sure.)
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@425843 13f79535-47bb-0310-9956-ffa450edef68
2006-07-26 21:23:51 +00:00
23f64db797
Removed code duplication
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@421968 13f79535-47bb-0310-9956-ffa450edef68
2006-07-14 17:55:57 +00:00
0712f84f81
Adding tests to verify that super-POM is injected with active profiles when used in standalone fasion.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@421390 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 19:43:54 +00:00
cc859f5cfb
[MNG-2221] Fixing caching of merged plugins to prevent them from appearing/executing twice in the resulting child POM. See two new unit tests in ModelUtilsTest for proof.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@421309 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 16:32:39 +00:00
f7a33ca068
POM cleanup, remove inherited fields, added license and xsd
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@419880 13f79535-47bb-0310-9956-ffa450edef68
2006-07-07 12:23:28 +00:00
724e4f39f4
PR: MNG-1245
...
Version not taken into account for reactor projects.
Artifacts for reactor projects get replaced by a wrong version local repo artifact.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@419624 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 17:28:00 +00:00
c9be3d3c40
added comment about System.getProperties
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@418629 13f79535-47bb-0310-9956-ffa450edef68
2006-07-02 17:53:27 +00:00
48bfb8d85b
fix formatting
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@417678 13f79535-47bb-0310-9956-ffa450edef68
2006-06-28 06:07:32 +00:00
d7a1ba698d
MNG-2364 make sure the system properties are passed from the execution/embed requests, to make the on-property profile activation work in embedded environment
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@415000 13f79535-47bb-0310-9956-ffa450edef68
2006-06-17 06:46:58 +00:00
f925bdc3a6
[MNG-2357] Refactor code
...
Submitted by: Jerome Lacoste
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@413091 13f79535-47bb-0310-9956-ffa450edef68
2006-06-09 17:00:43 +00:00
45748e167d
PR: MNG-2293
...
Submitted by: Jerome Lacoste
Reviewed by: Kenney Westerhof
Modifications: minor cosmetic changes.
Add an 'implementation' parameter to @parameter annotation, so
a default implementation can be specified in Mojo's in case the Mojo parameter
is an interface.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@413054 13f79535-47bb-0310-9956-ffa450edef68
2006-06-09 14:30:57 +00:00
c2296be700
PR: MNG-2309
...
Profiles are activated in random order so overriding settings doesn't produce
the same results on all environments.
Use a LinkedHashMap for the profilesById to preserve profile ordering.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@408021 13f79535-47bb-0310-9956-ffa450edef68
2006-05-20 16:26:42 +00:00
315ddee9da
added a comment on strange code
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@399728 13f79535-47bb-0310-9956-ffa450edef68
2006-05-04 15:22:10 +00:00
b8ec74d65d
update version of maven-settings
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@394317 13f79535-47bb-0310-9956-ffa450edef68
2006-04-15 15:55:06 +00:00
b22b0cc9e2
Merging 393053 from maven-2.0.x branch, to fix some jdk5 method calls that crept in.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@393059 13f79535-47bb-0310-9956-ffa450edef68
2006-04-10 20:48:10 +00:00
8937fd353d
Merging 393029 from branch, to fix the case where -DperformRelease=true injects additional plugins into the test POMs.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@393031 13f79535-47bb-0310-9956-ffa450edef68
2006-04-10 19:32:35 +00:00
94e440000d
o merge of the maven-embedder-refactor branch into the trunk
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@392327 13f79535-47bb-0310-9956-ffa450edef68
2006-04-07 15:57:09 +00:00
ea8e24b1fb
Merging 391974 from branch to fix IT errors introduced when attempting to fix the case where a resolved POM expression contains a substring referencing that POM element. Two-expression cycles are still possible.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@391988 13f79535-47bb-0310-9956-ffa450edef68
2006-04-06 14:04:08 +00:00
John Dennis Casey
Jason van Zyl
Brian E Fox
Carlos Sanchez Gonzalez
Herve Boutemy
Ralph Goers
Brett Leslie Porter
Vincent Siveton
Kenney Westerhof
Patrick Schneider
Andrew Williams
Joakim Erdfelt
Fabrizio Giustina
Milos Kleint