Commit Graph

3480 Commits

Author SHA1 Message Date
Jason van Zyl 7773dde7de *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163091 13f79535-47bb-0310-9956-ffa450edef68
2004-09-17 15:56:34 +00:00
Jason van Zyl ac8f54900d o start keeping track of what ognl expressions are actually allowed
for mojo parameters. i think the goal is to eliminate the use of
  #basedir and get explicit about everything and only use #project
  and #component for mojo parameters.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163090 13f79535-47bb-0310-9956-ffa450edef68
2004-09-17 15:10:15 +00:00
Jason van Zyl f915a32db4 o add a convenience method for the local repo path, the removal
of the properties broke a couple plugins using the local repo
  property so i'll use this instead.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163089 13f79535-47bb-0310-9956-ffa450edef68
2004-09-17 03:05:07 +00:00
John Dennis Casey 30e1d1f23f o Rolling back changes to super-model loading, with the exception of the supermodel file name change...it's still changed to pom-4.0.0.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163088 13f79535-47bb-0310-9956-ffa450edef68
2004-09-16 18:06:01 +00:00
John Dennis Casey 2d4e9a1a0e o Commented earlier changes until I have time to make them work properly
o Added DEFAULT_MODEL_VERSION constant to Maven.class for referencing in case there is no project POM


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163087 13f79535-47bb-0310-9956-ffa450edef68
2004-09-16 16:06:13 +00:00
John Dennis Casey 9e24a7b410 o Changed maven-core's super-pom from pom.xml to pom-4.0.0.xml
o Added validation logic for non-heritable pom elements to the default project builder
o Changed default builder to select the correct super-pom from the project pom's modelVersion.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163086 13f79535-47bb-0310-9956-ffa450edef68
2004-09-16 14:26:18 +00:00
John Dennis Casey 25ec60bbc6 o Added section on renaming pom.xml in maven-core.jar to pom-4.0.0.xml for future legacy needs
o Added section on minimum required element-set for a unique project pom.xml


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163085 13f79535-47bb-0310-9956-ffa450edef68
2004-09-16 14:06:57 +00:00
Trygve Laugstol 0f5fc8560b o Properly aligning the unit test resource directories.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163084 13f79535-47bb-0310-9956-ffa450edef68
2004-09-16 13:32:07 +00:00
Brett Leslie Porter 27738439ee optimize imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163082 13f79535-47bb-0310-9956-ffa450edef68
2004-09-15 12:34:17 +00:00
Brett Leslie Porter 81cc07979a optimize imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163081 13f79535-47bb-0310-9956-ffa450edef68
2004-09-15 12:30:05 +00:00
Brett Leslie Porter ab2bc483b2 make exceptions cause a failure response (and exit with a non-zero exit code)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163079 13f79535-47bb-0310-9956-ffa450edef68
2004-09-15 11:04:52 +00:00
Brett Leslie Porter bc287e0e8b change to override.xml
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163077 13f79535-47bb-0310-9956-ffa450edef68
2004-09-15 10:59:19 +00:00
Brett Leslie Porter 8e9bdca246 fix license
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163076 13f79535-47bb-0310-9956-ffa450edef68
2004-09-15 10:48:52 +00:00
John Dennis Casey 63c6bcdcc0 o Cleaned up a bit. Made the diagram prettier, and cleaned up the footnotes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163075 13f79535-47bb-0310-9956-ffa450edef68
2004-09-13 23:49:49 +00:00
Emmanuel Venisse 948fedd99f *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163074 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 12:50:12 +00:00
Emmanuel Venisse 1f830eca4c Fix format.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163073 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 12:21:30 +00:00
Emmanuel Venisse 10fe573a33 Add basedir sub-directories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163072 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 12:16:19 +00:00
Brett Leslie Porter 182d817ff1 return exit code for goal failures
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163071 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 23:43:35 +00:00
Jason van Zyl 72952a0a7a o more links to existing docs, just for the m2 devs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163069 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 01:55:23 +00:00
Jason van Zyl 71a5a9fac6 o getting rid of some cruft
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163068 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 01:53:35 +00:00
Jason van Zyl 45d80b0f10 o descriptor for site generation using doxia
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163067 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 01:52:13 +00:00
Jason van Zyl f560b3c346 o add the distributionManagement element so I can deploy the m2 site
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163066 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 01:45:52 +00:00
John Dennis Casey abb54cdba5 o added general resolution form with explanation as a comment at the bottom of the diagram.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163064 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 01:13:38 +00:00
John Dennis Casey 092f0c529d o added handling of decorators.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163063 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 00:54:55 +00:00
Jason van Zyl e64ca73cd4 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163062 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 00:41:35 +00:00
Jason van Zyl 9f798c4c4a *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163061 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 00:39:54 +00:00
Jason van Zyl 70b9587bb1 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163060 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 00:38:46 +00:00
Jason van Zyl 4adfb19dce *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163059 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 00:37:26 +00:00
Jason van Zyl 61ab7fa7dd *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163058 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 00:35:19 +00:00
Jason van Zyl 0fe12c5a57 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163057 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 00:33:39 +00:00
Jason van Zyl 66a0a01d86 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163056 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 00:06:36 +00:00
Jason van Zyl dbb1eec439 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163055 13f79535-47bb-0310-9956-ffa450edef68
2004-09-08 23:43:22 +00:00
Jason van Zyl 3545b9a1fe *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163054 13f79535-47bb-0310-9956-ffa450edef68
2004-09-08 23:40:13 +00:00
John Dennis Casey 1d4f8b9073 o added bullet point for implied goals, to be handled separately from multiple explicit goals.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163053 13f79535-47bb-0310-9956-ffa450edef68
2004-09-08 12:40:01 +00:00
John Dennis Casey 8ca7a7391b copied single-goal flow to multiple-goal section to have a skeleton on which to build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163052 13f79535-47bb-0310-9956-ffa450edef68
2004-09-08 12:36:52 +00:00
Emmanuel Venisse 74bc0a1f14 Pass M2_HOME to m2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163051 13f79535-47bb-0310-9956-ffa450edef68
2004-09-08 08:03:52 +00:00
John Dennis Casey 891cd440da o forgot to add one footnote reference.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163049 13f79535-47bb-0310-9956-ffa450edef68
2004-09-08 00:12:14 +00:00
John Dennis Casey 5367b7ee28 o reformatted with footnote markers to keep lifecycle spec's cleaner and keep a more verbose explanation separate.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163048 13f79535-47bb-0310-9956-ffa450edef68
2004-09-08 00:11:51 +00:00
Jason van Zyl 4e17a1646d *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163047 13f79535-47bb-0310-9956-ffa450edef68
2004-09-08 00:01:51 +00:00
Jason van Zyl 965b2bf4c2 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163046 13f79535-47bb-0310-9956-ffa450edef68
2004-09-08 00:00:17 +00:00
John Dennis Casey 9acc6db384 o expanded goal resolution phase to explain that we're downloading the associated plugin if necessary.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163045 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 23:50:56 +00:00
Jason van Zyl 3150931daf *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163044 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 23:47:10 +00:00
Jason van Zyl 0af6405f8d *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163043 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 23:43:21 +00:00
John Dennis Casey c23d8f57ff o added dep download details to session...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163042 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 23:41:12 +00:00
John Dennis Casey f3bd58b610 o added detail to the goal lifecycle, and notes on goal resolution.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163041 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 23:37:36 +00:00
Jason van Zyl da4e248d8d *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163040 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 23:30:15 +00:00
John Dennis Casey 49af356919 o added use case for non-pom-oriented goals.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163039 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 23:24:16 +00:00
Jason van Zyl da5d0de6ff *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163038 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 23:18:12 +00:00
Brett Leslie Porter 4d0a8dd795 complete removal of maven.properties, make some changes for maven.home
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163036 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 13:41:11 +00:00
Emmanuel Venisse c5ff653579 Rollback my changes. It's never user because type has always a default value and is never null.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163034 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 10:52:29 +00:00
Emmanuel Venisse 7dee1da31f Use type define in project pom and not type define in user pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163033 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 10:40:40 +00:00
Emmanuel Venisse 1797335136 Test type inheritance.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163032 13f79535-47bb-0310-9956-ffa450edef68
2004-09-06 12:10:27 +00:00
Emmanuel Venisse 2b4a352630 Add inheritance for type.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163030 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 19:02:45 +00:00
Brett Leslie Porter c13e8c7629 PR: MNG-74
remove maven.properties use everywhere except classworlds conf


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163024 13f79535-47bb-0310-9956-ffa450edef68
2004-09-02 12:34:19 +00:00
Trygve Laugstol 7170bdb5be o Adding the ciManagement property.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163015 13f79535-47bb-0310-9956-ffa450edef68
2004-08-29 18:57:30 +00:00
Emmanuel Venisse 5f441f1336 Goal execution response is now accessible from DefaultMaven.execute
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163014 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 16:37:08 +00:00
Trygve Laugstol 80a077f1a8 o Updating the second half of references from plexus-0.16.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163011 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 11:47:30 +00:00
John Dennis Casey a949eb66de o Removed GoalDecorationPhase, since goal decoration is now a part of the model
o Removed PluginDownloadPhase, since plugin resolution/download has to be a part of the prereq and pre/postGoal resolution, too
o Changed DefaultMaven to execute the session lifecycle, and the component wiring to likewise wire the DefaultMaven with a session lifecycle manager
o Removed the org.apache.maven.decoration package and its contents, since this is all in the model now
o Fixed the GoalResolutionPhase to verify each goal's plugin in turn as it resolves prereqs, preGoals and postGoals
o Fixed the GoalResolutionPhaseTest to work with the new resolution model
o Added a new createGoalExecutionContext to the MavenTestCase base class, to allow me to inject a MavenProject directly rather than a pom file
o Fixed the MavenLifecycleManagerTest to only expect 4 lifecycle phases, now than the plugin resolution and goal decoration phases are obsoleted
o All builds on local machine, but will depend on plexus-0.17.jar/pom and plexus-artifact-container-1.0-alpha-1.jar/pom to build on beaver
o I uploaded plexus-artifact-container-1.0-alpha-1.jar to ${plexus.home}/dist, but cannot upload POMs due to priveleges problem in poms dir.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163007 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 04:40:02 +00:00
John Dennis Casey 24ce8263d9 o Changed to depend on plexus-0.17 instead of -0.16
o Changed the embedder/container used to be the new artifact-aware container (plexus-artifact-container-1.0-alpha-1)
o Added new dependency to maven-core for artifact-container.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163006 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 01:18:19 +00:00
John Dennis Casey 975e9491d8 o Reformatted source code.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163002 13f79535-47bb-0310-9956-ffa450edef68
2004-08-23 20:41:45 +00:00
John Dennis Casey 28be3319be o Replaced license in source
o Added testing to show failure to merge resources from parent into child build which specifies a build without these elements
o Fixed resource blending for child build sections which don't specify them.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163001 13f79535-47bb-0310-9956-ffa450edef68
2004-08-23 20:24:54 +00:00
John Dennis Casey 2a3f7b7220 o Added unit test to express lack of source directory inheritance (*ourceDirectory within <build>)
o Fixed *ourceDirectory inheritance


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163000 13f79535-47bb-0310-9956-ffa450edef68
2004-08-23 20:04:34 +00:00
Jason van Zyl 02cc1d93ee o filter out more of maven's core dependencies
fix for cameron braid to get the eclipse plugin working.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162991 13f79535-47bb-0310-9956-ffa450edef68
2004-08-19 17:14:17 +00:00
Emmanuel Venisse 97a37e6c2f Fix userModel loading.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162990 13f79535-47bb-0310-9956-ffa450edef68
2004-08-18 07:28:10 +00:00
Brett Leslie Porter 059a3f888c respond with BUILD FAILED on exception
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162988 13f79535-47bb-0310-9956-ffa450edef68
2004-08-17 20:55:50 +00:00
Brett Leslie Porter 176ff014b9 load repositories from user configuration before trying to find the POMs there
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162987 13f79535-47bb-0310-9956-ffa450edef68
2004-08-17 20:55:23 +00:00
Jason van Zyl 5e0b187204 o more additions to the session code, not turned on yet but doing things in
smaller batches.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162980 13f79535-47bb-0310-9956-ffa450edef68
2004-08-15 15:01:52 +00:00
Brett Leslie Porter 2c0b5d4ea4 load ~/.m2/pom.xml for user overrides
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162978 13f79535-47bb-0310-9956-ffa450edef68
2004-08-15 04:32:04 +00:00
Jason van Zyl 097c8f7623 o started building up the code that we will use for the session lifecycle
-> bascially the mechanism is the same as the one we use for the goal
     execution lifecycle

  This first cut is so John can see as we're discussing the session stuff
  at the moment and I need to get this working in order to push all notions
  of artifact handling out of MavenProject.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162969 13f79535-47bb-0310-9956-ffa450edef68
