Commit Graph

180 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 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
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
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
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
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 153d46aa2f *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163279 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 20:50:49 +00:00
Jason van Zyl 107aa56cc5 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163276 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 19:43:20 +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 2c809a239c o don't merge configuration if there is no project. again here we
might always want to send the super POM through for consistency.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163274 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 19:32:36 +00:00
Jason van Zyl ebbb80139c o if we don't have a project then we don't have any pre/post goals.
this happens when we are initializing a project. maybe for the
  initializing mode we should send in the parent POM. not sure yet.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163273 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 19:30:43 +00:00
Jason van Zyl 1e3e8c5073 o throw a configuration exception if a component can't be found we can't recover from that.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163272 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 19:29:14 +00:00
Jason van Zyl fe05b1efc9 o formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163271 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 19:09:31 +00:00
Jason van Zyl a605b693e8 o formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163270 13f79535-47bb-0310-9956-ffa450edef68
2004-12-28 18:59:06 +00:00
Jason van Zyl 52ab7890fc no message
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163267 13f79535-47bb-0310-9956-ffa450edef68
2004-12-25 16:38:26 +00:00
Jason van Zyl 4d6c85244d o reformatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163266 13f79535-47bb-0310-9956-ffa450edef68
2004-12-25 16:35:42 +00:00
Jason van Zyl 8e02162f79 o reformatting
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163265 13f79535-47bb-0310-9956-ffa450edef68
2004-12-25 16:29:15 +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 8afb73892d remove notion of maven home from the core
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163263 13f79535-47bb-0310-9956-ffa450edef68
2004-12-24 22:28:36 +00:00
Jason van Zyl 33332423f6 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163262 13f79535-47bb-0310-9956-ffa450edef68
2004-12-24 21:36:00 +00:00
Jason van Zyl a8d5efcfdb *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163261 13f79535-47bb-0310-9956-ffa450edef68
2004-12-24 20:55:54 +00:00
Jason van Zyl 47798a5834 *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163260 13f79535-47bb-0310-9956-ffa450edef68
2004-12-24 20:51:45 +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 7099cca292 o we'll deal with v3 -> v4 conversion somewhere else.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163258 13f79535-47bb-0310-9956-ffa450edef68
2004-12-24 03:20:02 +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
Emmanuel Venisse 0e31910a59 Use parameters
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163244 13f79535-47bb-0310-9956-ffa450edef68
2004-12-06 10:47:07 +00:00
Jason van Zyl 4d4fc115d9 o we're still using ognl-esque expressions but we don't need its syntax internally.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163242 13f79535-47bb-0310-9956-ffa450edef68
2004-12-05 22:06:34 +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 2c09099b78 o in the contextualize method where we are getting a reference to the container but we only need the basis PlexusContainer. The only place we need the artifact enabled container is in the addPlugin method. Otherwise, in standard PlexusTestCases we will get a ClassCastException. You do not need to use an ArtifactEnabledTestCase unless you actually want to use the facilities of the artifact enabled container.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163234 13f79535-47bb-0310-9956-ffa450edef68
2004-11-14 07:13:05 +00:00
Trygve Laugstol 8d339b01b8 o Fixing a bug where the resolve dependencies flag was ignored.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163233 13f79535-47bb-0310-9956-ffa450edef68
2004-11-05 20:31:14 +00:00
John Dennis Casey 308e07f34c o Add the model's parent to the set of artifacts to be resolved. This will allow dependency poms' parent-poms' dependencies to be included in the build classpath as implicit dependencies.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163231 13f79535-47bb-0310-9956-ffa450edef68
2004-11-03 22:56:42 +00:00
Emmanuel Venisse d4fdb18d1f Set maven.repo.local system property.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163226 13f79535-47bb-0310-9956-ffa450edef68
2004-11-02 11:03:27 +00:00
Emmanuel Venisse b8d4bcaa0d Make the script resilient to changes in the classworlds JAR. It works ONLY if M2_HOME doesn't contains spaces.
If we use double quote around %M2_HOME%\\core\\boot\\classworlds-*.jar for classpath, '*' isn't interpreted by dos.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163225 13f79535-47bb-0310-9956-ffa450edef68
2004-10-28 21:08:13 +00:00
Jason van Zyl 2c8cc4ab93 o make the script resilient to changes in the classworlds JAR
Could someone try to do the same with the .bat file before I update
  to a release version of classworlds?


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163224 13f79535-47bb-0310-9956-ffa450edef68
2004-10-27 18:03:44 +00:00