Commit Graph

5820 Commits

Author SHA1 Message Date
Carlos Sanchez Gonzalez 3c0f795c34 Fix bugs in previous commit
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@570889 13f79535-47bb-0310-9956-ffa450edef68
2007-08-29 18:24:22 +00:00
John Dennis Casey 4ea3730eb8 Removing classworlds version so it will be given by the dependencyManagement section at the maven-level.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@570838 13f79535-47bb-0310-9956-ffa450edef68
2007-08-29 15:32:09 +00:00
Carlos Sanchez Gonzalez 591efea5e8 Gather more information on settings validation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@570805 13f79535-47bb-0310-9956-ffa450edef68
2007-08-29 13:26:29 +00:00
Carlos Sanchez Gonzalez 50b73df74b improve exception message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@570791 13f79535-47bb-0310-9956-ffa450edef68
2007-08-29 12:53:18 +00:00
Carlos Sanchez Gonzalez 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
Kenney Westerhof 50c099ba54 attach the shaded artifact instead of replacing it. When embedding maven or using another p-c-d or any other lib, those classes will be duplicated in the classpath, wreacking havoc.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@570281 13f79535-47bb-0310-9956-ffa450edef68
2007-08-28 00:41:25 +00:00
Kenney Westerhof 454114df03 Set a name for the container
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@570277 13f79535-47bb-0310-9956-ffa450edef68
2007-08-28 00:27:39 +00:00
Brett Leslie Porter 959ce3f30f [MNG-3141] only canonicalize paths on Windows (to prevent path length issues, but not obliterate symlinks on unix)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@567954 13f79535-47bb-0310-9956-ffa450edef68
2007-08-21 04:54:04 +00:00
Brett Leslie Porter ca0450d220 ignore
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@567953 13f79535-47bb-0310-9956-ffa450edef68
2007-08-21 04:51:47 +00:00
Brett Leslie Porter 7a8dd28f80 reformat before patch
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@567948 13f79535-47bb-0310-9956-ffa450edef68
2007-08-21 04:37:49 +00:00
Jason van Zyl 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
Jason van Zyl ddb8bb1f49 o maven-artifact deployed to the snapshot repository and this code is no more
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@566870 13f79535-47bb-0310-9956-ffa450edef68
2007-08-16 21:55:10 +00:00
Vincent Siveton 53a4546af0 o added new license header
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@566869 13f79535-47bb-0310-9956-ffa450edef68
2007-08-16 21:46:30 +00:00
Vincent Siveton 785e6819bd o merged r566867 from branch (removed useless copyright)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@566868 13f79535-47bb-0310-9956-ffa450edef68
2007-08-16 21:44:42 +00:00
Vincent Siveton 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
John Dennis Casey 8a889ceadf Changing internal setBaseVersion(..) calls to setBaseVersionInternal(..) to prevent side effects with extending implementations that disallow setting versions directly (as in maven-project).
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@566205 13f79535-47bb-0310-9956-ffa450edef68
2007-08-15 14:51:59 +00:00
Carlos Sanchez Gonzalez d632bc8a07 Add a check for null files in system dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@566135 13f79535-47bb-0310-9956-ffa450edef68
2007-08-15 12:55:09 +00:00
Carlos Sanchez Gonzalez 8df4a9dab7 Add resolved artifacts to MutipleArtifactsNotFoundException
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@566134 13f79535-47bb-0310-9956-ffa450edef68
2007-08-15 12:54:19 +00:00
John Dennis Casey 06979601c0 [MNG-2961] WOO HOO! Finally fixed this horrible behavior of having to call isSnapshot().
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@565901 13f79535-47bb-0310-9956-ffa450edef68
2007-08-14 20:44:16 +00:00
Carlos Sanchez Gonzalez 600961ed03 Add javadoc
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@565838 13f79535-47bb-0310-9956-ffa450edef68
2007-08-14 17:10:10 +00:00
John Dennis Casey beb9d73169 [MNG-3047] Applying broader fix for comparisons and hashCode generation to ArtifactVersion.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@565824 13f79535-47bb-0310-9956-ffa450edef68
2007-08-14 16:25:41 +00:00
John Dennis Casey 8795579469 [MNG-3062] Provide access to MojoExecution instance from plugin parameter expression ${mojoExecution}.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@565811 13f79535-47bb-0310-9956-ffa450edef68
2007-08-14 15:33:33 +00:00
John Dennis Casey 219afd51b1 [MNG-3046] Applying patch to fix compareTo when buildNumber == 0.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@565809 13f79535-47bb-0310-9956-ffa450edef68
2007-08-14 15:21:41 +00:00
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey 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
John Dennis Casey 1d58a421ce Removing snapshot repo.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@564423 13f79535-47bb-0310-9956-ffa450edef68
2007-08-09 23:35:28 +00:00
John Dennis Casey 0d38b157b0 Adding new assembly descritor to assemble a repository containing the dependencies for maven (pre-shaded), and adding a profile to the POM to allow us to trigger the creation of this new assembly. This is valuable for plugins and other components that list one or more maven artifacts as dependencies, so they can be built without rebuilding all of maven.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@564306 13f79535-47bb-0310-9956-ffa450edef68
2007-08-09 17:48:21 +00:00
John Dennis Casey a15f547664 Commenting out most of the make-assembly target, since it's now done as part of the normal build...there's an echo statement detailing this now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@564303 13f79535-47bb-0310-9956-ffa450edef68
2007-08-09 17:46:33 +00:00
John Dennis Casey b2e2644f83 Setting up a deployment config for snapshots of maven.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@564301 13f79535-47bb-0310-9956-ffa450edef68
2007-08-09 17:45:56 +00:00
John Dennis Casey 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
Kenney Westerhof 711eb8c416 Add get/setParentContainer to the configuration, and use it in
the embedder.

