From b3ed80e77f2f92c18dd9ec094b34c98c4c8e61b8 Mon Sep 17 00:00:00 2001
From: MTsfoni <mibau89@gmail.com>
Date: Mon, 16 Sep 2024 21:27:57 +0200
Subject: [PATCH] Bump CycloneDX-Library to version 8.0.0

Signed-off-by: MTsfoni <mibau89@gmail.com>
---
 semver.txt                                    |   2 +-
 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 ++++++++--
 54 files changed, 94 insertions(+), 60 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/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 @@
   <ItemGroup>
     <PackageReference Include="CoderPatros.AntPathMatching" Version="0.1.1" />
     <PackageReference Include="CsvHelper" Version="29.0.0" />
-    <PackageReference Include="CycloneDX.Utils" Version="7.1.0" />
-    <PackageReference Include="CycloneDX.Spdx.Interop" Version="7.1.0" />
+    <PackageReference Include="CycloneDX.Utils" Version="8.0.0" />
+    <PackageReference Include="CycloneDX.Spdx.Interop" Version="8.0.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
     <PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.1" />
   </ItemGroup>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2010-01-29T18:30:22Z</timestamp>
     <tools>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2010-01-29T18:30:22Z</timestamp>
     <tools>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <group>org.example</group>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <group>org.example</group>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <publisher>Acme Inc</publisher>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <publisher>Acme Inc</publisher>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:f9bcf38b-e331-48b3-a541-28f5352a4509" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:f9bcf38b-e331-48b3-a541-28f5352a4509" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <component type="application">
       <name>Test</name>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:f9bcf38b-e331-48b3-a541-28f5352a4509" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:f9bcf38b-e331-48b3-a541-28f5352a4509" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <component type="application">
       <name>Test</name>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:f9bcf38b-e331-48b3-a541-28f5352a4509" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:f9bcf38b-e331-48b3-a541-28f5352a4509" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <component type="application">
       <name>Test</name>
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<s-wQ|F8v`uZ87n96VmAb0BQa5+IwNBt1}Ppc
Pn8KU;xHq$Km@@(ZX6hWE

delta 77
zcmdlkv|EVd{qFr-%!YcV6FJNUIXK?$-wQ|F0?ZrzEZ7;VC+}c41Y#ozaiB^gV<849
RJ}#KjoBM#uHgT9U0sy4`9LN9w

diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.cdx_protobuf_bom.json_json_v1_3.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.cdx_protobuf_bom.json_json_v1_3.snap
index 9cbef1d..d1d3ac6 100644
--- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.cdx_protobuf_bom.json_json_v1_3.snap
+++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.cdx_protobuf_bom.json_json_v1_3.snap
@@ -4,7 +4,7 @@
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
   "version": 1,
   "metadata": {
-    "timestamp": "2020-04-13T20:20:39Z",
+    "timestamp": "2070-07-26T16:41:18Z",
     "tools": [
       {
         "vendor": "Awesome Vendor",
@@ -134,7 +134,7 @@
             "uid": "123",
             "url": "",
             "author": {
-              "timestamp": "2018-11-13T20:20:39Z",
+              "timestamp": "2067-09-26T16:41:18Z",
               "name": "",
               "email": ""
             }
diff --git a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_autodetect_bom.json_autodetect_.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_autodetect_bom.json_autodetect_.snap
index 93d8aa7..700de92 100644
--- a/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_autodetect_bom.json_autodetect_.snap
+++ b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.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.3.json_json_bom.cdx_protobuf_v1_3.snap b/tests/cyclonedx.tests/__snapshots__/ConvertTests.Convert_bom-1.3.json_json_bom.cdx_protobuf_v1_3.snap
index 32ead860b8787f4f9eda7e341b6c54f77aaab255..458b01b94457ec0bc168414e740bcd538f9b375e 100644
GIT binary patch
delta 55
ucmca8bWUi3JwF@A`~7?2h;?JYe0FgSE@nd`V<849c`hVr*3Il3UW@>~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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <timestamp>2020-04-07T07:01:00Z</timestamp>
     <tools>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="library">
       <name>Microsoft.Win32.Primitives</name>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="library">
       <name>Microsoft.Win32.Primitives</name>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="library">
       <name>CycloneDX.Core</name>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="library">
       <name>acme-example</name>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <author>Acme Super Heros</author>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <author>Acme Super Heros</author>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <name>application-a</name>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <publisher>Acme Inc</publisher>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <publisher>Acme Inc</publisher>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <components>
     <component type="application">
       <publisher>Acme Inc</publisher>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <component type="application">
       <name>thing1</name>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <component type="application">
       <name>thing1</name>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <component type="application">
       <name>thing1</name>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <component type="application">
       <name>thing1</name>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.5">
+<bom xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" version="1" xmlns="http://cyclonedx.org/schema/bom/1.6">
   <metadata>
     <component type="application">
       <name>thing1</name>
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": []
+  }
 }