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
Kenney Westerhof
Patrick Schneider
Carlos Sanchez Gonzalez
John Dennis Casey
Jason van Zyl
Andrew Williams
Joakim Erdfelt