From 426df844bb09bf41e319797f897b5ef046507d31 Mon Sep 17 00:00:00 2001 From: Park Wonjae Date: Thu, 3 Sep 2026 11:27:30 +0900 Subject: [PATCH 1/3] fix(cyclonedx): update source BOM metadata Signed-off-by: Park Wonjae --- pyproject.toml | 2 +- src/fosslight_source/cli.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b84da94..9c2dbe4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ dependencies = [ "pyparsing", "scanoss>=1.45.0", "XlsxWriter", - "fosslight_util>=2.2.12", + "fosslight_util>=2.2.13", "PyYAML", "wheel>=0.38.1", "intbitset", diff --git a/src/fosslight_source/cli.py b/src/fosslight_source/cli.py index 4e2712a..7c92a25 100755 --- a/src/fosslight_source/cli.py +++ b/src/fosslight_source/cli.py @@ -176,15 +176,14 @@ def create_report_file( for i, output_extension in enumerate(output_extensions): if output_files[i] is None or output_files[i] == "": if formats: - if formats[i].startswith('spdx') or formats[i].startswith('cyclonedx'): + if formats[i].startswith('spdx'): if platform.system() == 'Windows': logger.warning(f'{formats[i]} is not supported on Windows.Please remove {formats[i]} from format.') to_remove.append(i) else: - if formats[i].startswith('spdx'): - output_files[i] = f"fosslight_spdx_src_{name_time}" - elif formats[i].startswith('cyclonedx'): - output_files[i] = f'fosslight_cyclonedx_src_{name_time}' + output_files[i] = f"fosslight_spdx_src_{name_time}" + elif formats[i].startswith('cyclonedx'): + output_files[i] = f'fosslight_cyclonedx_src_{name_time}' else: if output_extension == _json_ext: output_files[i] = f"fosslight_opossum_src_{name_time}" From 998664320b3d468591fde45eb21cffe82d4f2c66 Mon Sep 17 00:00:00 2001 From: Park Wonjae Date: Wed, 16 Sep 2026 18:51:15 +0900 Subject: [PATCH 2/3] feat(cyclonedx): record executed scanner tools Signed-off-by: Park Wonjae --- src/fosslight_source/cli.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fosslight_source/cli.py b/src/fosslight_source/cli.py index 7c92a25..3d1d778 100755 --- a/src/fosslight_source/cli.py +++ b/src/fosslight_source/cli.py @@ -275,7 +275,8 @@ def create_report_file( # if need_license and output_extension == _json_ext and "scanoss_reference" in sheet_list: # del sheet_list["scanoss_reference"] result = write_output_file( - combined_path_and_file, output_extension, scan_item, hide_header="", format=output_format + combined_path_and_file, output_extension, scan_item, hide_header="", format=output_format, + scanner_covers=[scan_item.cover] ) results.append(result) for success, msg, result_file in results: From cb74aea1dbf52ecb61d7f975be24e79c5b4e6d7f Mon Sep 17 00:00:00 2001 From: Park Wonjae Date: Wed, 16 Sep 2026 19:30:33 +0900 Subject: [PATCH 3/3] fix(deps): require fosslight_util 2.2.14 Signed-off-by: Park Wonjae --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9c2dbe4..dc96bac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ dependencies = [ "pyparsing", "scanoss>=1.45.0", "XlsxWriter", - "fosslight_util>=2.2.13", + "fosslight_util>=2.2.14", "PyYAML", "wheel>=0.38.1", "intbitset",