Commit Graph

196 Commits

Author SHA1 Message Date
John Dennis Casey 6ca4de295d Added inheritance of Plugins according to the rules we decided upon. This consists of:
- inheritanceApplied flag on Plugin and Goal (NOT fields, just a code-only flag)
- flushGoalMap/flushPluginMap to clear caching of these calculated attributes
- ModelUtils.mergePluginLists() and ModelUtils.mergePluginDefinitions() for use in both
    * DefaultModelInheritanceAssembler (Plugin/PluginManagement lists)
    * DefaultModelDefaultsInjector (PluginManagement -> Plugin merges)

- Also added a few unit tests for basic Plugin inheritance stuff. This could be more thoroughly tested...

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178825 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 21:47:12 +00:00
John Dennis Casey 239439bb04 o Added inherited field to the Plugin and Goal classes in maven.mdo
o Added annotation inheritedByDefault (looks like: @inheritedByDefault true|false) for java mojos
o Added support for inheritedByDefault to MojoDescriptor, descriptor generator and builder
o Factored the plugin combinatorial logic into ModelUtils in o.a.m.project, for later reuse in a plugin-aware model inheritance builder
o Refactored the DefaultModelDefaultsInjector to use the new ModelUtils for plugin merging (this is factored into a utility for reuse in inheritance assembly)


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178733 13f79535-47bb-0310-9956-ffa450edef68
2005-05-27 03:27:55 +00:00
Brett Leslie Porter fd49b1e857 remove default excludes, the directory scanner has it built in
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178571 13f79535-47bb-0310-9956-ffa450edef68
2005-05-26 03:08:27 +00:00
Emmanuel Venisse 551ab886d7 Add tag to scm part
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@178317 13f79535-47bb-0310-9956-ffa450edef68
2005-05-24 23:24:30 +00:00
Brett Leslie Porter aae12fa37a add additional contributor fields and default goal
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170711 13f79535-47bb-0310-9956-ffa450edef68
2005-05-18 05:33:59 +00:00
Brett Leslie Porter 89b475c171 update to match m1 code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@170308 13f79535-47bb-0310-9956-ffa450edef68
2005-05-16 05:09:11 +00:00
Brett Leslie Porter 7ed8a746d3 update to released versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169961 13f79535-47bb-0310-9956-ffa450edef68
2005-05-13 07:01:57 +00:00
Brett Leslie Porter 9f05a45c66 improve intro page
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169782 13f79535-47bb-0310-9956-ffa450edef68
2005-05-12 06:52:00 +00:00
Brett Leslie Porter b4bbf3071d extend not present in 4.0.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169602 13f79535-47bb-0310-9956-ffa450edef68
2005-05-11 08:17:06 +00:00
Brett Leslie Porter 8fc3e7a305 PR: MNG-338
Helpful error message for non-redistributable JARs, eg jdbc

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169577 13f79535-47bb-0310-9956-ffa450edef68
2005-05-11 04:29:44 +00:00
Brett Leslie Porter acfba80edc consolidate defaults injection
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168152 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 17:34:52 +00:00
Brett Leslie Porter 9ba38545ea update to latest modello plugin versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168134 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 14:41:33 +00:00
Brett Leslie Porter 24c6328ad3 declare the desired "prefix" inside the plugin descriptor instead of pulling apart the artifact ID (though that is how the default is created).
Currently, the reverse is not handled in anyway, so a non-default prefix may not work, but this makes the code easier to isolate.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168099 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 08:17:39 +00:00
Brett Leslie Porter b5670bdcaa start to clean up the plugin vs. goal name handling so the hardcoding can be reduced, and eventually removed
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168040 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 01:20:49 +00:00
Brett Leslie Porter 23835350c8 fixes related to changing the path of parent poms, though the actual functionality is not implemented
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164346 13f79535-47bb-0310-9956-ffa450edef68
2005-04-23 06:24:08 +00:00
Brett Leslie Porter 6055b99a56 documentation enhancements, and added transitive dependencies document
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163955 13f79535-47bb-0310-9956-ffa450edef68
2005-04-15 11:08:16 +00:00
Brett Leslie Porter 08eaf5c94f PR: MNG-222
Submitted by:	Dennis Lundberg
Reviewed by:	Brett Porter
correction of typos, spelling and grammar


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163889 13f79535-47bb-0310-9956-ffa450edef68
2005-04-09 02:07:15 +00:00
Brett Leslie Porter e62f087f24 some POM enhancements
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163862 13f79535-47bb-0310-9956-ffa450edef68
2005-04-08 07:50:53 +00:00
John Dennis Casey 20620b4e09 o Changed the repository to test.maven.codehaus.org for testing of the new repository and layout.
o Added <layout/> element to <repository/> elements in the maven.mdo
o Added pluginRepository configuration to the super-POM.
o Tested it all.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163791 13f79535-47bb-0310-9956-ffa450edef68
2005-04-06 01:28:29 +00:00
Brett Leslie Porter a91be5bc51 use new name
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163789 13f79535-47bb-0310-9956-ffa450edef68
2005-04-05 16:30:55 +00:00
Brett Leslie Porter 935cda15da clean up dependencies.
Still need to clean up ~/maven2/lib and some large dependencies from marmalade that
shouldn't be needed in general - but down to about a 3Mb repository.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163775 13f79535-47bb-0310-9956-ffa450edef68
2005-04-05 04:11:03 +00:00
Brett Leslie Porter eabafcc093 implement snapshot policies: default is to only check once a day (after crossing midnight), or if --update-snapshots (-U) is specified on the command line
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163711 13f79535-47bb-0310-9956-ffa450edef68
2005-03-30 03:30:08 +00:00
Brett Leslie Porter 14bb2c805a change the maven group ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163670 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 06:52:55 +00:00
Brett Leslie Porter b84d4bc35e revert <includes> and <excludes> in MDO to old format
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163666 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 14:26:28 +00:00
Brett Leslie Porter e0e405fe68 clean up plugin configuration handling
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163652 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 10:46:55 +00:00
Brett Leslie Porter b63fd801d2 patch MDO for CI until proper removal is in place
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163650 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 09:58:19 +00:00
Trygve Laugstol e54ce35409 o Changing the default notifier type from 'email' to 'mail'.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163640 13f79535-47bb-0310-9956-ffa450edef68
2005-03-21 14:38:59 +00:00
Brett Leslie Porter a97c024f3b ability to build standalone
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163605 13f79535-47bb-0310-9956-ffa450edef68
2005-03-18 01:13:31 +00:00
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
Emmanuel Venisse 2ef9ee0656 Rollback default Value of tests includes, It's now inherited from parent if it isn't define.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162896 13f79535-47bb-0310-9956-ffa450edef68
2004-07-27 15:40:04 +00:00
Emmanuel Venisse 94418f0102 Add **/*Test.java as default value of test includes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162891 13f79535-47bb-0310-9956-ffa450edef68
2004-07-27 11:49:27 +00:00
John Dennis Casey 10b6aaaed6 added maven.xsd to ignored list for maven-model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162862 13f79535-47bb-0310-9956-ffa450edef68
2004-07-19 02:26:15 +00:00
Brett Leslie Porter cf719faeda make most scripts exit on error
tested only on cygwin - if it causes issues on linux, feel free to rollback


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162859 13f79535-47bb-0310-9956-ffa450edef68
2004-07-18 01:22:49 +00:00
Trygve Laugstol cb0c6ad6c4 o Adding <modelVersion> to the poms.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162855 13f79535-47bb-0310-9956-ffa450edef68
2004-07-05 20:12:50 +00:00
Trygve Laugstol 44530d6430 o Adding type+version to the dependency id so that it matches the project.id
o Changed the ArtifactCollector so that it resolves version conflicts again.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162847 13f79535-47bb-0310-9956-ffa450edef68
2004-06-29 15:08:22 +00:00
Trygve Laugstol 848a7dd433 o Adding the type to getId() of a pom v4.0.0.
o Changing the artifact list in MavenProject to a Set.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162845 13f79535-47bb-0310-9956-ffa450edef68
2004-06-27 18:46:52 +00:00
Trygve Laugstol 472d180a19 o Adding nagEmailAddress to the ciManagement part.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162841 13f79535-47bb-0310-9956-ffa450edef68
2004-06-27 07:03:31 +00:00
Michal Maczka 27c0d5f0cc Pushing back my changes to model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162834 13f79535-47bb-0310-9956-ffa450edef68
2004-06-23 18:03:06 +00:00
Jason van Zyl 4c5fcb62d4 o rolling back changes that are breaking the build
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162833 13f79535-47bb-0310-9956-ffa450edef68
2004-06-23 15:13:53 +00:00
Michal Maczka d313ec01db removed conflicted code (my fault!)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162832 13f79535-47bb-0310-9956-ffa450edef68
2004-06-22 19:53:33 +00:00
Michal Maczka 61ead8784f more excludes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162831 13f79535-47bb-0310-9956-ffa450edef68
2004-06-22 19:28:54 +00:00
Michal Maczka dac191ef44 reorganization of some elements of POM
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162830 13f79535-47bb-0310-9956-ffa450edef68
2004-06-22 19:25:54 +00:00
Emmanuel Venisse 2fe989371b Add some default excludes.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162817 13f79535-47bb-0310-9956-ffa450edef68
2004-06-20 14:01:19 +00:00
Emmanuel Venisse afba825dbb Add toString method for dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162816 13f79535-47bb-0310-9956-ffa450edef68
2004-06-20 12:48:23 +00:00
Jason van Zyl bb5ec46562 o we now have distributionManagement so we don't want the old crap in
the v4 POM.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162811 13f79535-47bb-0310-9956-ffa450edef68
2004-06-19 18:58:59 +00:00
Jason van Zyl 302c0c9c64 o adding distributionManagement element to the project
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162810 13f79535-47bb-0310-9956-ffa450edef68
2004-06-19 18:55:16 +00:00
Jason van Zyl 944b65451b o added project.build.output which takes a default value of
target/classes and is the location for compiled application classes

o added project.build.testOutput which takes a default value of
  target/test-classes and is the location for compiled test classes

  After chatting with Michal we decided that we want a single place
  where we can control these values and provide a single place for
  a user to override them if they wish to.

  The build directory, the directory where compiled app classes go, and
  the directory where compiled test classes go can now all be accessed
  in a consistent fashion.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162756 13f79535-47bb-0310-9956-ffa450edef68
2004-06-14 23:21:23 +00:00
Jason van Zyl 8430b7b9cf o the addition the the build.directory element
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162743 13f79535-47bb-0310-9956-ffa450edef68
2004-06-11 22:04:26 +00:00
Jason van Zyl dd4fc3384f o moving core deps into top-level pom.xml to be shared by all the
component builds.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162741 13f79535-47bb-0310-9956-ffa450edef68
2004-06-10 20:27:50 +00:00
Jason van Zyl 60af082ea2 o doing the pom.xml thing
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162739 13f79535-47bb-0310-9956-ffa450edef68
2004-06-09 03:10:50 +00:00
Michal Maczka 62659b716c Added support for repositories
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162738 13f79535-47bb-0310-9956-ffa450edef68
2004-06-07 18:16:53 +00:00