If the classrealm that's passed in has a parent realm, 
then only the resources from the realm are scanned (getRealmResources).
This was done to re-use components from parent realms.

However, when embedding maven within another plexus container,
providing a new dummy classworld with the current classloader
as the parent, no components will be found. Since there's no 
parent container, it won't be checked for components.

So, allowing a parent realm to be set in classworlds also
requires a parent container to be set, so that when no components
are found (since they're present in the parent container),
there is a parent container available to delegate lookups to.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@563173 13f79535-47bb-0310-9956-ffa450edef68
2007-08-06 15:38:57 +00:00
Dennis Lundberg 0ceae1b648 o Minor adjustment to error message.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@562096 13f79535-47bb-0310-9956-ffa450edef68
2007-08-02 12:34:04 +00:00
Jason van Zyl b01b42f89e o using container configuration to setup plexus container
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561204 13f79535-47bb-0310-9956-ffa450edef68
2007-07-31 01:14:42 +00:00
Jason van Zyl 1ec554f6da o updating to the releases of plexus-utils, plexus, and modello
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561196 13f79535-47bb-0310-9956-ffa450edef68
2007-07-31 00:25:39 +00:00
Jason van Zyl 19ba741d4d we have to keep classwords in a separate jar and boot it by itself or we end up with everythign in the primordial classloade
which sucks ass. I didn't notice that until I ran a big slew of tests and the realm out put was entirely different. We defin
  definitely want to boot up with just classworlds in the primordial loader so we can do what we like with the rest  


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561194 13f79535-47bb-0310-9956-ffa450edef68
2007-07-31 00:24:55 +00:00
Jason van Zyl 69a491ba0b o don't ever let the components-api jar through as we have one jar now and this JAR causes CCE all over the place, this will p protect against it ever getting pulled in.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561193 13f79535-47bb-0310-9956-ffa450edef68
2007-07-31 00:21:04 +00:00
Kenney Westerhof 335a6fd250 fix the build - replacing project.file with a file in another dir fscks' up the alignment
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@561177 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 22:55:13 +00:00
Kenney Westerhof 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
Jason van Zyl 6583991465 o updating to the new version of plexus which is the unified JAR once again. I can now move on
to doxia and attempt to use the same container for the trunk and branch.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@560496 13f79535-47bb-0310-9956-ffa450edef68
2007-07-28 04:57:37 +00:00
John Dennis Casey a87abe2d26 more formats.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559218 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 21:20:40 +00:00
John Dennis Casey 9c8011386d formatting for the message...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559216 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 21:18:05 +00:00
John Dennis Casey 8fab1c218a Fixing NPE.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559215 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 21:17:20 +00:00
John Dennis Casey aaba2df26c Fixing error message coming from a plugin phase-binding that cannot be resolved, or is unspecified.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559209 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 21:02:25 +00:00
Kenney Westerhof 77567c1123 Cleanup unit tests to make them more readable; add more tests for snapshots; failures are commented out (see table at http://docs.codehaus.org/display/MAVEN/Versioning)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559053 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 13:59:54 +00:00
Kenney Westerhof b8bdaaaae8 Check that a snapshot is included in a range
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@559052 13f79535-47bb-0310-9956-ffa450edef68
2007-07-24 13:59:04 +00:00
Kenney Westerhof 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
John Dennis Casey d78ddd4fed Restoring backward compatibility and deprecating old methods, so plugins and shared utilities can still use them without having to release new versions or suffer incompatibilities.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@555839 13f79535-47bb-0310-9956-ffa450edef68
2007-07-13 02:30:50 +00:00
Carlos Sanchez Gonzalez 844e17d4b5 Don't check for the distribution status building MavenProjects
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@555428 13f79535-47bb-0310-9956-ffa450edef68
2007-07-11 22:54:30 +00:00
Mark Hobson 407dd26f32 Fixing r553253 merge.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@554098 13f79535-47bb-0310-9956-ffa450edef68
2007-07-07 00:38:10 +00:00