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
This commit is contained in:
Trygve Laugstol 2004-06-29 15:08:22 +00:00
parent ac307ad352
commit 44530d6430
1 changed files with 2 additions and 1 deletions

View File

@ -703,8 +703,9 @@
<code> <code>
public String getId() public String getId()
{ {
return groupId + ":" + artifactId; return groupId + ":" + artifactId + ":" + type + ":" + version;
} }
public String toString() public String toString()
{ {
return groupId + "/" + type + "s:" + artifactId + "-" + version; return groupId + "/" + type + "s:" + artifactId + "-" + version;