Commit Graph

216 Commits

Author SHA1 Message Date
Brett Leslie Porter 0e249ddc83 reintroduce execution failures
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163412 13f79535-47bb-0310-9956-ffa450edef68
2005-02-25 03:14:49 +00:00
Brett Leslie Porter 360ae403b2 refactoring to simplify - taking notes of potential clean up after lifecycle is completed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163410 13f79535-47bb-0310-9956-ffa450edef68
2005-02-25 01:23:20 +00:00
Brett Leslie Porter c31bc6b7ce clean up some artifact related code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163406 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 05:33:18 +00:00
John Dennis Casey 52de04e862 Retrying commit after updating maven-core to HEAD.
o Fixed problems with plugin-plugin (had to do with refactored plugin-tools stuff)
o Added marmalade-mojo support, although without an integration test (verified it doesn't get in the way of 'normal' functionality, though)
o Added code in mboot2 to copy marmalade-mojo support libs to ${maven.home}/lib


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163405 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 05:12:30 +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 423d6ab68d some better error reporting for goals that are not found
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163391 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 00:49:40 +00:00
Brett Leslie Porter 5f65f68c1b put back change I accidentally reverted
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163389 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 23:59:27 +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 c903684688 fix tests. Would like to find an alternative to utilising maven-artifact inside this class.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163379 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 02:37:39 +00:00
Brett Leslie Porter bd55c2ab5d fix bad formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163378 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 02:06:22 +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
Brett Leslie Porter b005ece7c4 get project reports working
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163376 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 00:06:06 +00:00
John Dennis Casey fd7587de72 o Added to ignore some classes I want around for ideas, but not to make it into the main build.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163371 13f79535-47bb-0310-9956-ffa450edef68
2005-02-20 18:09:12 +00:00
John Dennis Casey 98002718c3 o Refactored mojo/plugin generation, extraction, etc. to accommodate multiple mojo languages.
o Tested with java mojos, mboot to verify nothing broken by refactor.
o TODO: Add marmalade support tests...currently only java-mojos are supported in mboot2, so this isn't going to interrupt things.
o TODO: Once marmalade support is tested, add to the list of artifacts built by mboot2.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163369 13f79535-47bb-0310-9956-ffa450edef68
2005-02-20 16:25:22 +00:00
Emmanuel Venisse 2011539175 Use new install and deploy goals instead of jar:install and jar:deploy goals
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163368 13f79535-47bb-0310-9956-ffa450edef68
2005-02-19 14:47:09 +00:00
Jason van Zyl 49e98f5f71 o lifecycle executor
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163360 13f79535-47bb-0310-9956-ffa450edef68
2005-02-16 07:25:31 +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
Brett Leslie Porter 2433342e7e fix APT parse errors
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163357 13f79535-47bb-0310-9956-ffa450edef68
2005-02-16 01:23:55 +00:00
Brett Leslie Porter c54347e9e0 need to reinstate the non-project builder version for plexus-runtime-builder
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163355 13f79535-47bb-0310-9956-ffa450edef68
2005-02-15 21:39:07 +00:00
Brett Leslie Porter aad6d7c1b0 clarify integration tests
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163354 13f79535-47bb-0310-9956-ffa450edef68
2005-02-14 04:44:00 +00:00
Jason van Zyl dd522ff10c o little additions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163353 13f79535-47bb-0310-9956-ffa450edef68
2005-02-13 20:21:16 +00:00
Jason van Zyl 89c4612bf8 o using a snippet to extract the relevent bit out of the configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163352 13f79535-47bb-0310-9956-ffa450edef68
2005-02-13 20:09:22 +00:00
Brett Leslie Porter aa25e4562f add notes relating to alternate lifecycles (eg for site)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163351 13f79535-47bb-0310-9956-ffa450edef68
2005-02-13 03:54:12 +00:00
Jason van Zyl 734257981b o adding test class processing phase
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163350 13f79535-47bb-0310-9956-ffa450edef68
2005-02-12 17:36:42 +00:00
Brett Leslie Porter 8ad0f8f745 *very* quick download monitor. Instantiation and output to be reviewed later
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163348 13f79535-47bb-0310-9956-ffa450edef68
2005-02-10 07:09:57 +00:00
Brett Leslie Porter 1fb63ba3c0 moving repository permissions settings to a separate class - they don't belong in authentication info
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163346 13f79535-47bb-0310-9956-ffa450edef68
2005-02-09 06:17:38 +00:00
John Dennis Casey f191abe11c o First iteration of discussion on implementing marmalade scripting support for mojos.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163345 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 20:51:47 +00:00
Brett Leslie Porter 49963682a2 pass the proxy request parameters to the default wagon
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163344 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 10:32:45 +00:00
Brett Leslie Porter 67d58c8d04 clean formatting, and ensure not to munge the model's repository list while assembling the lineage
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163342 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 06:02:40 +00:00
Brett Leslie Porter 67695dec70 method only used once
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163341 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 04:39:51 +00:00
Brett Leslie Porter d783d9ce98 reduce number of classes holding on to localRepository unnecessarily
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163339 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 04:12:58 +00:00
Brett Leslie Porter 797291178f cleanup: remove the remote repository list from the MavenMetadataSource as it was only used in retrieve(), and the equivalent list can be passed directly
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163338 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 03:26:06 +00:00
John Dennis Casey bf3c9c2a02 o Replaced Model/MavenXpp3Reader with MavenProjectBuilder in MavenMetaDataSource,
to take advantage of the post-processing (managed dependencies, pom interpolation,
  inheritance assembly) involved with building a project. This shoud make transitive
  dependency resolution more consistent with the rest of m2's handling of
  POM information.

  It has been tested on marmalade in the jelly-core taglib, but
  I'm not sure how to setup an integration test using the it-verifier
  to build multiple POMs in a single test, so I'm not sure how to
  setup an integration test for this.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163336 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 04:02:10 +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 e480dd8d3e o add basic auth to model and lightweight wagon
o add proxy configuration in lightweight wagon
o not yet wiring in the properties from maven.properties into the repository


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163334 13f79535-47bb-0310-9956-ffa450edef68
2005-02-03 11:39:27 +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 2ce3a6cbde o Fixed formats for inheritance assembler additions
o Removed unused import on defaults injector.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163331 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 22:14:46 +00:00
John Dennis Casey 64f75b8aa0 o Removed dependency validation after default injection, since this is the job of the validator (later in the project-building process)
o Reformatted using m2 eclipse formatting file.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163330 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 22:13:15 +00:00
Michal Maczka 4dfcf82eae correcting role name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163329 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 20:15:28 +00:00
Brett Leslie Porter cf673c6270 add missing note about goal aliasing
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163328 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 09:18:20 +00:00
John Dennis Casey 6eb196cc55 o Corrected issue with inheritance of <dependencyManagement/>
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163326 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 03:11: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 58ead792af o over-specified the dependency's properties empty-check...
Dependencies should be able to override the default properties simply
  by supplying <properties/>. This change enables that.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163324 13f79535-47bb-0310-9956-ffa450edef68
2005-02-01 22:44:43 +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
John Dennis Casey cfc50a76aa o Added some discussion notes at the end of the document, since I'm not sure where else to put them.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163313 13f79535-47bb-0310-9956-ffa450edef68
2005-01-24 01:41:24 +00:00
Jason van Zyl 0575ec3c76 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163312 13f79535-47bb-0310-9956-ffa450edef68
2005-01-22 16:11:57 +00:00