Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
May 30, 2024
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
603c31c
Fallback on 'cdx' or 'bom' JSON files for Java BOM
nekhtan May 29, 2024
16d2518
Look for bom files in target folder only
nekhtan May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading