Commit Graph

118 Commits

Author SHA1 Message Date
John Dennis Casey 84c5379bd8 o Added back <aspectSourceDirectory/> and <integrationUnitTestSourceDirectory/>
o Added CDATA notation to some code segments that were causing trouble.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163601 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 22:53:12 +00:00
Brett Leslie Porter 1c8e6e19a0 put back modules, removed in previous commit
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163531 13f79535-47bb-0310-9956-ffa450edef68
2005-03-11 02:23:13 +00:00
Brett Leslie Porter 7b9c465866 fix typos
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163530 13f79535-47bb-0310-9956-ffa450edef68
2005-03-11 02:15:41 +00:00
John Dennis Casey 2cf60ca093 o updated model documentation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163529 13f79535-47bb-0310-9956-ffa450edef68
2005-03-11 01:52:18 +00:00
Brett Leslie Porter 5f424a5ac0 multi-module support
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163528 13f79535-47bb-0310-9956-ffa450edef68
2005-03-11 01:06:48 +00:00
John Dennis Casey f6c2684903 o Moved the default plugin stuff to <pluginManagement/>. Plugin config will be pulled from here and injected into <plugins/> as needed to satisfy type-handlers at runtime.
o Added the ability for DefaultMaven to load only the super-pom in the event that no pom.xml exists to initiate the assembly.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163527 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 23:01:38 +00:00
Brett Leslie Porter a44b6f9726 flip pom format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163511 13f79535-47bb-0310-9956-ffa450edef68
2005-03-10 01:35:25 +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 1d615cd239 turn on logging, resolve some issues surrounding test dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163473 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 23:02:43 +00:00
Brett Leslie Porter 47da41f68e refactor source roots to be lists
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163470 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 20:56:23 +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
Brett Leslie Porter 5eb67a452f add private key, passphrase until we have them in the user configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163459 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 05:02:31 +00:00
Brett Leslie Porter bd54ac838b allow plugins to be disabled (to override inheritence)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163425 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 22:34:01 +00:00
Brett Leslie Porter d5d05a51c5 start to enhance the lifecycle. Need to pre-process plugins as currently goals are only executed if added to a phase after the current goal. Also need plugin configuration to activate these changes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163419 13f79535-47bb-0310-9956-ffa450edef68
2005-02-27 05:39:55 +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 59952f0db2 removed unused source directories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163397 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 04:01:14 +00:00
Brett Leslie Porter ad64a10685 source modification was incorrectly inheriting fields
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163386 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 05:55:52 +00:00
Brett Leslie Porter 6de8e8c5eb remove override - we can eventually use dependencyManagement for that.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163385 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 05:25:21 +00:00
Brett Leslie Porter a8dcdec844 clean up MDO
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163384 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 05:13:22 +00:00
Brett Leslie Porter 88d5980430 clean up MDO
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163383 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 04:12:09 +00:00
Brett Leslie Porter cdad649568 backwards compat. ability to have multiple archives
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163374 13f79535-47bb-0310-9956-ffa450edef68
2005-02-22 05:26:59 +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 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 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
Brett Leslie Porter 74c9b91b5a add cvs.apache.org repository for snapshot dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163256 13f79535-47bb-0310-9956-ffa450edef68
2004-12-20 18:40:14 +00:00
Brett Leslie Porter 7b70cbc7a2 add CDATAs to description
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163255 13f79535-47bb-0310-9956-ffa450edef68
2004-12-17 13:15:30 +00:00
Brett Leslie Porter a893bb4498 add maven 1.x build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163254 13f79535-47bb-0310-9956-ffa450edef68
2004-12-17 13:09:54 +00:00
Brett Leslie Porter 64196260bc remove old stuff
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163253 13f79535-47bb-0310-9956-ffa450edef68
2004-12-16 09:36:34 +00:00
Brett Leslie Porter 8378e66c2b has been absorbed into main file
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163248 13f79535-47bb-0310-9956-ffa450edef68
2004-12-14 09:58:18 +00:00
Jason van Zyl 6ec6f3d88b o adding in the per goal/mojo configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163182 13f79535-47bb-0310-9956-ffa450edef68
2004-10-03 19:25:15 +00:00
Jason van Zyl b6ba62ae98 o sketch of plugin configuration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163180 13f79535-47bb-0310-9956-ffa450edef68
2004-10-01 16:39:52 +00:00
Jason van Zyl 3ec86ab1ea o adding <plugins/> element to the model that will be used for configuring
plugins (i am getting tired of the -Dfoo=bar mucking).


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163178 13f79535-47bb-0310-9956-ffa450edef68
2004-10-01 14:36:23 +00:00
Emmanuel Venisse ed31ac5175 Fix mapStyle attribute. The correct name is xml.mapStyle
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163176 13f79535-47bb-0310-9956-ffa450edef68
2004-10-01 12:35:20 +00:00
Emmanuel Venisse 78de36fa72 We use now the new modello.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163160 13f79535-47bb-0310-9956-ffa450edef68
2004-09-26 13:29:06 +00:00
Emmanuel Venisse 9eccf7e139 Fix parent field.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163159 13f79535-47bb-0310-9956-ffa450edef68
2004-09-24 15:34:11 +00:00
Emmanuel Venisse bea17db376 The new model for the new modello. Not tested for the moment.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163158 13f79535-47bb-0310-9956-ffa450edef68
2004-09-24 14:57:07 +00:00
Brett Leslie Porter cd6f43bcf1 add type to key in v3
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163130 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 13:48:47 +00:00
Brett Leslie Porter 1f36126287 crappy temporary build stuff for the maven 1.1 model
should be replaced really soon with:
- correction of properties bug in modello
- addition of a --package command to modello
- maven plugin for modello


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163129 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 11:05:54 +00:00
Brett Leslie Porter 425d44a54b clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163128 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 10:57:57 +00:00
Brett Leslie Porter 5d4897ddba add equals/hashcode for dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163118 13f79535-47bb-0310-9956-ffa450edef68
2004-09-19 06:12:37 +00:00
Brett Leslie Porter e25114e87f remove handling done inside project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163117 13f79535-47bb-0310-9956-ffa450edef68
2004-09-19 04:12:46 +00:00
Brett Leslie Porter 2fbbfa6274 add some legacy dependency stuff for v3.0.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163115 13f79535-47bb-0310-9956-ffa450edef68
2004-09-19 01:30:53 +00:00
Brett Leslie Porter 7b0fdd7222 v3 consistency
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163095 13f79535-47bb-0310-9956-ffa450edef68
2004-09-17 21:42:40 +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 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
Trygve Laugstol 57922db9c9 o Making it easier to change the model file.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162913 13f79535-47bb-0310-9956-ffa450edef68
2004-08-09 15:40:26 +00:00
Trygve Laugstol 4f12e1cfa6 o Adding the new modello model using associations.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162911 13f79535-47bb-0310-9956-ffa450edef68
2004-08-08 02:49:38 +00:00
Trygve Laugstol 560f659099 o Adding the pre associations modello model as a reference.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162910 13f79535-47bb-0310-9956-ffa450edef68
2004-08-08 02:49:08 +00:00