You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2011/04/20 23:47:00 UTC
svn commit: r1095525 -
/tuscany/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java
Author: rfeng
Date: Wed Apr 20 21:46:59 2011
New Revision: 1095525
URL: http://svn.apache.org/viewvc?rev=1095525&view=rev
Log:
Apply patch from Nitya for TUSCANY-3862. Thank you.
Modified:
tuscany/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java
Modified: tuscany/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java
URL: http://svn.apache.org/viewvc/tuscany/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java?rev=1095525&r1=1095524&r2=1095525&view=diff
==============================================================================
--- tuscany/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java (original)
+++ tuscany/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java Wed Apr 20 21:46:59 2011
@@ -107,7 +107,8 @@ public class ClassConflictsDetectorMojo
continue;
}
if (artifact.isResolved()) {
- if ("jar".equals(artifact.getType())) {
+ //Check if artifact is a jar & actually points to a file
+ if ("jar".equals(artifact.getType()) && (artifact.getFile() != null && artifact.getFile().isFile())) {
files.add(artifact.getFile());
}
}