Fallback on 'cdx' or 'bom' JSON files for Java BOM (#1127)

nekhtan · web-flow · commit df888c351d7e · 2024-05-30T12:21:12.000+01:00
* Fallback on 'cdx' or 'bom' JSON files for Java BOM

Signed-off-by: nekhtan &lt;129828933+nekhtan@users.noreply.github.com&gt;

* Look for bom files in target folder only

Signed-off-by: nekhtan &lt;129828933+nekhtan@users.noreply.github.com&gt;

---------

Signed-off-by: nekhtan &lt;129828933+nekhtan@users.noreply.github.com&gt;
diff --git a/index.js b/index.js
@@ -1281,7 +1281,7 @@ export async function createJavaBom(path, options) {
       bomJsonFiles = getAllFiles(path, "**/target/*.json", options);
       // Check if the bom json files got created in a directory other than target
       if (!bomJsonFiles.length) {
-        bomJsonFiles = getAllFiles(path, "**/bom*.json", options);
+        bomJsonFiles = getAllFiles(path, "target/**/*{cdx,bom}*.json", options);
       }
       const bomGenerated = bomJsonFiles.length;
       if (!bomGenerated || result.status !== 0 || result.error) {

Original file line number	Diff line number	Diff line change
`@@ -1281,7 +1281,7 @@ export async function createJavaBom(path, options) {`
`1281`	`1281`	`bomJsonFiles = getAllFiles(path, "*/target/.json", options);`
`1282`	`1282`	`// Check if the bom json files got created in a directory other than target`
`1283`	`1283`	`if (!bomJsonFiles.length) {`
`1284`		`- bomJsonFiles = getAllFiles(path, "*/bom.json", options);`
	`1284`	`+ bomJsonFiles = getAllFiles(path, "target/*/{cdx,bom}*.json", options);`
`1285`	`1285`	`}`
`1286`	`1286`	`const bomGenerated = bomJsonFiles.length;`
`1287`	`1287`	`if (!bomGenerated \|\| result.status !== 0 \|\| result.error) {`