Commit Graph

791 Commits

Author SHA1 Message Date
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 2e187a4237 o Fixed formats.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163332 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 22:16:33 +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
Brett Leslie Porter 1d4ef2bc37 previous behaviour of Version
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163327 13f79535-47bb-0310-9956-ffa450edef68
2005-02-02 09:00:54 +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
Carlos Sanchez Gonzalez a404ffd7d7 Fixed hostname
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163322 13f79535-47bb-0310-9956-ffa450edef68
2005-01-31 22:50:53 +00:00
Carlos Sanchez Gonzalez cfc9ee7610 Use new repo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163321 13f79535-47bb-0310-9956-ffa450edef68
2005-01-30 00:38:36 +00:00
Carlos Sanchez Gonzalez b5de881683 Added From
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163320 13f79535-47bb-0310-9956-ffa450edef68
2005-01-30 00:17:41 +00:00
Carlos Sanchez Gonzalez 58476f1952 Changed notification emai
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163319 13f79535-47bb-0310-9956-ffa450edef68
2005-01-30 00:16:11 +00:00
Jason van Zyl b4e6c5b907 {issue:MNG-73}
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163318 13f79535-47bb-0310-9956-ffa450edef68
2005-01-27 08:09:40 +00:00
Trygve Laugstol 9a893526e5 Initial revision
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163314 13f79535-47bb-0310-9956-ffa450edef68
2005-01-25 12:10:40 +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
Jason van Zyl 3f3c38afc9 o first copy of notes, this first push will become 3-4 pages over the course of the day, bare with me.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163311 13f79535-47bb-0310-9956-ffa450edef68
2005-01-21 15:45:41 +00:00
John Dennis Casey faaa6ba7f5 o Accidentally committed a bunch of development stuff...cleaning up.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163310 13f79535-47bb-0310-9956-ffa450edef68
2005-01-20 20:38:05 +00:00
John Dennis Casey d81fa66315 o Added imports for MavenExecutionRequest and MavenExecutionResponse.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163309 13f79535-47bb-0310-9956-ffa450edef68
2005-01-20 20:36:45 +00:00
Michal Maczka 095ac2b60a better error handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163308 13f79535-47bb-0310-9956-ffa450edef68
2005-01-18 20:44:53 +00:00
Carlos Sanchez Gonzalez a1d1876691 Added debug option to compiler configuration.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163307 13f79535-47bb-0310-9956-ffa450edef68
2005-01-14 21:36:17 +00:00
Trygve Laugstol 2520812edf o Overriding hashCode() and equals().
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163306 13f79535-47bb-0310-9956-ffa450edef68
2005-01-13 09:37:44 +00:00
Carlos Sanchez Gonzalez 3143fbd731 Added -i option to copy
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163305 13f79535-47bb-0310-9956-ffa450edef68
2005-01-11 22:35:37 +00:00
Carlos Sanchez Gonzalez 91c2856267 Added javadoc and war handlers
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163304 13f79535-47bb-0310-9956-ffa450edef68
2005-01-10 21:45:00 +00:00
Carlos Sanchez Gonzalez 4f8b150004 Ignore mboot jar
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163303 13f79535-47bb-0310-9956-ffa450edef68
2005-01-09 22:39:25 +00:00
Carlos Sanchez Gonzalez b7c04baca4 Added debug option to compiler configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163302 13f79535-47bb-0310-9956-ffa450edef68
2005-01-09 22:38:57 +00:00
Carlos Sanchez Gonzalez 763811d0fa Added debug option to compiler configuration.
Copied compiler classes from plexus compiler.
Allow bootstrapping with debug info.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163301 13f79535-47bb-0310-9956-ffa450edef68
2005-01-09 22:38:43 +00:00
Carlos Sanchez Gonzalez 380b263ad0 Added maven.compiler.debug parameter
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163300 13f79535-47bb-0310-9956-ffa450edef68
2005-01-09 00:21:12 +00:00
Carlos Sanchez Gonzalez e69b95ccef Removed mboot.jar, no longer needed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163299 13f79535-47bb-0310-9956-ffa450edef68
2005-01-08 21:37:01 +00:00
Carlos Sanchez Gonzalez ed68e4bed1 Compile with debugging info by default
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163298 13f79535-47bb-0310-9956-ffa450edef68
2005-01-08 21:35:24 +00:00
Trygve Laugstol cd38ae43fc o Improving exception message.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163297 13f79535-47bb-0310-9956-ffa450edef68
2005-01-06 23:58:52 +00:00
Emmanuel Venisse 2ab584b37d Fix templates processing for windows.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163296 13f79535-47bb-0310-9956-ffa450edef68
2005-01-06 16:41:58 +00:00
Trygve Laugstol 668ecf8165 o Setting parent pom.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163295 13f79535-47bb-0310-9956-ffa450edef68
2005-01-06 13:53:26 +00:00
Trygve Laugstol 244f6070e8 o Improving test case.
o Fixing proper reading of the resources sections.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163294 13f79535-47bb-0310-9956-ffa450edef68
2005-01-06 13:40:44 +00:00
Trygve Laugstol f5052b6d5a o Adding group id and version when creating a archetype.
o Adding licenses.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163293 13f79535-47bb-0310-9956-ffa450edef68
2005-01-06 13:03:10 +00:00
Trygve Laugstol b5add4d660 o Adding cvs ignores.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163292 13f79535-47bb-0310-9956-ffa450edef68
2005-01-06 01:47:20 +00:00
Trygve Laugstol 796064a35c o Removing plexus-utils from the excludes list.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163291 13f79535-47bb-0310-9956-ffa450edef68
2005-01-04 17:56:20 +00:00
Trygve Laugstol 6c60e42f8a o Adding missing poms.
o Adjusting poms so they extends the correct parent pom.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163290 13f79535-47bb-0310-9956-ffa450edef68
2005-01-04 15:03:16 +00:00
Trygve Laugstol 4977f19845 o Setting some additional ignores.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163289 13f79535-47bb-0310-9956-ffa450edef68
2005-01-03 06:41:15 +00:00
Emmanuel Venisse a45ae033dc Fix command line for cygwin.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163288 13f79535-47bb-0310-9956-ffa450edef68
2004-12-30 14:04:55 +00:00
Jason van Zyl 873fc22f6d *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163287 13f79535-47bb-0310-9956-ffa450edef68
2004-12-30 05:30:46 +00:00
Jason van Zyl cff31be447 o don't need these and they interfere on 1.5
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163286 13f79535-47bb-0310-9956-ffa450edef68
2004-12-29 20:20:48 +00:00
Jason van Zyl e9763fcfee *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163285 13f79535-47bb-0310-9956-ffa450edef68
2004-12-29 07:08:36 +00:00
Jason van Zyl c4f134552a *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163284 13f79535-47bb-0310-9956-ffa450edef68
2004-12-29 07:06:36 +00:00