feat: support CycloneDX 1.6.1 (#742)

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

cyclonedx/schema/_res/README.md

@@ -4,7 +4,7 @@ some schema for offline use as download via [script](../../../tools/schema-downl
 original sources: <https://github.com/CycloneDX/specification/tree/master/schema>
 
 Currently using version
-[5f3ee8066491d31ec6a6d02968243d9688d7e49c](https://github.com/CycloneDX/specification/commit/5f3ee8066491d31ec6a6d02968243d9688d7e49c)
+[8a27bfd1be5be0dcb2c208a34d2f4fa0b6d75bd7](https://github.com/CycloneDX/specification/commit/8a27bfd1be5be0dcb2c208a34d2f4fa0b6d75bd7)
 
 | file | note |
 |------|------|

cyclonedx/schema/_res/bom-1.6.SNAPSHOT.schema.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
   "bomFormat": "AnotherFormat",
   "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",

cyclonedx/schema/_res/bom-1.6.SNAPSHOT.xsd

@@ -1,4 +1,5 @@
 {
+  "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
   "bomFormat": "CycloneDX",
   "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
@@ -10,12 +11,6 @@
       "name": "acme-library",
       "version": "1.0.0"
     },
-    {
-      "type": "library",
-      "bom-ref": "123",
-      "name": "acme-library",
-      "version": "1.0.0"
-    },
     {
       "type": "library",
       "bom-ref": "",

tests/_data/schemaTestData/1.6/invalid-bomformat-1.6.json

@@ -10,6 +10,10 @@
                     <name>acme-library</name>
                     <version>1.0.0</version>
                 </component>
+                <component type="library" bom-ref="123">
+                    <name>acme-library2</name>
+                    <version>1.0.0</version>
+                </component>
                 <component type="library" bom-ref="">
                     <!-- empty value in attribute `bom-ref` -->
                     <name>acme-library</name>

tests/_data/schemaTestData/1.6/invalid-component-ref-1.6.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
   "bomFormat": "CycloneDX",
   "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",

tests/_data/schemaTestData/1.6/invalid-component-ref-1.6.xml

@@ -1,4 +1,5 @@
 {
+  "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
   "bomFormat": "CycloneDX",
   "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",

tests/_data/schemaTestData/1.6/invalid-component-swid-1.6.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
   "bomFormat": "CycloneDX",
   "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",

tests/_data/schemaTestData/1.6/invalid-component-type-1.6.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json",
   "bomFormat": "CycloneDX",
   "specVersion": "1.6",
   "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",