Commit Graph

439 Commits

Author SHA1 Message Date
Carlos Sanchez Gonzalez 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
John Dennis Casey 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
John Dennis Casey 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
Carlos Sanchez Gonzalez 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
Kenney Westerhof 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
Milos Kleint 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
Brett Leslie Porter 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
Milos Kleint 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
Carlos Sanchez Gonzalez 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
Kenney Westerhof 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
Kenney Westerhof 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
Kenney Westerhof 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
Jason van Zyl 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
John Dennis Casey 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
John Dennis Casey 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
Jason van Zyl 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
John Dennis Casey 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 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
John Dennis Casey 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
Brett Leslie Porter 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
Brett Leslie Porter 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
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey 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
Kenney Westerhof 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
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey b07d835b9c [MNG-2083] Correcting problem where cached projects result in missing downloadUrl for unresolvable artifacts.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379516 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 16:33:52 +00:00
Emmanuel Venisse eb5bb3d386 fix compilation error
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379501 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 15:51:55 +00:00
Emmanuel Venisse b9b9efbe4a merge from branch rev.379486
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379489 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 15:26:09 +00:00
Emmanuel Venisse 8a630687b7 merge from branch rev.379473
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379481 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 15:08:26 +00:00
Brett Leslie Porter b68c84b86d [MNG-1703] <pluginManagement><dependencies> is not propagated to child POMs
Submitted by: Edwin Punzalan


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379365 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 06:15:33 +00:00
Brett Leslie Porter faa5cf27cb [MNG-1856] fix inheritance of the distribution management section and add tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379324 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 03:57:23 +00:00
Brett Leslie Porter ad38e46b4b [MNG-1999] fix reporting > excludeDefaults inheritance
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379311 13f79535-47bb-0310-9956-ffa450edef68
2006-02-21 02:30:32 +00:00
John Dennis Casey 908d6624d4 [MNG-2078] Added <value>true</value> to profile activation for -DperformRelease system property in super-POM.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379288 13f79535-47bb-0310-9956-ffa450edef68
2006-02-20 23:44:08 +00:00
John Dennis Casey 602899a9f4 [MNG-2006] Changed the model inheritance assembler to allow the project builder to pass in a child path adjustment String, which is the module path of the child in the parent POM. This can be used to realign the URLs of the child POM in addition to simply appending the child path to the parent.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379247 13f79535-47bb-0310-9956-ffa450edef68
2006-02-20 21:52:03 +00:00
John Dennis Casey 5395710ce0 Merging in fix for MNG-2037.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379181 13f79535-47bb-0310-9956-ffa450edef68
2006-02-20 17:44:23 +00:00
Jason van Zyl 95189e189e [MNG-1980] Removing the duplicate ID, the reactor will catch duplicate IDs in a single build so it doesn't not need
to be checked for in the project builder. I have removed the model caching for now while I'm refactoring
           the project builder. The plan is to break the 1000+ lines down into its constituent components and use
           a pipeline to build up the project.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@371079 13f79535-47bb-0310-9956-ffa450edef68
2006-01-21 16:36:06 +00:00
Jason van Zyl 425a841a8b [MNG-1927] This adds the test mojos required to fix ${pom.build.*} expansion to full paths, the problem was the
new interpolator so the one from 2.0 was used and some envar handling was back ported. Unit tests
           have been added for envar handling as well as an IT. The maven-core-it script will now set
           an envar which is used in it0090.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@368108 13f79535-47bb-0310-9956-ffa450edef68
