Merge pull request #118 from dependency-check/develop

v6.1
dependency-check · Jan 19, 2023 · c4e46d0 · c4e46d0
2 parents ec3d0e5 + f0abdcd
commit c4e46d0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Tasks/dependency-check-build-task/dependency-check-build-task.ts b/src/Tasks/dependency-check-build-task/dependency-check-build-task.ts
@@ -72,7 +72,13 @@ async function run() {
         }
 
         // Default args
-        let args = `--project "${projectName}" --scan "${scanPath}" --out "${outField}"`;
+        let args = `--project "${projectName}" --out "${outField}"`;
+
+        // Scan paths
+        let paths = scanPath?.split(',');
+        paths?.forEach(path => {
+            args += ` --scan "${path}"`;
+        });
 
         // Exclude switch
         if (excludePath != sourcesDirectory)
@@ -195,7 +201,7 @@ async function run() {
 
         // Process based on exit code
         let failed = exitCode != 0;
-        let isViolation = exitCode == 1;
+        let isViolation = exitCode == (dependencyCheckVersion.match(/^[0-7]\./) ? 1 : 15);
 
         // Process scan artifacts is required
         let processArtifacts = !failed || isViolation;

diff --git a/src/Tasks/dependency-check-build-task/package-lock.json b/src/Tasks/dependency-check-build-task/package-lock.json