@cyclonedx/cdxgen 8.6.0 → 8.6.2
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/index.js +10 -6
- package/package.json +1 -1
- package/utils.js +0 -4
package/index.js
CHANGED
|
@@ -1244,17 +1244,21 @@ const createJavaBom = async (path, options) => {
|
|
|
1244
1244
|
}
|
|
1245
1245
|
if (gradleFiles && gradleFiles.length && options.installDeps) {
|
|
1246
1246
|
let gradleCmd = utils.getGradleCommand(path, null);
|
|
1247
|
+
const defaultDepTaskArgs = ["-q", "--console", "plain", "--build-cache"];
|
|
1247
1248
|
allProjects.push(parentComponent);
|
|
1249
|
+
let depTaskWithArgs = ["dependencies"];
|
|
1250
|
+
if (process.env.GRADLE_DEPENDENCY_TASK) {
|
|
1251
|
+
depTaskWithArgs = process.env.GRADLE_DEPENDENCY_TASK.split(" ");
|
|
1252
|
+
}
|
|
1248
1253
|
for (let sp of allProjects) {
|
|
1249
1254
|
let gradleDepArgs = [
|
|
1250
1255
|
sp.purl === parentComponent.purl
|
|
1251
|
-
?
|
|
1252
|
-
: `:${sp.name}
|
|
1253
|
-
"-q",
|
|
1254
|
-
"--console",
|
|
1255
|
-
"plain",
|
|
1256
|
-
"--build-cache"
|
|
1256
|
+
? depTaskWithArgs[0]
|
|
1257
|
+
: `:${sp.name}:${depTaskWithArgs[0]}`
|
|
1257
1258
|
];
|
|
1259
|
+
gradleDepArgs = gradleDepArgs
|
|
1260
|
+
.concat(depTaskWithArgs.slice(1))
|
|
1261
|
+
.concat(defaultDepTaskArgs);
|
|
1258
1262
|
// Support custom GRADLE_ARGS such as --configuration runtimeClassPath
|
|
1259
1263
|
if (process.env.GRADLE_ARGS) {
|
|
1260
1264
|
const addArgs = process.env.GRADLE_ARGS.split(" ");
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cyclonedx/cdxgen",
|
|
3
|
-
"version": "8.6.
|
|
3
|
+
"version": "8.6.2",
|
|
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>",
|
package/utils.js
CHANGED
|
@@ -1589,10 +1589,6 @@ const executeGradleProperties = function (dir, rootPath, subProject) {
|
|
|
1589
1589
|
"--build-cache"
|
|
1590
1590
|
];
|
|
1591
1591
|
let gradleCmd = getGradleCommand(dir, rootPath);
|
|
1592
|
-
if (process.env.GRADLE_ARGS) {
|
|
1593
|
-
const addArgs = process.env.GRADLE_ARGS.split(" ");
|
|
1594
|
-
gradlePropertiesArgs = gradlePropertiesArgs.concat(addArgs);
|
|
1595
|
-
}
|
|
1596
1592
|
console.log(
|
|
1597
1593
|
"Executing",
|
|
1598
1594
|
gradleCmd,
|