From 44530d6430453fb167691357dfccce7e9ee2ad40 Mon Sep 17 00:00:00 2001
From: Trygve Laugstol <trygvis@apache.org>
Date: Tue, 29 Jun 2004 15:08:22 +0000
Subject: [PATCH] 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
---
 maven-model/maven.mdo | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/maven-model/maven.mdo b/maven-model/maven.mdo
index 57313318d1..c9a683426a 100644
--- a/maven-model/maven.mdo
+++ b/maven-model/maven.mdo
@@ -703,8 +703,9 @@
           <code>
             public String getId()
             {
-                return groupId + ":" + artifactId;
+                return groupId + ":" + artifactId + ":" + type + ":" + version;
             }
+
             public String toString()
             {
                 return groupId + "/" + type + "s:" + artifactId + "-" + version;