Commit Graph

68 Commits

Author SHA1 Message Date
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 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
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
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 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
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
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 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
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
Jason van Zyl 1a13142117 o tweak the model for v3 and v4 generation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162735 13f79535-47bb-0310-9956-ffa450edef68
2004-06-06 05:50:24 +00:00
Jason van Zyl ec786ecb3c o give 3.0.0 Branch.tag a version.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162734 13f79535-47bb-0310-9956-ffa450edef68
2004-06-06 05:26:37 +00:00
Jason van Zyl 15d5de1217 o information for continuous integration, pretty much the same
format as the issueManagement element.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162685 13f79535-47bb-0310-9956-ffa450edef68
2004-04-29 22:39:05 +00:00
Jason van Zyl 84092036cd *** empty log message ***
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162682 13f79535-47bb-0310-9956-ffa450edef68
2004-04-17 17:15:58 +00:00
Jason van Zyl 2256dae4cf o add versions so that the 4.0.0 version of the model is used to
output the source, xpp3 reader/writer, xdoc and XSD.

o more tweaks to the model for correct output.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162680 13f79535-47bb-0310-9956-ffa450edef68
2004-04-17 15:13:31 +00:00
Jason van Zyl 2b42e39161 o cleaning up all the versions
o can now generate distinct versions of the model


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162679 13f79535-47bb-0310-9956-ffa450edef68
2004-04-17 04:22:52 +00:00
Jason van Zyl a7c579dabf o adding versions to all fields and elements so that I can output distinct
versions of the model.

o adding required elements where appropriate so the generated XSD is
  correct.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162678 13f79535-47bb-0310-9956-ffa450edef68
2004-04-16 21:48:24 +00:00
Jason van Zyl 065edb8918 o url will do
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162669 13f79535-47bb-0310-9956-ffa450edef68
2004-04-15 14:31:27 +00:00
Jason van Zyl 96b61b2000 o adding some versions to elements to experiment with output for a specific version. Working on the v3 -> v4 converter.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162668 13f79535-47bb-0310-9956-ffa450edef68
2004-04-15 02:03:54 +00:00
Jason van Zyl 8ceb14aa0f o adding type element to the project. so now the groupId, artifactId and type of a project match that of a dependency.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162667 13f79535-47bb-0310-9956-ffa450edef68
2004-04-15 01:59:20 +00:00
Jason van Zyl 74c42ed9e7 o change the <repository/> to the <scm/>.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162665 13f79535-47bb-0310-9956-ffa450edef68
2004-04-13 03:19:09 +00:00
Jason van Zyl 8c9fabae82 o Committing changes submitted by Trygve Laugst��l to accomodate the new form
of specifying a parent model to use which is of the form:

<parent>
  <groupId/>
    <artifactId/>
      <version/>
      </parent>

      This allows us to work consistently from the local repository or the
unified
source root where missing models are downloaded now that we have the required
information within the <parent/> element.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162657 13f79535-47bb-0310-9956-ffa450edef68
2004-04-12 14:41:05 +00:00
Jason van Zyl 8889ee6f4b o adding some comments
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162605 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 19:05:39 +00:00
Jason van Zyl 8a583ac7df o accept pomVersion and delegate to modelVersion
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162604 13f79535-47bb-0310-9956-ffa450edef68
2004-03-10 23:23:02 +00:00
Jason van Zyl ab2f3d9671 o don't need the type of description when delegating
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162603 13f79535-47bb-0310-9956-ffa450edef68
2004-03-10 22:25:49 +00:00
Jason van Zyl dd24911520 o I want to be able to read/write the <currentVersion/> element but I
want everything delegated to the version field, so for lack of a better
  term I made the <delegateTo> element for modello to shunt control of
  one field to another.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162602 13f79535-47bb-0310-9956-ffa450edef68
2004-03-10 22:24:29 +00:00