Author: brett
Date: Sun Oct 2 20:52:30 2005
New Revision: 293226
URL: http://svn.apache.org/viewcvs?rev=293226&view=rev
Log:
PR: MNG-1041
conflict id should include classifier
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=293226&r1=293225&r2=293226&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
Sun Oct 2 20:52:30 2005
@@ -215,12 +215,13 @@
public String getId()
{
- return getDependencyConflictId() + ( hasClassifier() ? ":" +
getClassifier() : "" ) + ":" + getBaseVersion();
+ return getDependencyConflictId() + ":" + getBaseVersion();
}
public String getDependencyConflictId()
{
- return getGroupId() + ":" + getArtifactId() + ":" + getType();
+ return getGroupId() + ":" + getArtifactId() + ":" + getType() +
+ ( hasClassifier() ? ":" + getClassifier() : "" );
}
public void addMetadata( ArtifactMetadata metadata )
@@ -252,7 +253,7 @@
public String toString()
{
- return getDependencyConflictId() + ( hasClassifier() ? ":" +
getClassifier() : "" ) + ":" +
+ return getDependencyConflictId() + ":" +
( version != null || baseVersion != null ? getBaseVersion() :
versionRange.toString() );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
