summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2011-04-20 21:46:59 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2011-04-20 21:46:59 +0000
commite088fd512295048f3caec62f1dd2cd4d1a6b4d54 (patch)
tree8c2fd8669f68dda97091a6065803621c0ed9658f
parentfe431a8b4182d43a4988248059f33a47be912738 (diff)
Apply patch from Nitya for TUSCANY-3862. Thank you.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1095525 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java b/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java
index 7c072a6b5c..c565030ed8 100644
--- a/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java
+++ b/maven-plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/tuscany/maven/dependency/plugin/ClassConflictsDetectorMojo.java
@@ -107,7 +107,8 @@ public class ClassConflictsDetectorMojo extends AbstractMojo {
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());
}
}