@cyclonedx/cdxgen 9.1.0 → 9.1.1

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.
Files changed (3) hide show
  1. package/index.js +10 -6
  2. package/package.json +1 -1
  3. package/utils.js +0 -4
package/index.js CHANGED
@@ -1316,17 +1316,21 @@ export const createJavaBom = async (path, options) => {
1316
1316
  }
1317
1317
  if (gradleFiles && gradleFiles.length && options.installDeps) {
1318
1318
  const gradleCmd = getGradleCommand(path, null);
1319
+ const defaultDepTaskArgs = ["-q", "--console", "plain", "--build-cache"];
1319
1320
  allProjects.push(parentComponent);
1321
+ let depTaskWithArgs = ["dependencies"];
1322
+ if (process.env.GRADLE_DEPENDENCY_TASK) {
1323
+ depTaskWithArgs = process.env.GRADLE_DEPENDENCY_TASK.split(" ");
1324
+ }
1320
1325
  for (const sp of allProjects) {
1321
1326
  let gradleDepArgs = [
1322
1327
  sp.purl === parentComponent.purl
1323
- ? "dependencies"
1324
- : `:${sp.name}:dependencies`,
1325
- "-q",
1326
- "--console",
1327
- "plain",
1328
- "--build-cache"
1328
+ ? depTaskWithArgs[0]
1329
+ : `:${sp.name}:${depTaskWithArgs[0]}`
1329
1330
  ];
1331
+ gradleDepArgs = gradleDepArgs
1332
+ .concat(depTaskWithArgs.slice(1))
1333
+ .concat(defaultDepTaskArgs);
1330
1334
  // Support custom GRADLE_ARGS such as --configuration runtimeClassPath
1331
1335
  if (process.env.GRADLE_ARGS) {
1332
1336
  const addArgs = process.env.GRADLE_ARGS.split(" ");
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cyclonedx/cdxgen",
3
- "version": "9.1.0",
3
+ "version": "9.1.1",
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
@@ -1722,10 +1722,6 @@ export const executeGradleProperties = function (dir, rootPath, subProject) {
1722
1722
  "--build-cache"
1723
1723
  ];
1724
1724
  const gradleCmd = getGradleCommand(dir, rootPath);
1725
- if (process.env.GRADLE_ARGS) {
1726
- const addArgs = process.env.GRADLE_ARGS.split(" ");
1727
- gradlePropertiesArgs = gradlePropertiesArgs.concat(addArgs);
1728
- }
1729
1725
  console.log(
1730
1726
  "Executing",
1731
1727
  gradleCmd,