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
39132c3e37
Merging from 391857 on branch. Fixes infinite recursion when expressions self-reference as part of a larger value.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@391858 13f79535-47bb-0310-9956-ffa450edef68
2006-04-05 23:57:52 +00:00
f810fd2ef2
Merging from 2.0.x branch, revIds:
...
- 391163:391165
- 391167
- 391176
- 391202
- 391326
- 391328:391329
- 391398
- 391402
- 391404
These are the changes for the 2.0.4 RC's.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@391687 13f79535-47bb-0310-9956-ffa450edef68
2006-04-05 17:43:35 +00:00
1c23ee16a4
[MNG-2054] make it0096 test the problem properly by going to enough depth. Rollback the "fix" for MNG-2130 as it didn't appear to be correct - it caused it0096, and it0099 passes anyway. I suspect there were other circumstances in the codebase causing 99 to fail at the time. You should not use a cached project for inheritence - it will accumulate inherited elements as was the case with MNG-2054.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@390133 13f79535-47bb-0310-9956-ffa450edef68
2006-03-30 13:54:30 +00:00
32d8679253
[MNG-2186] correct the regression of MNG-1927 from the solution of MNG-2124
...
The interpolator was only working based on an incorrect assumption for a limited set of expressions. This assumption is
guaranteed by the solution in the interim, until it can be properly reconsidered. The proper solution would be to not
cache an interpolated model, and to apply path translation and then interpolation after retrieving the cached model. However,
this will require some other related changes and should be planned for 2.1.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@390098 13f79535-47bb-0310-9956-ffa450edef68
2006-03-30 11:48:12 +00:00
cedf9e04bc
(Merging 389199:389201 from branch.)
...
o Cleaned up example in the comment-header of the plugin-metadata.mdo
o Added code to initialize a dummy Model instance in MavenProject, to avoid NPEs in things like getId().
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@389203 13f79535-47bb-0310-9956-ffa450edef68
2006-03-27 17:26:27 +00:00
43e640244e
(Merged from 386445.)
...
From the original revision log:
--------------------------------------
o Fixed formatting of lines in DefaultMaven to ensure that the output:
[INFO] ----------------------------------------------------------------------
doesn't exceed 80 columns, for readability.
o Fixed error reporting when building a POM's parent, in cases where:
- relativePath refers to a directory, but there is no pom.xml in that directory...in
this case, simply set the parentDescriptor == null, and allow repository resolution
to proceed.
- attempt to resolve parent POM from repository fails...in this case, we need to tell
the user which project specified the missing parent.
Neither of these had any impact on existing tests, and should only improve the user
experience. I don't believe they introduce any ambiguous behavior.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@386447 13f79535-47bb-0310-9956-ffa450edef68
2006-03-16 20:06:21 +00:00
bd6aa12253
(Merged from 384847.) [MNG-2136] Modifying <activeByDefault/> processing to only use profiles embedded in the POM as a basis for computing whether or not to activate.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384851 13f79535-47bb-0310-9956-ffa450edef68
2006-03-10 17:00:30 +00:00
fc77014cfe
(Merged from 384264.) [MNG-2124] Fixed interpolator to call the ReflectionValueExtractor method that prevents trimming the first expression token, since this is done in the interpolator itself. I'm still investigating whether this is going to break realignment of File instances to basedir during plugin parameter injection, but I've had to adjust it0088, since it is not handling project.build.directory as a File, but as a String.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384270 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 17:04:47 +00:00
d69fe06e8d
(Merged from 384104.) [MNG-2130] Re-adding the cache check for parent POMs in assembleLineage(..) when building in a multimodule scenario (if they're part of the same build, but not yet in the local repo) before checking the parent's relativePath value or hitting the repository system to look for them.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384108 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 03:29:41 +00:00
55dc9e4ccb
(Merged from 384102.) Fixing site URL calculation to disregard child module path adjustment. Second attempt.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384107 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 03:28:38 +00:00
063474e205
rolling back accidental commit.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384106 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 03:26:16 +00:00
fcb42e22ba
(Merged from 384102.) Fixing site URL calculation to disregard child module path adjustment.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@384105 13f79535-47bb-0310-9956-ffa450edef68
2006-03-08 03:09:44 +00:00
a693217497
(Merged from 383024.) Added unit test for case where parent path is empty and child adjustment contains .. at beginning.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@383027 13f79535-47bb-0310-9956-ffa450edef68
2006-03-04 04:28:03 +00:00
f3a9e38340
PR: MNG-2006
...
Replaced appendPath with a more robust implementation,
after discussing it with jdcasey.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382881 13f79535-47bb-0310-9956-ffa450edef68
2006-03-03 16:22:44 +00:00
4c85dfc331
Adding defensive code for one more place where cleanedPath length could cause a problem with string manipulation in appendPath(..).
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382861 13f79535-47bb-0310-9956-ffa450edef68
2006-03-03 15:27:25 +00:00
138d77d3b0
Fixing NPE in appendPath(..) when calculating '..' path adjustments.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@382849 13f79535-47bb-0310-9956-ffa450edef68
2006-03-03 15:08:31 +00:00
c5898ee466
Added TODO comment to the getModulePathAdjustment() method.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379575 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 20:25:02 +00:00
6fb187fa98
[MNG-2006] Fixing url rewriting for child POMs in sibling directories of parent POM (or anything other than subdir). First guess is based on parent POM file, but if parent POM is built from repository, will use the module artifactId as a basis instead.
...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379572 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 20:10:52 +00:00
Kenney Westerhof
Jason van Zyl
Brett Leslie Porter
Milos Kleint
John Dennis Casey
Carlos Sanchez Gonzalez