diff --git a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/CycloneDXBomHelpers.cs b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/CycloneDXBomHelpers.cs index b1e36494..3a627939 100644 --- a/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/CycloneDXBomHelpers.cs +++ b/src/CycloneDX.Spdx.Interop/Converters/v2_3/Helpers/CycloneDXBomHelpers.cs @@ -147,7 +147,7 @@ public static void AddSpdxPackages(this Bom bom, SpdxDocument doc) { component.Licenses = new List(); } - else + else if (package.LicenseDeclared != null) { component.Licenses = new List { new LicenseChoice { Expression = package.LicenseDeclared } }; } diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_assembly.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_assembly.snap index b5f1a345..26b376ba 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_assembly.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_assembly.snap @@ -31,9 +31,6 @@ "type": "library", "name": "acme-library-a", "version": "1.0.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_bom.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_bom.snap index e5e43606..21222457 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_bom.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_bom.snap @@ -97,9 +97,6 @@ "author": "Example Super Heros", "name": "mylibrary", "version": "1.0.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-hashes.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-hashes.snap index fb1d8957..c6f0e550 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-hashes.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-hashes.snap @@ -81,9 +81,6 @@ "content": "26cdc7fb3fd65fc3b621a4ef70bc7d2489d5c19e70c76cf7ec20e538df0047cf" } ], - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-ref.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-ref.snap index d8493044..9e6d77fe 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-ref.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-ref.snap @@ -31,9 +31,6 @@ "type": "library", "name": "acme-library", "version": "1.0.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", @@ -55,9 +52,6 @@ "type": "library", "name": "acme-library", "version": "1.0.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-swid-full.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-swid-full.snap index d38f0caa..71dbc43f 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-swid-full.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-swid-full.snap @@ -32,9 +32,6 @@ "author": "Acme Super Heros", "name": "Acme Application", "version": "9.1.1", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-swid.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-swid.snap index d38f0caa..71dbc43f 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-swid.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-swid.snap @@ -32,9 +32,6 @@ "author": "Acme Super Heros", "name": "Acme Application", "version": "9.1.1", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-types.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-types.snap index a94df4ac..594b6ddd 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-types.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_component-types.snap @@ -31,9 +31,6 @@ "type": "application", "name": "application-a", "version": "1.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", @@ -55,9 +52,6 @@ "type": "library", "name": "library-a", "version": "1.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", @@ -79,9 +73,6 @@ "type": "framework", "name": "framework-a", "version": "1.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", @@ -103,9 +94,6 @@ "type": "container", "name": "container-a", "version": "1.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", @@ -127,9 +115,6 @@ "type": "operating-system", "name": "operating-system-a", "version": "1.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", @@ -151,9 +136,6 @@ "type": "firmware", "name": "firmware-a", "version": "1.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_compositions.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_compositions.snap index ed0181fc..e21e008a 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_compositions.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_compositions.snap @@ -31,9 +31,6 @@ "type": "library", "name": "Partner Shaded Library", "version": "1.0", - "licenses": [ - {} - ], "purl": "pkg:maven/partner/shaded-library@1.0", "externalReferences": [ { @@ -56,9 +53,6 @@ "type": "library", "name": "Acme Library", "version": "3.0", - "licenses": [ - {} - ], "purl": "pkg:maven/acme/library@3.0", "externalReferences": [ { diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_dependency.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_dependency.snap index d082de38..06661929 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_dependency.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_dependency.snap @@ -31,9 +31,6 @@ "type": "library", "name": "library-a", "version": "1.0.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", @@ -55,9 +52,6 @@ "type": "library", "name": "library-b", "version": "1.0.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", @@ -79,9 +73,6 @@ "type": "library", "name": "library-c", "version": "1.0.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_external-reference.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_external-reference.snap index 148fe082..935351ee 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_external-reference.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_external-reference.snap @@ -31,9 +31,6 @@ "type": "library", "name": "mylibrary", "version": "1.0.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_license-name.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_license-name.snap index 85bfd9f1..060a1264 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_license-name.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_license-name.snap @@ -31,9 +31,6 @@ "type": "library", "name": "tomcat-catalina", "version": "9.0.14", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_minimal-viable.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_minimal-viable.snap index 0c7c203a..505f5ede 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_minimal-viable.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_minimal-viable.snap @@ -31,9 +31,6 @@ "type": "library", "name": "acme-library", "version": "1.0.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_patch.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_patch.snap index 246afbd0..d3338e19 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_patch.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_patch.snap @@ -31,9 +31,6 @@ "type": "library", "name": "sample-library", "version": "1.0.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION", diff --git a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_properties.snap b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_properties.snap index 0c7c203a..505f5ede 100644 --- a/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_properties.snap +++ b/tests/CycloneDX.Spdx.Interop.Tests/__snapshots__/ConverterTests.FromCDXToSpdxToCDXRoundTripTest_properties.snap @@ -31,9 +31,6 @@ "type": "library", "name": "acme-library", "version": "1.0.0", - "licenses": [ - {} - ], "externalReferences": [ { "url": "NOASSERTION",