2004-08-12 22:52:55 +00:00
Jason van Zyl e232e07440 o changing MavenLifecycleContext to MavenGoalExecutionContext which is what
it really is. Making way for the notion of a MavenSessionExecutionContext
  and it is looking like we will end up with two lifecycles. Where we are
  dealing with notions of goals and sessions: some operations need to be
  done at the session level and don't need to be repeated for the execution
  of every goal.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162968 13f79535-47bb-0310-9956-ffa450edef68
2004-08-12 18:41:15 +00:00
Jason van Zyl 133a51a629 o removing any notions of the local repository from MavenProject, not the
right place for it.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162967 13f79535-47bb-0310-9956-ffa450edef68
2004-08-12 17:55:48 +00:00
Jason van Zyl 23c279ed42 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162962 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 19:52:42 +00:00
Jason van Zyl 1e66e33e5a o using ibiblio again
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162961 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 19:48:56 +00:00
Jason van Zyl 676c9b5e74 o Fixing the parent POM downloading problem.
{issue:MNG-19}


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162954 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 17:59:30 +00:00
John Dennis Casey 3b4c0fb912 o Added http://repository.codehaus.org alongside http://www.ibiblio.org/maven for latest updates (for now)...
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162941 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 02:38:50 +00:00
John Dennis Casey 567a47cf82 o Added check for null MojoDescriptor in the lifecycle context (throws GoalNotFoundException if == null)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162940 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 02:38:07 +00:00
Jason van Zyl 8b4d55e55d *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162939 13f79535-47bb-0310-9956-ffa450edef68
2004-08-10 00:30:25 +00:00
Jason van Zyl b3da4ea555 o using plexus 0.16
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162935 13f79535-47bb-0310-9956-ffa450edef68
2004-08-09 21:52:47 +00:00
Jason van Zyl e81d9919d5 o bumping version of wagon (michal is about to deploy 1.0-alpha-1)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162933 13f79535-47bb-0310-9956-ffa450edef68
2004-08-09 21:42:47 +00:00
Jason van Zyl 601320d28f Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162925 13f79535-47bb-0310-9956-ffa450edef68
2004-08-09 19:02:31 +00:00