From f2ebd7342c8c42e560a4bd28829fee5d12b53387 Mon Sep 17 00:00:00 2001 From: Michael Tsfoni <80639729+mtsfoni@users.noreply.github.com> Date: Mon, 16 Sep 2024 21:50:40 +0200 Subject: [PATCH] Bump CycloneDX-Library to version 8.0.0 (#400) Signed-off-by: MTsfoni --- semver.txt | 2 +- src/cyclonedx/Serialization/CsvSerializer.cs | 6 +++- src/cyclonedx/cyclonedx.csproj | 4 +-- ...tTests.ConvertFromSpdxJson_autodetect.snap | 2 +- ...ertTests.ConvertFromSpdxJson_spdxjson.snap | 2 +- ....0.xml_autodetect_bom.xml_autodetect_.snap | 2 +- ...t_bom-1.0.xml_xml_bom.xml_autodetect_.snap | 2 +- ....1.xml_autodetect_bom.xml_autodetect_.snap | 2 +- ...t_bom-1.1.xml_xml_bom.xml_autodetect_.snap | 2 +- ....json_autodetect_bom.json_autodetect_.snap | 2 +- ...om-1.2.json_json_bom.json_autodetect_.snap | 2 +- ....2.xml_autodetect_bom.xml_autodetect_.snap | 2 +- ...t_bom-1.2.xml_xml_bom.xml_autodetect_.snap | 2 +- ....Convert_bom-1.2.xml_xml_bom.xml_xml_.snap | 2 +- ...-1.3.cdx_protobuf_bom.cdx_autodetect_.snap | Bin 2363 -> 2359 bytes ...m-1.3.cdx_protobuf_bom.json_json_v1_3.snap | 4 +-- ....json_autodetect_bom.json_autodetect_.snap | 2 +- ...m-1.3.json_json_bom.cdx_protobuf_v1_3.snap | Bin 2385 -> 2382 bytes ...om-1.3.json_json_bom.json_autodetect_.snap | 2 +- ...vert_bom-1.3.json_json_bom.json_json_.snap | 2 +- ....3.xml_autodetect_bom.xml_autodetect_.snap | 2 +- ...t_bom-1.3.xml_xml_bom.xml_autodetect_.snap | 2 +- ....Convert_bom-1.3.xml_xml_bom.xml_xml_.snap | 2 +- ....json_autodetect_bom.json_autodetect_.snap | 2 +- ...om-1.4.json_json_bom.json_autodetect_.snap | 2 +- ...vert_bom-1.4.json_json_bom.json_json_.snap | 2 +- ....4.xml_autodetect_bom.xml_autodetect_.snap | 2 +- ...t_bom-1.4.xml_xml_bom.xml_autodetect_.snap | 2 +- ....Convert_bom-1.4.xml_xml_bom.xml_xml_.snap | 2 +- ....json_autodetect_bom.json_autodetect_.snap | 2 +- ...om-1.5.json_json_bom.json_autodetect_.snap | 2 +- ...vert_bom-1.5.json_json_bom.json_json_.snap | 2 +- ....5.xml_autodetect_bom.xml_autodetect_.snap | 2 +- ...t_bom-1.5.xml_xml_bom.xml_autodetect_.snap | 2 +- ....Convert_bom-1.5.xml_xml_bom.xml_xml_.snap | 2 +- ...zationTests_bom-lowercase-field-names.snap | 2 +- ...serializationTests_bom-minimum-viable.snap | 2 +- ...ializerTests.DeserializationTests_bom.snap | 2 +- ...alizationTests_valid-component-hashes.snap | 2 +- ...zationTests_valid-component-swid-full.snap | 2 +- ...rializationTests_valid-component-swid.snap | 2 +- ...ializationTests_valid-component-types.snap | 2 +- ...izationTests_valid-license-expression.snap | 2 +- ...DeserializationTests_valid-license-id.snap | 2 +- ...serializationTests_valid-license-name.snap | 2 +- ...json_autodetect_sbom.json_autodetect_.snap | 2 +- ...sbom2.json_autodetect_sbom.json_json_.snap | 2 +- ....json_autodetect_sbom.xml_autodetect_.snap | 2 +- ...n_sbom2.json_autodetect_sbom.xml_xml_.snap | 2 +- ...sbom2.json_json_sbom.json_autodetect_.snap | 2 +- ...2.xml_autodetect_sbom.xml_autodetect_.snap | 2 +- ....xml_autodetect_sbom.json_autodetect_.snap | 32 ++++++++++++++---- ...2.xml_autodetect_sbom.xml_autodetect_.snap | 2 +- ...ml_sbom2.xml_xml_sbom.xml_autodetect_.snap | 2 +- ...json_autodetect_sbom.json_autodetect_.snap | 18 ++++++++-- 55 files changed, 99 insertions(+), 61 deletions(-) diff --git a/semver.txt b/semver.txt index 4e8f395..1b58cc1 100755 --- a/semver.txt +++ b/semver.txt @@ -1 +1 @@ -0.26.0 +0.27.0 diff --git a/src/cyclonedx/Serialization/CsvSerializer.cs b/src/cyclonedx/Serialization/CsvSerializer.cs index 07cec0d..db0bdfd 100644 --- a/src/cyclonedx/Serialization/CsvSerializer.cs +++ b/src/cyclonedx/Serialization/CsvSerializer.cs @@ -1,4 +1,4 @@ -// This file is part of CycloneDX CLI Tool +// This file is part of CycloneDX CLI Tool // // Licensed under the Apache License, Version 2.0 (the “License”); // you may not use this file except in compliance with the License. @@ -76,7 +76,9 @@ public static string Serialize(Bom bom) csv.WriteField(c.Type); csv.WriteField(c.MimeType); csv.WriteField(c.Supplier?.Name); +#pragma warning disable CS0618 // Type or member is obsolete csv.WriteField(c.Author); +#pragma warning restore CS0618 // Type or member is obsolete csv.WriteField(c.Publisher); csv.WriteField(c.Group); csv.WriteField(c.Name); @@ -151,6 +153,7 @@ public static Bom Deserialize(string csv) csvReader.ReadHeader(); while (csvReader.Read()) { +#pragma warning disable CS0618 // Type or member is obsolete var component = new Component { Type = csvReader.GetField("Type") ?? Component.Classification.Library, @@ -190,6 +193,7 @@ public static Bom Deserialize(string csv) // external references not supported // sub-components not supported }; +#pragma warning restore CS0618 // Type or member is obsolete if (component.Supplier.Name == null) component.Supplier = null; if (component.Swid.Text.Content == null) component.Swid.Text = null; if (component.Swid.TagId == null) component.Swid = null; diff --git a/src/cyclonedx/cyclonedx.csproj b/src/cyclonedx/cyclonedx.csproj index 45809ab..9616d9b 100644 --- a/src/cyclonedx/cyclonedx.csproj +++ b/src/cyclonedx/cyclonedx.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_autodetect.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_autodetect.snap index cc4bc9f..a379b01 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_autodetect.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_autodetect.snap @@ -1,5 +1,5 @@  - + 2010-01-29T18:30:22Z diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_spdxjson.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_spdxjson.snap index cc4bc9f..a379b01 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_spdxjson.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.ConvertFromSpdxJson_spdxjson.snap @@ -1,5 +1,5 @@  - + 2010-01-29T18:30:22Z diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_autodetect_bom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_autodetect_bom.xml_autodetect_.snap index ec50da1..d300f8e 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_autodetect_bom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_autodetect_bom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + org.example diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_xml_bom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_xml_bom.xml_autodetect_.snap index ec50da1..d300f8e 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_xml_bom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.0.xml_xml_bom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + org.example diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_autodetect_bom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_autodetect_bom.xml_autodetect_.snap index c198862..c52d292 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_autodetect_bom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_autodetect_bom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + Acme Inc diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_xml_bom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_xml_bom.xml_autodetect_.snap index c198862..c52d292 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_xml_bom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.1.xml_xml_bom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + Acme Inc diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.json_autodetect_bom.json_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.json_autodetect_bom.json_autodetect_.snap index 93d8aa7..700de92 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.json_autodetect_bom.json_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.json_autodetect_bom.json_autodetect_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.json_json_bom.json_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.json_json_bom.json_autodetect_.snap index 93d8aa7..700de92 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.json_json_bom.json_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.json_json_bom.json_autodetect_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_autodetect_bom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_autodetect_bom.xml_autodetect_.snap index 7b4032f..b88327a 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_autodetect_bom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_autodetect_bom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + Test diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_autodetect_.snap index 7b4032f..b88327a 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + Test diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_xml_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_xml_.snap index 7b4032f..b88327a 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_xml_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.2.xml_xml_bom.xml_xml_.snap @@ -1,5 +1,5 @@  - + Test diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.cdx_protobuf_bom.cdx_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.cdx_protobuf_bom.cdx_autodetect_.snap index a4d135e18792b8f0da0e246533c7ceecdf6336cc..4f1ea6a45114ba31b6c653a403234b7db04f3636 100644 GIT binary patch delta 74 zcmdljv|Whf{qFr-%!Ybq6FJQJ**M~eixts delta 58 zcmX>nbWv!6y&wn2`~7?2h+BYpqu+dX2`w&WLnC7$1}Q}@n1Y-8fRdY8IJ_7E>|z%L diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_autodetect_.snap index 93d8aa7..700de92 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_autodetect_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_json_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_json_.snap index 93d8aa7..700de92 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_json_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.json_json_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_autodetect_bom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_autodetect_bom.xml_autodetect_.snap index de153f9..6085828 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_autodetect_bom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_autodetect_bom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + 2020-04-07T07:01:00Z diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_autodetect_.snap index de153f9..6085828 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + 2020-04-07T07:01:00Z diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_xml_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_xml_.snap index de153f9..6085828 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_xml_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.xml_xml_bom.xml_xml_.snap @@ -1,5 +1,5 @@  - + 2020-04-07T07:01:00Z diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_autodetect_bom.json_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_autodetect_bom.json_autodetect_.snap index 93d8aa7..700de92 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_autodetect_bom.json_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_autodetect_bom.json_autodetect_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_autodetect_.snap index 93d8aa7..700de92 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_autodetect_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_json_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_json_.snap index 93d8aa7..700de92 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_json_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.json_json_bom.json_json_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_autodetect_bom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_autodetect_bom.xml_autodetect_.snap index de153f9..6085828 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_autodetect_bom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_autodetect_bom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + 2020-04-07T07:01:00Z diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_autodetect_.snap index de153f9..6085828 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + 2020-04-07T07:01:00Z diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_xml_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_xml_.snap index de153f9..6085828 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_xml_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.4.xml_xml_bom.xml_xml_.snap @@ -1,5 +1,5 @@  - + 2020-04-07T07:01:00Z diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_autodetect_bom.json_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_autodetect_bom.json_autodetect_.snap index 7dfe19d..0ca87b8 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_autodetect_bom.json_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_autodetect_bom.json_autodetect_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_autodetect_.snap index 7dfe19d..0ca87b8 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_autodetect_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_json_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_json_.snap index 7dfe19d..0ca87b8 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_json_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.json_json_bom.json_json_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", + "specVersion": "1.6", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_autodetect_bom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_autodetect_bom.xml_autodetect_.snap index de153f9..6085828 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_autodetect_bom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_autodetect_bom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + 2020-04-07T07:01:00Z diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_autodetect_.snap index de153f9..6085828 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + 2020-04-07T07:01:00Z diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_xml_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_xml_.snap index de153f9..6085828 100644 --- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_xml_.snap +++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.5.xml_xml_bom.xml_xml_.snap @@ -1,5 +1,5 @@  - + 2020-04-07T07:01:00Z diff --git a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-lowercase-field-names.snap b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-lowercase-field-names.snap index 00c9a16..dfc9501 100644 --- a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-lowercase-field-names.snap +++ b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-lowercase-field-names.snap @@ -1,5 +1,5 @@  - + Microsoft.Win32.Primitives diff --git a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-minimum-viable.snap b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-minimum-viable.snap index 00c9a16..dfc9501 100644 --- a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-minimum-viable.snap +++ b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom-minimum-viable.snap @@ -1,5 +1,5 @@  - + Microsoft.Win32.Primitives diff --git a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom.snap b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom.snap index d018493..e902d66 100644 --- a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom.snap +++ b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_bom.snap @@ -1,5 +1,5 @@  - + CycloneDX.Core diff --git a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-hashes.snap b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-hashes.snap index 9dda6c9..a3f9da7 100644 --- a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-hashes.snap +++ b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-hashes.snap @@ -1,5 +1,5 @@  - + acme-example diff --git a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid-full.snap b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid-full.snap index 841e351..30fe2a6 100644 --- a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid-full.snap +++ b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid-full.snap @@ -1,5 +1,5 @@  - + Acme Super Heros diff --git a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid.snap b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid.snap index 07d52af..b8de278 100644 --- a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid.snap +++ b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-swid.snap @@ -1,5 +1,5 @@  - + Acme Super Heros diff --git a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-types.snap b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-types.snap index e27ceb4..9a5f93f 100644 --- a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-types.snap +++ b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-component-types.snap @@ -1,5 +1,5 @@  - + application-a diff --git a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-expression.snap b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-expression.snap index 3708b9b..3260021 100644 --- a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-expression.snap +++ b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-expression.snap @@ -1,5 +1,5 @@  - + Acme Inc diff --git a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-id.snap b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-id.snap index bcf32e9..87e0d03 100644 --- a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-id.snap +++ b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-id.snap @@ -1,5 +1,5 @@  - + Acme Inc diff --git a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-name.snap b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-name.snap index 286de63..84b7fc0 100644 --- a/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-name.snap +++ b/tests/cyclonedx.tests/__snapshots__/CsvSerializerTests.DeserializationTests_valid-license-name.snap @@ -1,5 +1,5 @@  - + Acme Inc diff --git a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_autodetect_.snap index ba8d74e..ffc8d1d 100644 --- a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_autodetect_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", "version": 1, + "specVersion": "1.6", "version": 1, "metadata": { "component": { "type": "application", diff --git a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_json_.snap b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_json_.snap index ba8d74e..ffc8d1d 100644 --- a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_json_.snap +++ b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.json_json_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", "version": 1, + "specVersion": "1.6", "version": 1, "metadata": { "component": { "type": "application", diff --git a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.xml_autodetect_.snap index 4a64f41..aeb8a59 100644 --- a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + thing1 diff --git a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.xml_xml_.snap b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.xml_xml_.snap index 4a64f41..aeb8a59 100644 --- a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.xml_xml_.snap +++ b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_autodetect_sbom.xml_xml_.snap @@ -1,5 +1,5 @@  - + thing1 diff --git a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_json_sbom.json_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_json_sbom.json_autodetect_.snap index ba8d74e..ffc8d1d 100644 --- a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_json_sbom.json_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.json_json_sbom.json_autodetect_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", "version": 1, + "specVersion": "1.6", "version": 1, "metadata": { "component": { "type": "application", diff --git a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.xml_autodetect_sbom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.xml_autodetect_sbom.xml_autodetect_.snap index 4a64f41..aeb8a59 100644 --- a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.xml_autodetect_sbom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.json_sbom2.xml_autodetect_sbom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + thing1 diff --git a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.xml_sbom2.xml_autodetect_sbom.json_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.xml_sbom2.xml_autodetect_sbom.json_autodetect_.snap index 03f8cbf..614c31e 100644 --- a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.xml_sbom2.xml_autodetect_sbom.json_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.xml_sbom2.xml_autodetect_sbom.json_autodetect_.snap @@ -1,33 +1,53 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", "version": 1, + "specVersion": "1.6", "version": 1, "metadata": { "component": { "type": "application", + "authors": [], "name": "thing1", - "version": "1" + "version": "1", + "tags": [], + "omniborId": [], + "swhid": [] } }, "components": [ { "type": "library", + "authors": [], "name": "acme-library", - "version": "1.0.0" + "version": "1.0.0", + "tags": [], + "omniborId": [], + "swhid": [] }, { "type": "application", + "authors": [], "name": "thing1", - "version": "1" + "version": "1", + "tags": [], + "omniborId": [], + "swhid": [] }, { "type": "framework", + "authors": [], "name": "acme-framework", - "version": "1.0.0" + "version": "1.0.0", + "tags": [], + "omniborId": [], + "swhid": [] }, { "type": "application", + "authors": [], "name": "thing2", - "version": "1" + "version": "1", + "tags": [], + "omniborId": [], + "swhid": [] } ], "vulnerabilities": [] diff --git a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.xml_sbom2.xml_autodetect_sbom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.xml_sbom2.xml_autodetect_sbom.xml_autodetect_.snap index 4a64f41..aeb8a59 100644 --- a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.xml_sbom2.xml_autodetect_sbom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.xml_sbom2.xml_autodetect_sbom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + thing1 diff --git a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.xml_sbom2.xml_xml_sbom.xml_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.xml_sbom2.xml_xml_sbom.xml_autodetect_.snap index 4a64f41..aeb8a59 100644 --- a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.xml_sbom2.xml_xml_sbom.xml_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Flat_sbom1.xml_sbom2.xml_xml_sbom.xml_autodetect_.snap @@ -1,5 +1,5 @@  - + thing1 diff --git a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Hierarchical_sbom1.json_sbom2.json_autodetect_sbom.json_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Hierarchical_sbom1.json_sbom2.json_autodetect_sbom.json_autodetect_.snap index a30feaf..18ee9db 100644 --- a/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Hierarchical_sbom1.json_sbom2.json_autodetect_sbom.json_autodetect_.snap +++ b/tests/cyclonedx.tests/__snapshots__/MergeTests.Merge_Hierarchical_sbom1.json_sbom2.json_autodetect_sbom.json_autodetect_.snap @@ -1,6 +1,6 @@ { "bomFormat": "CycloneDX", - "specVersion": "1.5", "version": 1, + "specVersion": "1.6", "version": 1, "metadata": { "tools": {}, "component": { @@ -46,5 +46,19 @@ "thing2@1" ] } - ] + ], + "declarations": { + "assessors": [], + "attestations": [], + "claims": [], + "evidence": [], + "targets": { + "organizations": [], + "components": [], + "services": [] + } + }, + "definitions": { + "standards": [] + } }