2006-01-11 19:36:37 +00:00
Brett Leslie Porter cc20bf6402 merge from branch maven-2.0.x @ rev 367900
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@367902 13f79535-47bb-0310-9956-ffa450edef68
2006-01-11 03:45:10 +00:00
Jason van Zyl c3c8fdb17a o [MNG-1927] Correcting an error I made with POMs not in the current working tree
o turn on it0088
o turn off it0086, and it0087 for now



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@367487 13f79535-47bb-0310-9956-ffa450edef68
2006-01-10 05:16:31 +00:00
Jason van Zyl f52a730b74 [MNG-1927] Fixing the ${pom.build.directory} path translation and interpolation so that an absolute path
is rendered.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@367457 13f79535-47bb-0310-9956-ffa450edef68
2006-01-10 01:45:00 +00:00
Brett Leslie Porter af1a99198f merge from branch maven-2.0.x, up to rev 365776
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@365790 13f79535-47bb-0310-9956-ffa450edef68
2006-01-04 01:14:17 +00:00
Brett Leslie Porter 9ae0914694 flip trunk to 2.1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356316 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 18:22:06 +00:00
John Dennis Casey 8a5fa61b17 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356099 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 01:41:09 +00:00
John Dennis Casey 9cf94e34f2 [maven-release-plugin] prepare release maven-2.0.1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356093 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 01:34:03 +00:00
Brett Leslie Porter 65acc94926 implement lax parsing of repository metadata XML files
PR: MNG-1788


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@355404 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 07:58:04 +00:00
John Dennis Casey 4e955c058a PR: MNG-1509
Submitted By: Bernd Bohmann
Reviewed By: John Casey

Applied patches. These patches added the OS activator to the component descriptor, fixed the activation implementation for it, and finally added a unit test for OS activation.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@355387 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 05:57:05 +00:00
John Dennis Casey c54202821e PR: MNG-1471
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied patch, with small logic fix. This patch will validate that if a systemPath is specified for a dependency, it is absolute. It's possible to use expressions in this path, but by the time it's validated in this step, those expressions will have been resolved.

My change was to add the same validation to managed dependencies.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354635 13f79535-47bb-0310-9956-ffa450edef68
2005-12-07 00:42:46 +00:00
John Dennis Casey 5b427cf076 PR: MNG-1630
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied patches, with minor changes.

These patches will ensure that the optional flag is passed on and inherited correctly when dealing with managed dependencies.

I changed the patches, in that I added a new createDependencyArtifact(..) method on ArtifactFactory, which will eliminate the need to call an older variant of the method by passing in a null value for the inheritedScope parameter.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354544 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 20:50:41 +00:00
John Dennis Casey 8e85652193 PR: MNG-1355
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied patch, with small logical fix (used getArtifactId() where getGroupId() was the intention).

This patch will guard against overwriting cached models in the project builder (check for pre-existing model in cache before adding), and will validate that a POM's parent has a different groupId:artifactId than the current POM.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354473 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 16:50:22 +00:00
John Dennis Casey a321da38d6 PR: MNG-1525
Submitted By: Edwin Punzalan
Reviewed By: John Casey

NOT applying this patch. I found a better solution that will factor the interpolation of the POM into a flexible utility in plexus-utils, and will allow introduction of envar resolution to the POM. It will also make interpolating the settings.xml and profiles.xml using any of a number of expression resolvers (using envar resolution only for now).

BTW, I tried using System.getenv(..) in JDK1.4, and it fails with java.lang.Error and a deprecation message. So, I'm using Edwin's code to extract the envars into a Properties object. We can improve this later.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354462 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 16:28:07 +00:00
John Dennis Casey 07c2c719a4 setting the artifact versionRange instead of the version itself for artifacts created as a result of relocation.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348467 13f79535-47bb-0310-9956-ffa450edef68
2005-11-23 15:49:36 +00:00
John Dennis Casey f936cfd675 Added code to assembleLineage(..) in DefaultMavenProjectBuilder that enforces the rule that parent POMs should have packaging == 'pom'.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345313 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 19:31:33 +00:00
John Dennis Casey 9584088c44 PR: MNG-1499
Submitted By: David Jackman
Reviewed By: John Casey

Applied. Thanks, David.

This patch makes the ordering of plugins deterministic after they are merged via inheritance or other mechanism.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345312 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 19:30:44 +00:00
John Dennis Casey e4af55175e Adding code to verify that parent-model's packaging == pom inside the assembleLineage() method.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345299 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 18:28:12 +00:00
John Dennis Casey ad2dd60452 PR: MNG-1394
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied. Thanks, Edwin!

