Merge branch 'master' into issue-993

This commit is contained in:
Jeremy Long
2017-11-19 08:33:26 -05:00

View File

@@ -205,10 +205,10 @@ public final class CliParser {
final String msg = String.format("Invalid '%s' argument: '%s'", argumentName, path); final String msg = String.format("Invalid '%s' argument: '%s'", argumentName, path);
throw new FileNotFoundException(msg); throw new FileNotFoundException(msg);
} }
} else if (path.startsWith("//") || path.startsWith("\\\\")) { // } else if (path.startsWith("//") || path.startsWith("\\\\")) {
isValid = false; // isValid = false;
final String msg = String.format("Invalid '%s' argument: '%s'%nUnable to scan paths that start with '//'.", argumentName, path); // final String msg = String.format("Invalid '%s' argument: '%s'%nUnable to scan paths that start with '//'.", argumentName, path);
throw new FileNotFoundException(msg); // throw new FileNotFoundException(msg);
} else if ((path.endsWith("/*") && !path.endsWith("**/*")) || (path.endsWith("\\*") && path.endsWith("**\\*"))) { } else if ((path.endsWith("/*") && !path.endsWith("**/*")) || (path.endsWith("\\*") && path.endsWith("**\\*"))) {
LOGGER.warn("Possibly incorrect path '{}' from argument '{}' because it ends with a slash star; " LOGGER.warn("Possibly incorrect path '{}' from argument '{}' because it ends with a slash star; "
+ "dependency-check uses ant-style paths", path, argumentName); + "dependency-check uses ant-style paths", path, argumentName);