Skip to content

Commit c4e46d0

Browse files
authored
Merge pull request #118 from dependency-check/develop
v6.1
2 parents ec3d0e5 + f0abdcd commit c4e46d0

File tree

3 files changed

+21
-15
lines changed

3 files changed

+21
-15
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Tasks/dependency-check-build-task/dependency-check-build-task.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,13 @@ async function run() {
7272
}
7373

7474
// Default args
75-
let args = `--project "${projectName}" --scan "${scanPath}" --out "${outField}"`;
75+
let args = `--project "${projectName}" --out "${outField}"`;
76+
77+
// Scan paths
78+
let paths = scanPath?.split(',');
79+
paths?.forEach(path => {
80+
args += ` --scan "${path}"`;
81+
});
7682

7783
// Exclude switch
7884
if (excludePath != sourcesDirectory)
@@ -195,7 +201,7 @@ async function run() {
195201

196202
// Process based on exit code
197203
let failed = exitCode != 0;
198-
let isViolation = exitCode == 1;
204+
let isViolation = exitCode == (dependencyCheckVersion.match(/^[0-7]\./) ? 1 : 15);
199205

200206
// Process scan artifacts is required
201207
let processArtifacts = !failed || isViolation;

src/Tasks/dependency-check-build-task/package-lock.json

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)