@cyclonedx/cdxgen 10.3.3 → 10.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/cdxgen.js +12 -10
- package/index.js +1 -1
- package/package.json +1 -1
package/bin/cdxgen.js
CHANGED
|
@@ -299,11 +299,23 @@ if (process.argv[1].includes("obom") && !args.type) {
|
|
|
299
299
|
args.type = "os";
|
|
300
300
|
}
|
|
301
301
|
|
|
302
|
+
/**
|
|
303
|
+
* Command line options
|
|
304
|
+
*/
|
|
305
|
+
const options = Object.assign({}, args, {
|
|
306
|
+
projectType: args.type,
|
|
307
|
+
multiProject: args.recurse,
|
|
308
|
+
noBabel: args.noBabel || args.babel === false,
|
|
309
|
+
project: args.projectId,
|
|
310
|
+
deep: args.deep || args.evidence
|
|
311
|
+
});
|
|
312
|
+
|
|
302
313
|
if (process.argv[1].includes("cbom")) {
|
|
303
314
|
options.includeCrypto = true;
|
|
304
315
|
options.includeFormulation = true;
|
|
305
316
|
options.evidence = true;
|
|
306
317
|
options.specVersion = 1.6;
|
|
318
|
+
options.deep = true;
|
|
307
319
|
}
|
|
308
320
|
|
|
309
321
|
/**
|
|
@@ -374,16 +386,6 @@ const applyAdvancedOptions = (options) => {
|
|
|
374
386
|
return options;
|
|
375
387
|
};
|
|
376
388
|
|
|
377
|
-
/**
|
|
378
|
-
* Command line options
|
|
379
|
-
*/
|
|
380
|
-
const options = Object.assign({}, args, {
|
|
381
|
-
projectType: args.type,
|
|
382
|
-
multiProject: args.recurse,
|
|
383
|
-
noBabel: args.noBabel || args.babel === false,
|
|
384
|
-
project: args.projectId,
|
|
385
|
-
deep: args.deep || args.evidence
|
|
386
|
-
});
|
|
387
389
|
applyAdvancedOptions(options);
|
|
388
390
|
|
|
389
391
|
/**
|
package/index.js
CHANGED
|
@@ -1204,7 +1204,7 @@ export async function createJavaBom(path, options) {
|
|
|
1204
1204
|
) {
|
|
1205
1205
|
const cdxMavenPlugin =
|
|
1206
1206
|
process.env.CDX_MAVEN_PLUGIN ||
|
|
1207
|
-
"org.cyclonedx:cyclonedx-maven-plugin:2.
|
|
1207
|
+
"org.cyclonedx:cyclonedx-maven-plugin:2.8.0";
|
|
1208
1208
|
const cdxMavenGoal = process.env.CDX_MAVEN_GOAL || "makeAggregateBom";
|
|
1209
1209
|
let mvnArgs = [`${cdxMavenPlugin}:${cdxMavenGoal}`, "-DoutputName=bom"];
|
|
1210
1210
|
if (includeMavenTestScope) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cyclonedx/cdxgen",
|
|
3
|
-
"version": "10.3.
|
|
3
|
+
"version": "10.3.5",
|
|
4
4
|
"description": "Creates CycloneDX Software Bill of Materials (SBOM) from source or container image",
|
|
5
5
|
"homepage": "http://github.com/cyclonedx/cdxgen",
|
|
6
6
|
"author": "Prabhu Subramanian <prabhu@appthreat.com>",
|