Commit Graph

598 Commits

Author SHA1 Message Date
John Dennis Casey 77d3e6c5f5 o Added (pom|project)? to the eval pattern in the regex param extractor, to trim ${project.artifactid} to mean the same as ${artifactId} within the pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163490 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:06:22 +00:00
Brett Leslie Porter b5f8943edf transitive test dependencies should be ignored
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163488 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 06:01:43 +00:00
Brett Leslie Porter b31db60bff tests and repairs for scope
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163486 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 05:34:52 +00:00
Brett Leslie Porter 0d7111f7ba gone to maven-artifact
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163479 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 01:38:51 +00:00
John Dennis Casey 2513cb25aa o Added <pluginManagement/>
o Removed goal decoration.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163468 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 19:03:19 +00:00
Brett Leslie Porter 8c6292c23f remove <file>, add <scope>
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163463 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 08:15:26 +00:00
John Dennis Casey dfbae27c44 o Added first-pass logging and event-monitoring impls. Converted all System.out calls in maven-component plugins to use logger.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163457 13f79535-47bb-0310-9956-ffa450edef68
2005-03-04 09:04:26 +00:00
Brett Leslie Porter dac661c709 path alignment for files in dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163401 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 04:37:54 +00:00
Brett Leslie Porter fd8d091275 place tests in consistent locations
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163400 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 04:21:52 +00:00
Brett Leslie Porter 87b3e49afd add file to dependency, and handle in injection
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163399 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 04:16:18 +00:00
Brett Leslie Porter 4b7ab94e31 removed unused source directories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163398 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 04:15:47 +00:00
Brett Leslie Porter c022a8807d use ${..} style interpolation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163381 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 03:56:25 +00:00
Brett Leslie Porter 4465e49559 refactoring:
- use an expression in the suport POM to set up finalName
- have interpolator and injector deal only with model


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163380 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 03:27:00 +00:00
Brett Leslie Porter ec94b8fe2e move injectors to a package
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163377 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 01:59:34 +00:00
Jason van Zyl 780b693240 o the introduction of the lifecycle stuff we've been chatting about so you
can now do things like:

  m2 package

  which makes the jar

  m2 install

  which installs the jar

  m2 test

  You can also execute individual goals still like:

  clean:clean
  pom:install
  idea:idea

  Execution of goals this way will still have the dependency resolution
  flag obeyed but they are run in isolation in that pre/post goals don't
  exist anymore. You need to slot your mojos into the lifecycle.

  I will add the mechanism whereby configuring a plugin will push
  the mojo into the lifecycle.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163359 13f79535-47bb-0310-9956-ffa450edef68
2005-02-16 07:16:33 +00:00
John Dennis Casey 4f8225545e o Added pom interpolation based on regex search-and-replacement with ReflectionValueExtractor pom lookups.
o Moved ReflectionProjectValueExtractor into o.a.m.util package and renamed to ReflectionValueExtractor
o Added unit tests for interpolation
o Added integration test for interpolation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163335 13f79535-47bb-0310-9956-ffa450edef68
2005-02-03 20:54:15 +00:00
Brett Leslie Porter 6503a19dfc add license, reformat to style and change failing test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163333 13f79535-47bb-0310-9956-ffa450edef68
2005-02-03 09:10:02 +00:00
John Dennis Casey da47c49f4f o Revised the defaults section to <dependencyManagement>, all builds and is happy.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163325 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 02:23:12 +00:00
John Dennis Casey e687cfed61 o Added dependencyDefaults section to POM.
The nested <dependencyDefault> element closely mirrors the <dependency> element specification.
  It provides the ability to set url, artifact, properties, version for a dependency that matches on
  {groupId, artifactId, type}. Url, artifact, and version will only override the dependency's values if
  the dependency doesn't provide the value, and (in the case of url and artifact) the dependency
  doesn't provide a version (url and artifact are assumed to be version-specific).

  Properties will only be overwritten, and only in the case where the dependency
  doesn't specify them.

  Dependencies are validated after merging with defaults, since version is not required
  on either <dependency> or <dependencyDefault> but is required between the two.

o Added component interface/default impl for injecting project defaults.
o Added unit and integration tests.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163323 13f79535-47bb-0310-9956-ffa450edef68
2005-02-01 22:43:03 +00:00
Jason van Zyl a6a0eab73d *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163275 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 19:32:54 +00:00
Jason van Zyl 16036aa792 updating copyright
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163264 13f79535-47bb-0310-9956-ffa450edef68
2004-12-25 16:26:25 +00:00
Jason van Zyl d7591b9f76 o move some shared execution request handling code to the super class
o cleanup the plugin manager interface, we don't need to set the local
  repository as that information is in the request and session.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163259 13f79535-47bb-0310-9956-ffa450edef68
2004-12-24 17:29:42 +00:00
Jason van Zyl 754feeadb3 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163257 13f79535-47bb-0310-9956-ffa450edef68
2004-12-23 23:46:42 +00:00
Jason van Zyl 3a28b21872 o removing the use of OGNL, snagged some classes from velocity to do
the plugin parameter expression evaluation.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163241 13f79535-47bb-0310-9956-ffa450edef68
2004-12-05 21:45:36 +00:00
Jason van Zyl 4eff8b0aea o Trying to keep only keep the main entry point into maven as the only classes in the top level package.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163238 13f79535-47bb-0310-9956-ffa450edef68
2004-12-05 04:16:07 +00:00
Jason van Zyl 91da8f24e7 o removal of xstream
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163214 13f79535-47bb-0310-9956-ffa450edef68
2004-10-24 18:15:08 +00:00
Trygve Laugstol 74c818888a o Fixing MNG-90:
- Improved the SCM part of the ModelInheritanceAssembler
o Fixing some eclipse warnings and adding some licenses.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163191 13f79535-47bb-0310-9956-ffa450edef68
2004-10-11 22:56:47 +00:00
Trygve Laugstol 698119ea0b o Added mavenHomeLocal as a argument to the project builder. The project
builder should now completly obey mavenHomeLocal.
o Made mavenHome and mavenHomeLocal Files instead of Strings.
o Adding licenses to some files missing license.
o Silencing some eclipse warnings.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163188 13f79535-47bb-0310-9956-ffa450edef68
2004-10-08 19:15:02 +00:00
Jason van Zyl 5bfcebab21 o adding per goal/mojo configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163183 13f79535-47bb-0310-9956-ffa450edef68
2004-10-03 19:28:25 +00:00
Jason van Zyl e26f756e8f o adding necessary bits and bobs for plugin configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163179 13f79535-47bb-0310-9956-ffa450edef68
2004-10-01 14:53:48 +00:00
Jason van Zyl 22f5fe58dc o i want a whole canonical test, but we know most things are working from the integration tests and i am specifically interested in plugin configuration at the moment so that's what's going in right now.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163177 13f79535-47bb-0310-9956-ffa450edef68
2004-10-01 14:12:40 +00:00
John Dennis Casey 5f23120ff6 o Fixed goal decorator inheritance deficiency.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163137 13f79535-47bb-0310-9956-ffa450edef68
2004-09-22 02:58:12 +00:00
John Dennis Casey 90c3f69e1c o removed the current mojo descriptor stuff from the goal execution context...doesn't seem to be used anywhere, and it'll cause problems if the current goal is from a plugin that has not been resolved yet.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163135 13f79535-47bb-0310-9956-ffa450edef68
2004-09-22 00:23:35 +00:00
John Dennis Casey 78563d686f o Refactored the goal/plugin resolution part of the lifecycle.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163132 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 23:11:16 +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
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
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
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 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
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 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