Skip to content

Fix empty licenses in SPDX conversion #405

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

Open
andreas-hilti wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix empty licenses in SPDX conversion #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/CycloneDXBomHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public static void AddSpdxPackages(this Bom bom, SpdxDocument doc)
{
component.Licenses = new List<LicenseChoice>();
}
else
else if (package.LicenseDeclared != null)
{
component.Licenses = new List<LicenseChoice> { new LicenseChoice { Expression = package.LicenseDeclared } };
}
Expand Down
3 changes: 0 additions & 3 deletions ....Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_assembly.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
"type": "library",
"name": "acme-library-a",
"version": "1.0.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
3 changes: 0 additions & 3 deletions ....Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_bom.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@
"author": "Example Super Heros",
"name": "mylibrary",
"version": "1.0.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
3 changes: 0 additions & 3 deletions ....Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-hashes.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@
"content": "26cdc7fb3fd65fc3b621a4ef70bc7d2489d5c19e70c76cf7ec20e538df0047cf"
}
],
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
6 changes: 0 additions & 6 deletions ...rop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-ref.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
"type": "library",
"name": "acme-library",
"version": "1.0.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand All @@ -55,9 +52,6 @@
"type": "library",
"name": "acme-library",
"version": "1.0.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
3 changes: 0 additions & 3 deletions ...sts/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-swid-full.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
"author": "Acme Super Heros",
"name": "Acme Application",
"version": "9.1.1",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
3 changes: 0 additions & 3 deletions ...op.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-swid.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
"author": "Acme Super Heros",
"name": "Acme Application",
"version": "9.1.1",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
18 changes: 0 additions & 18 deletions ...p.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-types.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
"type": "application",
"name": "application-a",
"version": "1.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand All @@ -55,9 +52,6 @@
"type": "library",
"name": "library-a",
"version": "1.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand All @@ -79,9 +73,6 @@
"type": "framework",
"name": "framework-a",
"version": "1.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand All @@ -103,9 +94,6 @@
"type": "container",
"name": "container-a",
"version": "1.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand All @@ -127,9 +115,6 @@
"type": "operating-system",
"name": "operating-system-a",
"version": "1.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand All @@ -151,9 +136,6 @@
"type": "firmware",
"name": "firmware-a",
"version": "1.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
6 changes: 0 additions & 6 deletions ...erop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_compositions.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
"type": "library",
"name": "Partner Shaded Library",
"version": "1.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand All @@ -55,9 +52,6 @@
"type": "library",
"name": "Acme Library",
"version": "3.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
9 changes: 0 additions & 9 deletions ...nterop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_dependency.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
"type": "library",
"name": "library-a",
"version": "1.0.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand All @@ -55,9 +52,6 @@
"type": "library",
"name": "library-b",
"version": "1.0.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand All @@ -79,9 +73,6 @@
"type": "library",
"name": "library-c",
"version": "1.0.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
3 changes: 0 additions & 3 deletions ...ests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_external-reference.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
"type": "library",
"name": "mylibrary",
"version": "1.0.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
3 changes: 0 additions & 3 deletions ...erop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_license-name.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
"type": "library",
"name": "tomcat-catalina",
"version": "9.0.14",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
3 changes: 0 additions & 3 deletions ...op.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_minimal-viable.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
"type": "library",
"name": "acme-library",
"version": "1.0.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
3 changes: 0 additions & 3 deletions ...pdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_patch.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
"type": "library",
"name": "sample-library",
"version": "1.0.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
3 changes: 0 additions & 3 deletions ...nterop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_properties.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
"type": "library",
"name": "acme-library",
"version": "1.0.0",
"licenses": [
{}
],
"externalReferences": [
{
"url": "NOASSERTION",
Expand Down
Loading