Skip to content

Commit

Permalink
Bug fix. atom invocation was broken. Fixes #614 #609
Browse files Browse the repository at this point in the history
Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
  • Loading branch information
prabhu committed Oct 5, 2023
1 parent bacd100 commit 30f4ab8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cyclonedx/cdxgen",
"version": "9.8.6",
"version": "9.8.7",
"description": "Creates CycloneDX Software Bill of Materials (SBOM) from source or container image",
"homepage": "http://github.com/cyclonedx/cdxgen",
"author": "Prabhu Subramanian <prabhu@appthreat.com>",
Expand Down Expand Up @@ -82,7 +82,7 @@
"yargs": "^17.7.2"
},
"optionalDependencies": {
"@appthreat/atom": "^1.2.3",
"@appthreat/atom": "1.2.5",
"@cyclonedx/cdxgen-plugins-bin": "^1.4.0",
"@cyclonedx/cdxgen-plugins-bin-arm64": "^1.4.0",
"@cyclonedx/cdxgen-plugins-bin-ppc64": "^1.4.0",
Expand Down
6 changes: 1 addition & 5 deletions utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -5403,11 +5403,7 @@ export const collectMvnDependencies = function (
"-Dmdep.stripVersion=" + (process.env.MAVEN_STRIP_VERSION || "false")
];
if (basePath && basePath !== MAVEN_CACHE_DIR) {
console.log(
`Executing '${mavenCmd} dependency:copy-dependencies ${copyArgs.join(
" "
)}' in ${basePath}`
);
console.log(`Executing '${mavenCmd} ${copyArgs.join(" ")}' in ${basePath}`);
const result = spawnSync(mavenCmd, copyArgs, {
cwd: basePath,
encoding: "utf-8",
Expand Down

0 comments on commit 30f4ab8

Please sign in to comment.