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

Replace use of included DirectoryScanner with Apache Ant's

Browse Source
This commit is contained in:
Hans Joachim Desserud
2015-08-23 16:17:58 +02:00
parent 0859eab2dc
commit b26d9ea1e0
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dependency-check-cli/pom.xml
View File

@@ -235,5 +235,9 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved.
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

5
dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java
View File

@@ -31,7 +31,7 @@ import org.owasp.dependencycheck.data.nvdcve.CveDB;
import org.owasp.dependencycheck.data.nvdcve.DatabaseException; import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties; import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;
import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Dependency;
import org.owasp.dependencycheck.org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.DirectoryScanner;
import org.owasp.dependencycheck.reporting.ReportGenerator; import org.owasp.dependencycheck.reporting.ReportGenerator;
import org.owasp.dependencycheck.utils.Settings; import org.owasp.dependencycheck.utils.Settings;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -178,7 +178,8 @@ public class App {
//LOGGER.debug("baseDir: {}", baseDir); //LOGGER.debug("baseDir: {}", baseDir);
//LOGGER.debug("include: {}", include); //LOGGER.debug("include: {}", include);
scanner.setBasedir(baseDir); scanner.setBasedir(baseDir);
scanner.setIncludes(include); final String[] includes = {include};
scanner.setIncludes(includes);
scanner.setMaxLevelsOfSymlinks(symLinkDepth); scanner.setMaxLevelsOfSymlinks(symLinkDepth);
if (symLinkDepth <= 0) { if (symLinkDepth <= 0) {
scanner.setFollowSymlinks(false); scanner.setFollowSymlinks(false);