github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-22 09:09:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed dctemp path from being the primary dependency

Browse Source
This commit is contained in:
Jeremy Long
2016-10-21 07:05:21 -04:00
parent e70c2f2b05
commit 9338697079
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java
View File

@@ -96,8 +96,10 @@ public class DependencyBundlingAnalyzer extends AbstractAnalyzer {
//</editor-fold> //</editor-fold>
/** /**
* Does not support parallel processing as it only runs once and then operates on <em>all</em> dependencies. * Does not support parallel processing as it only runs once and then
* operates on <em>all</em> dependencies.
* *
* @return whether or not parallel processing is enabled
* @see #analyze(Dependency, Engine) * @see #analyze(Dependency, Engine)
*/ */
@Override @Override
@@ -361,11 +363,7 @@ public class DependencyBundlingAnalyzer extends AbstractAnalyzer {
|| dependency2.getPackagePath() == null) { || dependency2.getPackagePath() == null) {
return false; return false;
} }
if (dependency1.getPackagePath().equalsIgnoreCase(dependency2.getPackagePath())) { return dependency1.getPackagePath().equalsIgnoreCase(dependency2.getPackagePath());
return true;
}
return false;
} }
/** /**
@@ -416,10 +414,7 @@ public class DependencyBundlingAnalyzer extends AbstractAnalyzer {
|| dependency2.getPackagePath() == null) { || dependency2.getPackagePath() == null) {
return false; return false;
} }
if (dependency1.getPackagePath().equalsIgnoreCase(dependency2.getPackagePath())) { return dependency1.getPackagePath().equalsIgnoreCase(dependency2.getPackagePath());
return true;
}
return false;
} }
/** /**
@@ -528,6 +523,9 @@ public class DependencyBundlingAnalyzer extends AbstractAnalyzer {
* <code>false</code> * <code>false</code>
*/ */
protected boolean firstPathIsShortest(String left, String right) { protected boolean firstPathIsShortest(String left, String right) {
if (left.contains("dctemp")) {
return false;
}
final String leftPath = left.replace('\\', '/'); final String leftPath = left.replace('\\', '/');
final String rightPath = right.replace('\\', '/'); final String rightPath = right.replace('\\', '/');