NOTE: I added a debug statement in the case where relativePath refers to a directory, to tell the user that we're looking for 'pom.xml' in that dir.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345109 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 20:35:36 +00:00
John Dennis Casey 524ae18b88 PR: MNG-1404
Submitted By: David Jackman
Reviewed By: John Casey

Did not apply this patch. The typo fix in MavenMetadataSource was already fixed, and the xpp3 parse error in the DefaultMavenProjectBuilder didn't need to be wrapped in a ModelValidationResult...Added it to the exception message instead.

Still, thanks for isolating this code for reformatting, David.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345105 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 20:28:53 +00:00
John Dennis Casey b8b8e02e2b PR: MNG-1276
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied patch, with some modifications. Specifically, changed the validation message when <modelVersion>4.0.0</modelVersion> is not found, added reason to the warning line (no newlines here, just a hint at why it's wrong), and reformatted the debug output to be a bit more terse.

Thanks, Edwin.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345081 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 18:09:34 +00:00
John Dennis Casey ab27ae65a7 Decoupling ${version} expressions from POM version before resolving it to a buildnumber/timestamp on install or deploy.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344386 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 16:15:21 +00:00
John Dennis Casey eb1651be3c Fixing CI. Had to move the addPlugin(..) call back to its original spot, and expose a new method in MavenProject to inject PluginManagement info to a Plugin instance that's passed in as a parameter.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344294 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 02:38:33 +00:00
John Dennis Casey 56a2d33505 Forgot to open up these two methods via the interface...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@331872 13f79535-47bb-0310-9956-ffa450edef68
2005-11-08 19:48:57 +00:00
Brett Leslie Porter 2ed5c152fb PR: MNG-1217
Submitted by: Edwin Punzalan
Improve relocation error message

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330393 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 00:18:31 +00:00
John Dennis Casey 1be64231cf PR: MNG-1251
Submitted By: Jerome Lacoste
Reviewed By: John Casey

I did not apply this patch. A better solution was to initialize the artifact data a little more thoroughly, and only delegate those methods which must track changes to the main artifact (like version info, groupId, and artifactId...essentially, the things that determine how to locate metadata on the repository). For these delegating methods, I've disabled the corresponding setter methods with UnsupportedOperationException to indicate that these attributes must be managed via the main artifact, and why. The MavenProjectHelper will now lookup the proper ArtifactHandler for the given attachment type, and pass that on to the AttachedArtifact constructor also.

Jerome, thanks very much for the effort in exploring this issue. I appreciate the help.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330392 13f79535-47bb-0310-9956-ffa450edef68
2005-11-03 00:17:26 +00:00
John Dennis Casey 350076bdb9 Changing the location of the Artifact-cloning method from org.apache.maven.artifact.factory.ArtifactFactory.cloneArtifact(..) to org.apache.maven.artifact.ArtifactUtils.copyArtifact(..), which is now a static method. This separates the copy method from a specific artifact implementation, while at the same time avoiding embedding of this method in a component instance.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330342 13f79535-47bb-0310-9956-ffa450edef68
2005-11-02 20:10:40 +00:00
Brett Leslie Porter 259a63ba90 PR: MNG-1286
Submitted by: Lester Ecarma
Check exclusions against relocated artifacts

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330201 13f79535-47bb-0310-9956-ffa450edef68
2005-11-02 07:07:13 +00:00
John Dennis Casey 777d747d1a PR: MNG-1335
Added ArtifactFactory.cloneArtifact(..) +implementation, and made MavenProject(MavenProject) use that to create a copy of the project's artifact.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330080 13f79535-47bb-0310-9956-ffa450edef68
2005-11-01 15:55:45 +00:00
Brett Leslie Porter c456f94dfd add missing test file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330009 13f79535-47bb-0310-9956-ffa450edef68
2005-11-01 09:39:19 +00:00
Brett Leslie Porter 87dc3a9e16 PR: MNG-764
Submitted by: Edwin Punzalan
validation error if aggregator containing modules is not of the right packaging


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330003 13f79535-47bb-0310-9956-ffa450edef68
2005-11-01 07:37:57 +00:00
Emmanuel Venisse 6a40b74bca Show validation error message in debug mode
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@329821 13f79535-47bb-0310-9956-ffa450edef68
2005-10-31 14:20:38 +00:00
Jason van Zyl 34d4cc14fc o http://jira.codehaus.org/browse/MNG-1361
When the version or type are missing from a dependency a g:a string will
  be displayed so you can easily find the problematic dependency in question.
  


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@329419 13f79535-47bb-0310-9956-ffa450edef68
2005-10-29 14:31:44 +00:00
John Dennis Casey 51f23d93d9 Fixing NPE.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@328898 13f79535-47bb-0310-9956-ffa450edef68
2005-10-27 15:40:47 +00:00
Brett Leslie Porter 221ddfcd8b PR: MNG-1246
Submitted by: Allan Ramirez
add target/test-classes to the test classpath elements variable

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@328157 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 21:48:55 +00:00
Brett Leslie Porter 9deb44caaa update the descriptor after removing requirement
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327890 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 00:35:43 +00:00
Brett Leslie Porter d7c3795f1c remove unused code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327887 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 23:58:31 +00:00
Brett Leslie Porter 56f566e79e clean some imports and unused code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327885 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 23:50:38 +00:00
Brett Leslie Porter 772bf37124 PR: MNG-1223
error out if there are duplicate modules in the reactor


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327763 13f79535-47bb-0310-9956-ffa450edef68
2005-10-23 08:07:38 +00:00
Brett Leslie Porter f9e025dba8 merge from tag maven-2.0 up to rev 326624
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326633 13f79535-47bb-0310-9956-ffa450edef68
2005-10-19 18:31:30 +00:00
Brett Leslie Porter 63e7788945 try using repo1 again to see if it avoids the 503 errors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@326009 13f79535-47bb-0310-9956-ffa450edef68
2005-10-18 01:40:05 +00:00
Emmanuel Venisse 61aaa986c3 Add missing build method
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321513 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 23:39:30 +00:00
Brett Leslie Porter b4c041a567 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321042 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 07:26:39 +00:00
Brett Leslie Porter d783c5fc41 [maven-release-plugin] prepare release maven-2.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321040 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 07:15:39 +00:00
Brett Leslie Porter 79058b9388 bundle javadoc with java source releases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320991 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 03:50:52 +00:00
Brett Leslie Porter ed22c950e8 add new methods to type handler:
- isAddedToClassPath (default false)
- language (default "none")

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320986 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 03:32:41 +00:00
Brett Leslie Porter 1c7c34f027 more error diagnostics improvements
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320869 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 18:49:19 +00:00
Brett Leslie Porter 1499b5dcd3 PR: MNG-122
finish cleanup of resolution exceptions

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320748 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 12:16:43 +00:00
Brett Leslie Porter 1f97932050 PR: MNG-122
cleanup artifact/plugin not found exception

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320704 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 09:51:36 +00:00
Brett Leslie Porter 562facf5d2 PR: MNG-122
cleanup artifact metadata retrieval exceptions

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320701 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 09:13:11 +00:00
Brett Leslie Porter 864371e12d change main repo until we stabilise maven.org
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320693 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 08:39:01 +00:00
Brett Leslie Porter 04e02209b1 PR: MNG-122
use real exceptions for repository metadata

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320683 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 08:04:27 +00:00
Brett Leslie Porter 1901992586 PR: MNG-122
exception clean up phase 2

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320675 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 06:50:22 +00:00
Brett Leslie Porter 5de6418c69 PR: MNG-122
exception clean up phase 1

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@320668 13f79535-47bb-0310-9956-ffa450edef68
2005-10-13 05:30:22 +00:00