From b758c5f06e2f6fb438419a2f6de511e1e3b678c8 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 6 Apr 2022 22:09:05 +0200 Subject: [PATCH 1/5] fix json-schema-file strict schema property Signed-off-by: Jan Kowalleck --- schema/bom-1.2-strict.schema.json | 2 +- schema/bom-1.3-strict.schema.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/bom-1.2-strict.schema.json b/schema/bom-1.2-strict.schema.json index be21fb16..2f8b3760 100644 --- a/schema/bom-1.2-strict.schema.json +++ b/schema/bom-1.2-strict.schema.json @@ -14,7 +14,7 @@ "$schema": { "type": "string", "enum": [ - "http://cyclonedx.org/schema/bom-1.2a.schema.json" + "http://cyclonedx.org/schema/bom-1.2b.schema.json" ] }, "bomFormat": { diff --git a/schema/bom-1.3-strict.schema.json b/schema/bom-1.3-strict.schema.json index 41b0b945..03fc5b5d 100644 --- a/schema/bom-1.3-strict.schema.json +++ b/schema/bom-1.3-strict.schema.json @@ -14,7 +14,7 @@ "$schema": { "type": "string", "enum": [ - "http://cyclonedx.org/schema/bom-1.3.schema.json" + "http://cyclonedx.org/schema/bom-1.3a.schema.json" ] }, "bomFormat": { From 377f9cb41c7482ee87a9981a84fe3469d54f5243 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Sat, 17 Sep 2022 10:39:51 +0200 Subject: [PATCH 2/5] lax json-schema-file strict schema property `$schema` to be any string Signed-off-by: Jan Kowalleck --- schema/bom-1.2-strict.schema.json | 5 +---- schema/bom-1.3-strict.schema.json | 5 +---- schema/bom-1.4.schema.json | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/schema/bom-1.2-strict.schema.json b/schema/bom-1.2-strict.schema.json index 2f8b3760..505ebe11 100644 --- a/schema/bom-1.2-strict.schema.json +++ b/schema/bom-1.2-strict.schema.json @@ -12,10 +12,7 @@ "additionalProperties": false, "properties": { "$schema": { - "type": "string", - "enum": [ - "http://cyclonedx.org/schema/bom-1.2b.schema.json" - ] + "type": "string" }, "bomFormat": { "$id": "#/properties/bomFormat", diff --git a/schema/bom-1.3-strict.schema.json b/schema/bom-1.3-strict.schema.json index 03fc5b5d..8ab6328a 100644 --- a/schema/bom-1.3-strict.schema.json +++ b/schema/bom-1.3-strict.schema.json @@ -12,10 +12,7 @@ "additionalProperties": false, "properties": { "$schema": { - "type": "string", - "enum": [ - "http://cyclonedx.org/schema/bom-1.3a.schema.json" - ] + "type": "string" }, "bomFormat": { "$id": "#/properties/bomFormat", diff --git a/schema/bom-1.4.schema.json b/schema/bom-1.4.schema.json index dafd8845..a8503845 100644 --- a/schema/bom-1.4.schema.json +++ b/schema/bom-1.4.schema.json @@ -12,10 +12,7 @@ "additionalProperties": false, "properties": { "$schema": { - "type": "string", - "enum": [ - "http://cyclonedx.org/schema/bom-1.4.schema.json" - ] + "type": "string" }, "bomFormat": { "type": "string", From e2f7818b32acc89224450c3eeba6085810ce6d42 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 21 Jun 2023 17:31:53 +0200 Subject: [PATCH 3/5] chore: test-resources JSON add schema - 1.2 Signed-off-by: Jan Kowalleck --- tools/src/test/resources/1.2/invalid-bomformat-1.2.json | 1 + tools/src/test/resources/1.2/invalid-component-ref-1.2.json | 1 + tools/src/test/resources/1.2/invalid-component-swid-1.2.json | 1 + tools/src/test/resources/1.2/invalid-component-type-1.2.json | 1 + tools/src/test/resources/1.2/invalid-dependency-1.2.json | 1 + tools/src/test/resources/1.2/invalid-hash-alg-1.2.json | 1 + tools/src/test/resources/1.2/invalid-hash-md5-1.2.json | 1 + tools/src/test/resources/1.2/invalid-hash-sha1-1.2.json | 1 + tools/src/test/resources/1.2/invalid-hash-sha256-1.2.json | 1 + tools/src/test/resources/1.2/invalid-hash-sha512-1.2.json | 1 + tools/src/test/resources/1.2/invalid-issue-type-1.2.json | 1 + tools/src/test/resources/1.2/invalid-license-choice-1.2.json | 1 + tools/src/test/resources/1.2/invalid-license-encoding-1.2.json | 1 + tools/src/test/resources/1.2/invalid-license-id-1.2.json | 1 + tools/src/test/resources/1.2/invalid-metadata-timestamp-1.2.json | 1 + tools/src/test/resources/1.2/invalid-patch-type-1.2.json | 1 + tools/src/test/resources/1.2/invalid-scope-1.2.json | 1 + tools/src/test/resources/1.2/invalid-serialnumber-1.2.json | 1 + tools/src/test/resources/1.2/invalid-service-data-1.2.json | 1 + .../src/test/resources/1.2/skip_invalid-empty-component-1.2.json | 1 + .../resources/1.2/skip_invalid-missing-component-type-1.2.json | 1 + tools/src/test/resources/1.2/valid-assembly-1.2.json | 1 + tools/src/test/resources/1.2/valid-bom-1.2.json | 1 + tools/src/test/resources/1.2/valid-component-hashes-1.2.json | 1 + tools/src/test/resources/1.2/valid-component-ref-1.2.json | 1 + tools/src/test/resources/1.2/valid-component-swid-1.2.json | 1 + tools/src/test/resources/1.2/valid-component-swid-full-1.2.json | 1 + tools/src/test/resources/1.2/valid-component-types-1.2.json | 1 + tools/src/test/resources/1.2/valid-dependency-1.2.json | 1 + tools/src/test/resources/1.2/valid-empty-components-1.2.json | 1 + tools/src/test/resources/1.2/valid-license-expression-1.2.json | 1 + tools/src/test/resources/1.2/valid-license-id-1.2.json | 1 + tools/src/test/resources/1.2/valid-license-name-1.2.json | 1 + tools/src/test/resources/1.2/valid-metadata-author-1.2.json | 1 + tools/src/test/resources/1.2/valid-metadata-manufacture-1.2.json | 1 + tools/src/test/resources/1.2/valid-metadata-supplier-1.2.json | 1 + tools/src/test/resources/1.2/valid-metadata-timestamp-1.2.json | 1 + tools/src/test/resources/1.2/valid-metadata-tool-1.2.json | 1 + tools/src/test/resources/1.2/valid-minimal-viable-1.2.json | 1 + tools/src/test/resources/1.2/valid-patch-1.2.json | 1 + tools/src/test/resources/1.2/valid-service-1.2.json | 1 + .../src/test/resources/1.2/valid-service-empty-objects-1.2.json | 1 + 42 files changed, 42 insertions(+) diff --git a/tools/src/test/resources/1.2/invalid-bomformat-1.2.json b/tools/src/test/resources/1.2/invalid-bomformat-1.2.json index ab493ea0..eeba3a81 100644 --- a/tools/src/test/resources/1.2/invalid-bomformat-1.2.json +++ b/tools/src/test/resources/1.2/invalid-bomformat-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "AnotherFormat", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-component-ref-1.2.json b/tools/src/test/resources/1.2/invalid-component-ref-1.2.json index 570520d4..c5f7c493 100644 --- a/tools/src/test/resources/1.2/invalid-component-ref-1.2.json +++ b/tools/src/test/resources/1.2/invalid-component-ref-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-component-swid-1.2.json b/tools/src/test/resources/1.2/invalid-component-swid-1.2.json index e93d6ed1..d8cbd7fc 100644 --- a/tools/src/test/resources/1.2/invalid-component-swid-1.2.json +++ b/tools/src/test/resources/1.2/invalid-component-swid-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-component-type-1.2.json b/tools/src/test/resources/1.2/invalid-component-type-1.2.json index a34b26e3..6631e9ef 100644 --- a/tools/src/test/resources/1.2/invalid-component-type-1.2.json +++ b/tools/src/test/resources/1.2/invalid-component-type-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-dependency-1.2.json b/tools/src/test/resources/1.2/invalid-dependency-1.2.json index 248d4f8f..2ed58d22 100644 --- a/tools/src/test/resources/1.2/invalid-dependency-1.2.json +++ b/tools/src/test/resources/1.2/invalid-dependency-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-hash-alg-1.2.json b/tools/src/test/resources/1.2/invalid-hash-alg-1.2.json index 9a4a5047..9840c9b3 100644 --- a/tools/src/test/resources/1.2/invalid-hash-alg-1.2.json +++ b/tools/src/test/resources/1.2/invalid-hash-alg-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-hash-md5-1.2.json b/tools/src/test/resources/1.2/invalid-hash-md5-1.2.json index 9edb2eb4..a6e234d2 100644 --- a/tools/src/test/resources/1.2/invalid-hash-md5-1.2.json +++ b/tools/src/test/resources/1.2/invalid-hash-md5-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-hash-sha1-1.2.json b/tools/src/test/resources/1.2/invalid-hash-sha1-1.2.json index 7cfa1e04..814cf689 100644 --- a/tools/src/test/resources/1.2/invalid-hash-sha1-1.2.json +++ b/tools/src/test/resources/1.2/invalid-hash-sha1-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-hash-sha256-1.2.json b/tools/src/test/resources/1.2/invalid-hash-sha256-1.2.json index 3ec0bdd5..4276796e 100644 --- a/tools/src/test/resources/1.2/invalid-hash-sha256-1.2.json +++ b/tools/src/test/resources/1.2/invalid-hash-sha256-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-hash-sha512-1.2.json b/tools/src/test/resources/1.2/invalid-hash-sha512-1.2.json index a80fb9c8..bc045a82 100644 --- a/tools/src/test/resources/1.2/invalid-hash-sha512-1.2.json +++ b/tools/src/test/resources/1.2/invalid-hash-sha512-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-issue-type-1.2.json b/tools/src/test/resources/1.2/invalid-issue-type-1.2.json index ce04bd3f..84e9fdc3 100644 --- a/tools/src/test/resources/1.2/invalid-issue-type-1.2.json +++ b/tools/src/test/resources/1.2/invalid-issue-type-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-license-choice-1.2.json b/tools/src/test/resources/1.2/invalid-license-choice-1.2.json index 2084a197..a3817b71 100644 --- a/tools/src/test/resources/1.2/invalid-license-choice-1.2.json +++ b/tools/src/test/resources/1.2/invalid-license-choice-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-license-encoding-1.2.json b/tools/src/test/resources/1.2/invalid-license-encoding-1.2.json index c46dbce8..448c83e2 100644 --- a/tools/src/test/resources/1.2/invalid-license-encoding-1.2.json +++ b/tools/src/test/resources/1.2/invalid-license-encoding-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-license-id-1.2.json b/tools/src/test/resources/1.2/invalid-license-id-1.2.json index 3e16a5c6..1057c39d 100644 --- a/tools/src/test/resources/1.2/invalid-license-id-1.2.json +++ b/tools/src/test/resources/1.2/invalid-license-id-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-metadata-timestamp-1.2.json b/tools/src/test/resources/1.2/invalid-metadata-timestamp-1.2.json index b1dcfa8d..69e276d8 100644 --- a/tools/src/test/resources/1.2/invalid-metadata-timestamp-1.2.json +++ b/tools/src/test/resources/1.2/invalid-metadata-timestamp-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-patch-type-1.2.json b/tools/src/test/resources/1.2/invalid-patch-type-1.2.json index 4a1eb80a..0020c016 100644 --- a/tools/src/test/resources/1.2/invalid-patch-type-1.2.json +++ b/tools/src/test/resources/1.2/invalid-patch-type-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-scope-1.2.json b/tools/src/test/resources/1.2/invalid-scope-1.2.json index 987481fc..a4865deb 100644 --- a/tools/src/test/resources/1.2/invalid-scope-1.2.json +++ b/tools/src/test/resources/1.2/invalid-scope-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/invalid-serialnumber-1.2.json b/tools/src/test/resources/1.2/invalid-serialnumber-1.2.json index 691956ad..96f42771 100644 --- a/tools/src/test/resources/1.2/invalid-serialnumber-1.2.json +++ b/tools/src/test/resources/1.2/invalid-serialnumber-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f", diff --git a/tools/src/test/resources/1.2/invalid-service-data-1.2.json b/tools/src/test/resources/1.2/invalid-service-data-1.2.json index b341c481..fdf0cf5f 100644 --- a/tools/src/test/resources/1.2/invalid-service-data-1.2.json +++ b/tools/src/test/resources/1.2/invalid-service-data-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/skip_invalid-empty-component-1.2.json b/tools/src/test/resources/1.2/skip_invalid-empty-component-1.2.json index fa916a9e..22bfa739 100644 --- a/tools/src/test/resources/1.2/skip_invalid-empty-component-1.2.json +++ b/tools/src/test/resources/1.2/skip_invalid-empty-component-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/skip_invalid-missing-component-type-1.2.json b/tools/src/test/resources/1.2/skip_invalid-missing-component-type-1.2.json index 141da072..e83fbd6f 100644 --- a/tools/src/test/resources/1.2/skip_invalid-missing-component-type-1.2.json +++ b/tools/src/test/resources/1.2/skip_invalid-missing-component-type-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-assembly-1.2.json b/tools/src/test/resources/1.2/valid-assembly-1.2.json index 2516922c..2b355607 100644 --- a/tools/src/test/resources/1.2/valid-assembly-1.2.json +++ b/tools/src/test/resources/1.2/valid-assembly-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-bom-1.2.json b/tools/src/test/resources/1.2/valid-bom-1.2.json index 5cd907fc..689e8d7f 100644 --- a/tools/src/test/resources/1.2/valid-bom-1.2.json +++ b/tools/src/test/resources/1.2/valid-bom-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-component-hashes-1.2.json b/tools/src/test/resources/1.2/valid-component-hashes-1.2.json index 98d4285e..9d946e66 100644 --- a/tools/src/test/resources/1.2/valid-component-hashes-1.2.json +++ b/tools/src/test/resources/1.2/valid-component-hashes-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-component-ref-1.2.json b/tools/src/test/resources/1.2/valid-component-ref-1.2.json index 131af1d7..708bcfbf 100644 --- a/tools/src/test/resources/1.2/valid-component-ref-1.2.json +++ b/tools/src/test/resources/1.2/valid-component-ref-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-component-swid-1.2.json b/tools/src/test/resources/1.2/valid-component-swid-1.2.json index 96a0ae1c..228aa627 100644 --- a/tools/src/test/resources/1.2/valid-component-swid-1.2.json +++ b/tools/src/test/resources/1.2/valid-component-swid-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-component-swid-full-1.2.json b/tools/src/test/resources/1.2/valid-component-swid-full-1.2.json index 02b935e3..67b9f8a0 100644 --- a/tools/src/test/resources/1.2/valid-component-swid-full-1.2.json +++ b/tools/src/test/resources/1.2/valid-component-swid-full-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-component-types-1.2.json b/tools/src/test/resources/1.2/valid-component-types-1.2.json index 5ffcbd71..2dca8638 100644 --- a/tools/src/test/resources/1.2/valid-component-types-1.2.json +++ b/tools/src/test/resources/1.2/valid-component-types-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-dependency-1.2.json b/tools/src/test/resources/1.2/valid-dependency-1.2.json index bf3a2649..57901108 100644 --- a/tools/src/test/resources/1.2/valid-dependency-1.2.json +++ b/tools/src/test/resources/1.2/valid-dependency-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-empty-components-1.2.json b/tools/src/test/resources/1.2/valid-empty-components-1.2.json index c3878bf6..e4b367a2 100644 --- a/tools/src/test/resources/1.2/valid-empty-components-1.2.json +++ b/tools/src/test/resources/1.2/valid-empty-components-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-license-expression-1.2.json b/tools/src/test/resources/1.2/valid-license-expression-1.2.json index 89c06c1c..c2626321 100644 --- a/tools/src/test/resources/1.2/valid-license-expression-1.2.json +++ b/tools/src/test/resources/1.2/valid-license-expression-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-license-id-1.2.json b/tools/src/test/resources/1.2/valid-license-id-1.2.json index 0b3ff68b..b8be8221 100644 --- a/tools/src/test/resources/1.2/valid-license-id-1.2.json +++ b/tools/src/test/resources/1.2/valid-license-id-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-license-name-1.2.json b/tools/src/test/resources/1.2/valid-license-name-1.2.json index 4dabe805..cc03783f 100644 --- a/tools/src/test/resources/1.2/valid-license-name-1.2.json +++ b/tools/src/test/resources/1.2/valid-license-name-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-metadata-author-1.2.json b/tools/src/test/resources/1.2/valid-metadata-author-1.2.json index e0c0b45a..5536a942 100644 --- a/tools/src/test/resources/1.2/valid-metadata-author-1.2.json +++ b/tools/src/test/resources/1.2/valid-metadata-author-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-metadata-manufacture-1.2.json b/tools/src/test/resources/1.2/valid-metadata-manufacture-1.2.json index fb92230a..d818b70a 100644 --- a/tools/src/test/resources/1.2/valid-metadata-manufacture-1.2.json +++ b/tools/src/test/resources/1.2/valid-metadata-manufacture-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-metadata-supplier-1.2.json b/tools/src/test/resources/1.2/valid-metadata-supplier-1.2.json index 5a241c78..7e807e93 100644 --- a/tools/src/test/resources/1.2/valid-metadata-supplier-1.2.json +++ b/tools/src/test/resources/1.2/valid-metadata-supplier-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-metadata-timestamp-1.2.json b/tools/src/test/resources/1.2/valid-metadata-timestamp-1.2.json index cf242cca..77fb4329 100644 --- a/tools/src/test/resources/1.2/valid-metadata-timestamp-1.2.json +++ b/tools/src/test/resources/1.2/valid-metadata-timestamp-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-metadata-tool-1.2.json b/tools/src/test/resources/1.2/valid-metadata-tool-1.2.json index 7adade0d..45227479 100644 --- a/tools/src/test/resources/1.2/valid-metadata-tool-1.2.json +++ b/tools/src/test/resources/1.2/valid-metadata-tool-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-minimal-viable-1.2.json b/tools/src/test/resources/1.2/valid-minimal-viable-1.2.json index 5c9795c2..13820b9b 100644 --- a/tools/src/test/resources/1.2/valid-minimal-viable-1.2.json +++ b/tools/src/test/resources/1.2/valid-minimal-viable-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-patch-1.2.json b/tools/src/test/resources/1.2/valid-patch-1.2.json index 2b53cf4c..448b4e49 100644 --- a/tools/src/test/resources/1.2/valid-patch-1.2.json +++ b/tools/src/test/resources/1.2/valid-patch-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-service-1.2.json b/tools/src/test/resources/1.2/valid-service-1.2.json index 5228ffe5..12ad23b3 100644 --- a/tools/src/test/resources/1.2/valid-service-1.2.json +++ b/tools/src/test/resources/1.2/valid-service-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.2/valid-service-empty-objects-1.2.json b/tools/src/test/resources/1.2/valid-service-empty-objects-1.2.json index ece3a65f..62929a49 100644 --- a/tools/src/test/resources/1.2/valid-service-empty-objects-1.2.json +++ b/tools/src/test/resources/1.2/valid-service-empty-objects-1.2.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.2b.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.2", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", From 0f9b460efe826e620ed2388ca785a50cdcd8f78d Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 21 Jun 2023 17:31:59 +0200 Subject: [PATCH 4/5] chore: test-resources JSON add schema - 1.3 Signed-off-by: Jan Kowalleck --- tools/src/test/resources/1.3/invalid-bomformat-1.3.json | 1 + tools/src/test/resources/1.3/invalid-component-ref-1.3.json | 1 + tools/src/test/resources/1.3/invalid-component-swid-1.3.json | 1 + tools/src/test/resources/1.3/invalid-component-type-1.3.json | 1 + tools/src/test/resources/1.3/invalid-dependency-1.3.json | 1 + tools/src/test/resources/1.3/invalid-empty-component-1.3.json | 1 + tools/src/test/resources/1.3/invalid-hash-alg-1.3.json | 1 + tools/src/test/resources/1.3/invalid-hash-md5-1.3.json | 1 + tools/src/test/resources/1.3/invalid-hash-sha1-1.3.json | 1 + tools/src/test/resources/1.3/invalid-hash-sha256-1.3.json | 1 + tools/src/test/resources/1.3/invalid-hash-sha512-1.3.json | 1 + tools/src/test/resources/1.3/invalid-issue-type-1.3.json | 1 + tools/src/test/resources/1.3/invalid-license-choice-1.3.json | 1 + tools/src/test/resources/1.3/invalid-license-encoding-1.3.json | 1 + tools/src/test/resources/1.3/invalid-license-id-1.3.json | 1 + tools/src/test/resources/1.3/invalid-metadata-license-1.3.json | 1 + tools/src/test/resources/1.3/invalid-metadata-timestamp-1.3.json | 1 + .../test/resources/1.3/invalid-missing-component-type-1.3.json | 1 + tools/src/test/resources/1.3/invalid-patch-type-1.3.json | 1 + tools/src/test/resources/1.3/invalid-scope-1.3.json | 1 + tools/src/test/resources/1.3/invalid-serialnumber-1.3.json | 1 + tools/src/test/resources/1.3/invalid-service-data-1.3.json | 1 + tools/src/test/resources/1.3/valid-assembly-1.3.json | 1 + tools/src/test/resources/1.3/valid-bom-1.3.json | 1 + tools/src/test/resources/1.3/valid-component-hashes-1.3.json | 1 + tools/src/test/resources/1.3/valid-component-ref-1.3.json | 1 + tools/src/test/resources/1.3/valid-component-swid-1.3.json | 1 + tools/src/test/resources/1.3/valid-component-swid-full-1.3.json | 1 + tools/src/test/resources/1.3/valid-component-types-1.3.json | 1 + tools/src/test/resources/1.3/valid-compositions-1.3.json | 1 + tools/src/test/resources/1.3/valid-dependency-1.3.json | 1 + tools/src/test/resources/1.3/valid-empty-components-1.3.json | 1 + tools/src/test/resources/1.3/valid-evidence-1.3.json | 1 + tools/src/test/resources/1.3/valid-external-reference-1.3.json | 1 + tools/src/test/resources/1.3/valid-license-expression-1.3.json | 1 + tools/src/test/resources/1.3/valid-license-id-1.3.json | 1 + tools/src/test/resources/1.3/valid-license-name-1.3.json | 1 + tools/src/test/resources/1.3/valid-metadata-author-1.3.json | 1 + tools/src/test/resources/1.3/valid-metadata-license-1.3.json | 1 + tools/src/test/resources/1.3/valid-metadata-manufacture-1.3.json | 1 + tools/src/test/resources/1.3/valid-metadata-supplier-1.3.json | 1 + tools/src/test/resources/1.3/valid-metadata-timestamp-1.3.json | 1 + tools/src/test/resources/1.3/valid-metadata-tool-1.3.json | 1 + tools/src/test/resources/1.3/valid-minimal-viable-1.3.json | 1 + tools/src/test/resources/1.3/valid-patch-1.3.json | 1 + tools/src/test/resources/1.3/valid-properties-1.3.json | 1 + tools/src/test/resources/1.3/valid-service-1.3.json | 1 + .../src/test/resources/1.3/valid-service-empty-objects-1.3.json | 1 + 48 files changed, 48 insertions(+) diff --git a/tools/src/test/resources/1.3/invalid-bomformat-1.3.json b/tools/src/test/resources/1.3/invalid-bomformat-1.3.json index 7df3cac2..de901431 100644 --- a/tools/src/test/resources/1.3/invalid-bomformat-1.3.json +++ b/tools/src/test/resources/1.3/invalid-bomformat-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "AnotherFormat", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-component-ref-1.3.json b/tools/src/test/resources/1.3/invalid-component-ref-1.3.json index ba06096b..da635e4c 100644 --- a/tools/src/test/resources/1.3/invalid-component-ref-1.3.json +++ b/tools/src/test/resources/1.3/invalid-component-ref-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-component-swid-1.3.json b/tools/src/test/resources/1.3/invalid-component-swid-1.3.json index 455f2f33..c4ff8ab5 100644 --- a/tools/src/test/resources/1.3/invalid-component-swid-1.3.json +++ b/tools/src/test/resources/1.3/invalid-component-swid-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-component-type-1.3.json b/tools/src/test/resources/1.3/invalid-component-type-1.3.json index a22bf388..50a91229 100644 --- a/tools/src/test/resources/1.3/invalid-component-type-1.3.json +++ b/tools/src/test/resources/1.3/invalid-component-type-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-dependency-1.3.json b/tools/src/test/resources/1.3/invalid-dependency-1.3.json index 988a0450..8c9b858a 100644 --- a/tools/src/test/resources/1.3/invalid-dependency-1.3.json +++ b/tools/src/test/resources/1.3/invalid-dependency-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-empty-component-1.3.json b/tools/src/test/resources/1.3/invalid-empty-component-1.3.json index 31537b2c..7528dc89 100644 --- a/tools/src/test/resources/1.3/invalid-empty-component-1.3.json +++ b/tools/src/test/resources/1.3/invalid-empty-component-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-hash-alg-1.3.json b/tools/src/test/resources/1.3/invalid-hash-alg-1.3.json index 625094c3..e215bd8a 100644 --- a/tools/src/test/resources/1.3/invalid-hash-alg-1.3.json +++ b/tools/src/test/resources/1.3/invalid-hash-alg-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-hash-md5-1.3.json b/tools/src/test/resources/1.3/invalid-hash-md5-1.3.json index 40812819..dc6d89b4 100644 --- a/tools/src/test/resources/1.3/invalid-hash-md5-1.3.json +++ b/tools/src/test/resources/1.3/invalid-hash-md5-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-hash-sha1-1.3.json b/tools/src/test/resources/1.3/invalid-hash-sha1-1.3.json index 7b1e0036..c23c4edd 100644 --- a/tools/src/test/resources/1.3/invalid-hash-sha1-1.3.json +++ b/tools/src/test/resources/1.3/invalid-hash-sha1-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-hash-sha256-1.3.json b/tools/src/test/resources/1.3/invalid-hash-sha256-1.3.json index 49f747e0..511f48b0 100644 --- a/tools/src/test/resources/1.3/invalid-hash-sha256-1.3.json +++ b/tools/src/test/resources/1.3/invalid-hash-sha256-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-hash-sha512-1.3.json b/tools/src/test/resources/1.3/invalid-hash-sha512-1.3.json index 5e83aae6..0eddb477 100644 --- a/tools/src/test/resources/1.3/invalid-hash-sha512-1.3.json +++ b/tools/src/test/resources/1.3/invalid-hash-sha512-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-issue-type-1.3.json b/tools/src/test/resources/1.3/invalid-issue-type-1.3.json index cea6add4..9f0b9fc3 100644 --- a/tools/src/test/resources/1.3/invalid-issue-type-1.3.json +++ b/tools/src/test/resources/1.3/invalid-issue-type-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-license-choice-1.3.json b/tools/src/test/resources/1.3/invalid-license-choice-1.3.json index 1218f847..4a770e50 100644 --- a/tools/src/test/resources/1.3/invalid-license-choice-1.3.json +++ b/tools/src/test/resources/1.3/invalid-license-choice-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-license-encoding-1.3.json b/tools/src/test/resources/1.3/invalid-license-encoding-1.3.json index b61550ee..6c63f70a 100644 --- a/tools/src/test/resources/1.3/invalid-license-encoding-1.3.json +++ b/tools/src/test/resources/1.3/invalid-license-encoding-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-license-id-1.3.json b/tools/src/test/resources/1.3/invalid-license-id-1.3.json index 0d275dd0..5c312219 100644 --- a/tools/src/test/resources/1.3/invalid-license-id-1.3.json +++ b/tools/src/test/resources/1.3/invalid-license-id-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-metadata-license-1.3.json b/tools/src/test/resources/1.3/invalid-metadata-license-1.3.json index 82a79226..c8fe260a 100644 --- a/tools/src/test/resources/1.3/invalid-metadata-license-1.3.json +++ b/tools/src/test/resources/1.3/invalid-metadata-license-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-metadata-timestamp-1.3.json b/tools/src/test/resources/1.3/invalid-metadata-timestamp-1.3.json index a021eb67..7df4ed0b 100644 --- a/tools/src/test/resources/1.3/invalid-metadata-timestamp-1.3.json +++ b/tools/src/test/resources/1.3/invalid-metadata-timestamp-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-missing-component-type-1.3.json b/tools/src/test/resources/1.3/invalid-missing-component-type-1.3.json index f11a51ef..e2e1f1fb 100644 --- a/tools/src/test/resources/1.3/invalid-missing-component-type-1.3.json +++ b/tools/src/test/resources/1.3/invalid-missing-component-type-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-patch-type-1.3.json b/tools/src/test/resources/1.3/invalid-patch-type-1.3.json index a8897abd..ead9cf49 100644 --- a/tools/src/test/resources/1.3/invalid-patch-type-1.3.json +++ b/tools/src/test/resources/1.3/invalid-patch-type-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-scope-1.3.json b/tools/src/test/resources/1.3/invalid-scope-1.3.json index 38e5bb10..e59c75d4 100644 --- a/tools/src/test/resources/1.3/invalid-scope-1.3.json +++ b/tools/src/test/resources/1.3/invalid-scope-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/invalid-serialnumber-1.3.json b/tools/src/test/resources/1.3/invalid-serialnumber-1.3.json index 70d3112a..8d045dbf 100644 --- a/tools/src/test/resources/1.3/invalid-serialnumber-1.3.json +++ b/tools/src/test/resources/1.3/invalid-serialnumber-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f", diff --git a/tools/src/test/resources/1.3/invalid-service-data-1.3.json b/tools/src/test/resources/1.3/invalid-service-data-1.3.json index 51068413..92470589 100644 --- a/tools/src/test/resources/1.3/invalid-service-data-1.3.json +++ b/tools/src/test/resources/1.3/invalid-service-data-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-assembly-1.3.json b/tools/src/test/resources/1.3/valid-assembly-1.3.json index 78720ccb..16d54cda 100644 --- a/tools/src/test/resources/1.3/valid-assembly-1.3.json +++ b/tools/src/test/resources/1.3/valid-assembly-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-bom-1.3.json b/tools/src/test/resources/1.3/valid-bom-1.3.json index c2f62963..1043e1c4 100644 --- a/tools/src/test/resources/1.3/valid-bom-1.3.json +++ b/tools/src/test/resources/1.3/valid-bom-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-component-hashes-1.3.json b/tools/src/test/resources/1.3/valid-component-hashes-1.3.json index 77be6651..fbad8bd8 100644 --- a/tools/src/test/resources/1.3/valid-component-hashes-1.3.json +++ b/tools/src/test/resources/1.3/valid-component-hashes-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-component-ref-1.3.json b/tools/src/test/resources/1.3/valid-component-ref-1.3.json index b7e2bb38..eadc13bb 100644 --- a/tools/src/test/resources/1.3/valid-component-ref-1.3.json +++ b/tools/src/test/resources/1.3/valid-component-ref-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-component-swid-1.3.json b/tools/src/test/resources/1.3/valid-component-swid-1.3.json index 4dbad442..31863869 100644 --- a/tools/src/test/resources/1.3/valid-component-swid-1.3.json +++ b/tools/src/test/resources/1.3/valid-component-swid-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-component-swid-full-1.3.json b/tools/src/test/resources/1.3/valid-component-swid-full-1.3.json index 074dd07e..75cce665 100644 --- a/tools/src/test/resources/1.3/valid-component-swid-full-1.3.json +++ b/tools/src/test/resources/1.3/valid-component-swid-full-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-component-types-1.3.json b/tools/src/test/resources/1.3/valid-component-types-1.3.json index 591dd3bf..06bd26f9 100644 --- a/tools/src/test/resources/1.3/valid-component-types-1.3.json +++ b/tools/src/test/resources/1.3/valid-component-types-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-compositions-1.3.json b/tools/src/test/resources/1.3/valid-compositions-1.3.json index a11b4266..b9c6a466 100644 --- a/tools/src/test/resources/1.3/valid-compositions-1.3.json +++ b/tools/src/test/resources/1.3/valid-compositions-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-dependency-1.3.json b/tools/src/test/resources/1.3/valid-dependency-1.3.json index 87f70743..b28fe229 100644 --- a/tools/src/test/resources/1.3/valid-dependency-1.3.json +++ b/tools/src/test/resources/1.3/valid-dependency-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-empty-components-1.3.json b/tools/src/test/resources/1.3/valid-empty-components-1.3.json index ba708657..025d72a6 100644 --- a/tools/src/test/resources/1.3/valid-empty-components-1.3.json +++ b/tools/src/test/resources/1.3/valid-empty-components-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-evidence-1.3.json b/tools/src/test/resources/1.3/valid-evidence-1.3.json index 4fc32ab8..824ba00e 100644 --- a/tools/src/test/resources/1.3/valid-evidence-1.3.json +++ b/tools/src/test/resources/1.3/valid-evidence-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-external-reference-1.3.json b/tools/src/test/resources/1.3/valid-external-reference-1.3.json index 060770e1..76be20ff 100644 --- a/tools/src/test/resources/1.3/valid-external-reference-1.3.json +++ b/tools/src/test/resources/1.3/valid-external-reference-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-license-expression-1.3.json b/tools/src/test/resources/1.3/valid-license-expression-1.3.json index 787a8cd6..f1ea05ea 100644 --- a/tools/src/test/resources/1.3/valid-license-expression-1.3.json +++ b/tools/src/test/resources/1.3/valid-license-expression-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-license-id-1.3.json b/tools/src/test/resources/1.3/valid-license-id-1.3.json index e227babc..e3a26359 100644 --- a/tools/src/test/resources/1.3/valid-license-id-1.3.json +++ b/tools/src/test/resources/1.3/valid-license-id-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-license-name-1.3.json b/tools/src/test/resources/1.3/valid-license-name-1.3.json index 9d865b99..70224df1 100644 --- a/tools/src/test/resources/1.3/valid-license-name-1.3.json +++ b/tools/src/test/resources/1.3/valid-license-name-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-metadata-author-1.3.json b/tools/src/test/resources/1.3/valid-metadata-author-1.3.json index 9c78197a..292f6d0f 100644 --- a/tools/src/test/resources/1.3/valid-metadata-author-1.3.json +++ b/tools/src/test/resources/1.3/valid-metadata-author-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-metadata-license-1.3.json b/tools/src/test/resources/1.3/valid-metadata-license-1.3.json index 8ab89962..17882a6d 100644 --- a/tools/src/test/resources/1.3/valid-metadata-license-1.3.json +++ b/tools/src/test/resources/1.3/valid-metadata-license-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-metadata-manufacture-1.3.json b/tools/src/test/resources/1.3/valid-metadata-manufacture-1.3.json index e4c69498..0b90cf25 100644 --- a/tools/src/test/resources/1.3/valid-metadata-manufacture-1.3.json +++ b/tools/src/test/resources/1.3/valid-metadata-manufacture-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-metadata-supplier-1.3.json b/tools/src/test/resources/1.3/valid-metadata-supplier-1.3.json index 103882ca..ef1d382b 100644 --- a/tools/src/test/resources/1.3/valid-metadata-supplier-1.3.json +++ b/tools/src/test/resources/1.3/valid-metadata-supplier-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-metadata-timestamp-1.3.json b/tools/src/test/resources/1.3/valid-metadata-timestamp-1.3.json index 8f47f110..88f296a5 100644 --- a/tools/src/test/resources/1.3/valid-metadata-timestamp-1.3.json +++ b/tools/src/test/resources/1.3/valid-metadata-timestamp-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-metadata-tool-1.3.json b/tools/src/test/resources/1.3/valid-metadata-tool-1.3.json index 61bcaec3..f9ab9abb 100644 --- a/tools/src/test/resources/1.3/valid-metadata-tool-1.3.json +++ b/tools/src/test/resources/1.3/valid-metadata-tool-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-minimal-viable-1.3.json b/tools/src/test/resources/1.3/valid-minimal-viable-1.3.json index 6a9e646d..39ac9d83 100644 --- a/tools/src/test/resources/1.3/valid-minimal-viable-1.3.json +++ b/tools/src/test/resources/1.3/valid-minimal-viable-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-patch-1.3.json b/tools/src/test/resources/1.3/valid-patch-1.3.json index eebdf67a..ae89cd30 100644 --- a/tools/src/test/resources/1.3/valid-patch-1.3.json +++ b/tools/src/test/resources/1.3/valid-patch-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-properties-1.3.json b/tools/src/test/resources/1.3/valid-properties-1.3.json index f30e2dbe..0d180d6d 100644 --- a/tools/src/test/resources/1.3/valid-properties-1.3.json +++ b/tools/src/test/resources/1.3/valid-properties-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-service-1.3.json b/tools/src/test/resources/1.3/valid-service-1.3.json index 519f3236..00ad87e1 100644 --- a/tools/src/test/resources/1.3/valid-service-1.3.json +++ b/tools/src/test/resources/1.3/valid-service-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.3/valid-service-empty-objects-1.3.json b/tools/src/test/resources/1.3/valid-service-empty-objects-1.3.json index 72c9ceae..9e55311d 100644 --- a/tools/src/test/resources/1.3/valid-service-empty-objects-1.3.json +++ b/tools/src/test/resources/1.3/valid-service-empty-objects-1.3.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.3a.schema.json", "bomFormat": "CycloneDX", "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", From f570925c675d115348e1365693146740feee0501 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Wed, 21 Jun 2023 17:32:05 +0200 Subject: [PATCH 5/5] chore: test-resources JSON add schema - 1.4 Signed-off-by: Jan Kowalleck --- tools/src/test/resources/1.4/invalid-bomformat-1.4.json | 1 + tools/src/test/resources/1.4/invalid-component-ref-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-component-swid-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-component-type-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-dependency-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-empty-component-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-hash-alg-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-hash-md5-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-hash-sha1-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-hash-sha256-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-hash-sha512-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-issue-type-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-license-choice-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-license-encoding-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-license-id-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-metadata-license-1.4.json | 3 ++- .../src/test/resources/1.4/invalid-metadata-timestamp-1.4.json | 3 ++- .../test/resources/1.4/invalid-missing-component-type-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-patch-type-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-scope-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-serialnumber-1.4.json | 3 ++- tools/src/test/resources/1.4/invalid-service-data-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-assembly-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-bom-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-component-hashes-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-component-ref-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-component-swid-1.4.json | 3 ++- .../src/test/resources/1.4/valid-component-swid-full-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-component-types-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-compositions-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-dependency-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-empty-components-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-evidence-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-external-reference-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-license-expression-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-license-id-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-license-name-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-metadata-author-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-metadata-license-1.4.json | 3 ++- .../src/test/resources/1.4/valid-metadata-manufacture-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-metadata-supplier-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-metadata-timestamp-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-metadata-tool-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-minimal-viable-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-patch-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-properties-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-release-notes-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-service-1.4.json | 3 ++- .../test/resources/1.4/valid-service-empty-objects-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-signatures-1.4.json | 3 ++- tools/src/test/resources/1.4/valid-vulnerability-1.4.json | 3 ++- 51 files changed, 101 insertions(+), 50 deletions(-) diff --git a/tools/src/test/resources/1.4/invalid-bomformat-1.4.json b/tools/src/test/resources/1.4/invalid-bomformat-1.4.json index 6959cab0..5805cfe2 100644 --- a/tools/src/test/resources/1.4/invalid-bomformat-1.4.json +++ b/tools/src/test/resources/1.4/invalid-bomformat-1.4.json @@ -1,4 +1,5 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "AnotherFormat", "specVersion": "1.4", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", diff --git a/tools/src/test/resources/1.4/invalid-component-ref-1.4.json b/tools/src/test/resources/1.4/invalid-component-ref-1.4.json index 3be019a3..28dcc714 100644 --- a/tools/src/test/resources/1.4/invalid-component-ref-1.4.json +++ b/tools/src/test/resources/1.4/invalid-component-ref-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-component-swid-1.4.json b/tools/src/test/resources/1.4/invalid-component-swid-1.4.json index 4ad023c5..7c20229b 100644 --- a/tools/src/test/resources/1.4/invalid-component-swid-1.4.json +++ b/tools/src/test/resources/1.4/invalid-component-swid-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-component-type-1.4.json b/tools/src/test/resources/1.4/invalid-component-type-1.4.json index 7c7bd8bb..55a14e8b 100644 --- a/tools/src/test/resources/1.4/invalid-component-type-1.4.json +++ b/tools/src/test/resources/1.4/invalid-component-type-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-dependency-1.4.json b/tools/src/test/resources/1.4/invalid-dependency-1.4.json index 1e5f12a1..ea48b842 100644 --- a/tools/src/test/resources/1.4/invalid-dependency-1.4.json +++ b/tools/src/test/resources/1.4/invalid-dependency-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-empty-component-1.4.json b/tools/src/test/resources/1.4/invalid-empty-component-1.4.json index 2bbf057b..d9ee0252 100644 --- a/tools/src/test/resources/1.4/invalid-empty-component-1.4.json +++ b/tools/src/test/resources/1.4/invalid-empty-component-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-hash-alg-1.4.json b/tools/src/test/resources/1.4/invalid-hash-alg-1.4.json index 9cb10fb0..2594500f 100644 --- a/tools/src/test/resources/1.4/invalid-hash-alg-1.4.json +++ b/tools/src/test/resources/1.4/invalid-hash-alg-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-hash-md5-1.4.json b/tools/src/test/resources/1.4/invalid-hash-md5-1.4.json index 07d0ac03..9bd114c1 100644 --- a/tools/src/test/resources/1.4/invalid-hash-md5-1.4.json +++ b/tools/src/test/resources/1.4/invalid-hash-md5-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-hash-sha1-1.4.json b/tools/src/test/resources/1.4/invalid-hash-sha1-1.4.json index 9342157a..20652b83 100644 --- a/tools/src/test/resources/1.4/invalid-hash-sha1-1.4.json +++ b/tools/src/test/resources/1.4/invalid-hash-sha1-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-hash-sha256-1.4.json b/tools/src/test/resources/1.4/invalid-hash-sha256-1.4.json index a3a9a9dc..8e98e097 100644 --- a/tools/src/test/resources/1.4/invalid-hash-sha256-1.4.json +++ b/tools/src/test/resources/1.4/invalid-hash-sha256-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-hash-sha512-1.4.json b/tools/src/test/resources/1.4/invalid-hash-sha512-1.4.json index fdf1f5b8..d0dec5e6 100644 --- a/tools/src/test/resources/1.4/invalid-hash-sha512-1.4.json +++ b/tools/src/test/resources/1.4/invalid-hash-sha512-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-issue-type-1.4.json b/tools/src/test/resources/1.4/invalid-issue-type-1.4.json index e1f02ce8..1513339b 100644 --- a/tools/src/test/resources/1.4/invalid-issue-type-1.4.json +++ b/tools/src/test/resources/1.4/invalid-issue-type-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-license-choice-1.4.json b/tools/src/test/resources/1.4/invalid-license-choice-1.4.json index 82fcfdba..f50076e5 100644 --- a/tools/src/test/resources/1.4/invalid-license-choice-1.4.json +++ b/tools/src/test/resources/1.4/invalid-license-choice-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-license-encoding-1.4.json b/tools/src/test/resources/1.4/invalid-license-encoding-1.4.json index ce76280f..832b1538 100644 --- a/tools/src/test/resources/1.4/invalid-license-encoding-1.4.json +++ b/tools/src/test/resources/1.4/invalid-license-encoding-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-license-id-1.4.json b/tools/src/test/resources/1.4/invalid-license-id-1.4.json index ed317a5b..48d2acf2 100644 --- a/tools/src/test/resources/1.4/invalid-license-id-1.4.json +++ b/tools/src/test/resources/1.4/invalid-license-id-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-metadata-license-1.4.json b/tools/src/test/resources/1.4/invalid-metadata-license-1.4.json index 0ea6d35a..7a54aab7 100644 --- a/tools/src/test/resources/1.4/invalid-metadata-license-1.4.json +++ b/tools/src/test/resources/1.4/invalid-metadata-license-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tools/src/test/resources/1.4/invalid-metadata-timestamp-1.4.json b/tools/src/test/resources/1.4/invalid-metadata-timestamp-1.4.json index 22ce0aa8..c5f4e419 100644 --- a/tools/src/test/resources/1.4/invalid-metadata-timestamp-1.4.json +++ b/tools/src/test/resources/1.4/invalid-metadata-timestamp-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tools/src/test/resources/1.4/invalid-missing-component-type-1.4.json b/tools/src/test/resources/1.4/invalid-missing-component-type-1.4.json index eee0ac3a..64d0f9c8 100644 --- a/tools/src/test/resources/1.4/invalid-missing-component-type-1.4.json +++ b/tools/src/test/resources/1.4/invalid-missing-component-type-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-patch-type-1.4.json b/tools/src/test/resources/1.4/invalid-patch-type-1.4.json index 1e35b095..6aea6e0e 100644 --- a/tools/src/test/resources/1.4/invalid-patch-type-1.4.json +++ b/tools/src/test/resources/1.4/invalid-patch-type-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-scope-1.4.json b/tools/src/test/resources/1.4/invalid-scope-1.4.json index 7a9faeac..1191bd11 100644 --- a/tools/src/test/resources/1.4/invalid-scope-1.4.json +++ b/tools/src/test/resources/1.4/invalid-scope-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-serialnumber-1.4.json b/tools/src/test/resources/1.4/invalid-serialnumber-1.4.json index 42569ecd..f8db2771 100644 --- a/tools/src/test/resources/1.4/invalid-serialnumber-1.4.json +++ b/tools/src/test/resources/1.4/invalid-serialnumber-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/invalid-service-data-1.4.json b/tools/src/test/resources/1.4/invalid-service-data-1.4.json index 3cc11be1..fcc2a6f5 100644 --- a/tools/src/test/resources/1.4/invalid-service-data-1.4.json +++ b/tools/src/test/resources/1.4/invalid-service-data-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "services": [ diff --git a/tools/src/test/resources/1.4/valid-assembly-1.4.json b/tools/src/test/resources/1.4/valid-assembly-1.4.json index 6d8f8227..e94d1a42 100644 --- a/tools/src/test/resources/1.4/valid-assembly-1.4.json +++ b/tools/src/test/resources/1.4/valid-assembly-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-bom-1.4.json b/tools/src/test/resources/1.4/valid-bom-1.4.json index a47aa7d7..93f3cc2e 100644 --- a/tools/src/test/resources/1.4/valid-bom-1.4.json +++ b/tools/src/test/resources/1.4/valid-bom-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tools/src/test/resources/1.4/valid-component-hashes-1.4.json b/tools/src/test/resources/1.4/valid-component-hashes-1.4.json index af90bd1f..a36f11ad 100644 --- a/tools/src/test/resources/1.4/valid-component-hashes-1.4.json +++ b/tools/src/test/resources/1.4/valid-component-hashes-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-component-ref-1.4.json b/tools/src/test/resources/1.4/valid-component-ref-1.4.json index f21c7fb7..6456451c 100644 --- a/tools/src/test/resources/1.4/valid-component-ref-1.4.json +++ b/tools/src/test/resources/1.4/valid-component-ref-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-component-swid-1.4.json b/tools/src/test/resources/1.4/valid-component-swid-1.4.json index fd037a2f..163cedbd 100644 --- a/tools/src/test/resources/1.4/valid-component-swid-1.4.json +++ b/tools/src/test/resources/1.4/valid-component-swid-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-component-swid-full-1.4.json b/tools/src/test/resources/1.4/valid-component-swid-full-1.4.json index fe6de237..17c060dc 100644 --- a/tools/src/test/resources/1.4/valid-component-swid-full-1.4.json +++ b/tools/src/test/resources/1.4/valid-component-swid-full-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-component-types-1.4.json b/tools/src/test/resources/1.4/valid-component-types-1.4.json index dfcc9bcd..17c2bdd1 100644 --- a/tools/src/test/resources/1.4/valid-component-types-1.4.json +++ b/tools/src/test/resources/1.4/valid-component-types-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-compositions-1.4.json b/tools/src/test/resources/1.4/valid-compositions-1.4.json index 42aa73fd..a037efbe 100644 --- a/tools/src/test/resources/1.4/valid-compositions-1.4.json +++ b/tools/src/test/resources/1.4/valid-compositions-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tools/src/test/resources/1.4/valid-dependency-1.4.json b/tools/src/test/resources/1.4/valid-dependency-1.4.json index b15c6b92..a3ce5a65 100644 --- a/tools/src/test/resources/1.4/valid-dependency-1.4.json +++ b/tools/src/test/resources/1.4/valid-dependency-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-empty-components-1.4.json b/tools/src/test/resources/1.4/valid-empty-components-1.4.json index 0cc93e13..4785c2d6 100644 --- a/tools/src/test/resources/1.4/valid-empty-components-1.4.json +++ b/tools/src/test/resources/1.4/valid-empty-components-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-evidence-1.4.json b/tools/src/test/resources/1.4/valid-evidence-1.4.json index a588fdd2..ad120df2 100644 --- a/tools/src/test/resources/1.4/valid-evidence-1.4.json +++ b/tools/src/test/resources/1.4/valid-evidence-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-external-reference-1.4.json b/tools/src/test/resources/1.4/valid-external-reference-1.4.json index 088172ea..29713cc4 100644 --- a/tools/src/test/resources/1.4/valid-external-reference-1.4.json +++ b/tools/src/test/resources/1.4/valid-external-reference-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-license-expression-1.4.json b/tools/src/test/resources/1.4/valid-license-expression-1.4.json index c101ebe9..7744ba5c 100644 --- a/tools/src/test/resources/1.4/valid-license-expression-1.4.json +++ b/tools/src/test/resources/1.4/valid-license-expression-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-license-id-1.4.json b/tools/src/test/resources/1.4/valid-license-id-1.4.json index 1d097485..c2cbf19f 100644 --- a/tools/src/test/resources/1.4/valid-license-id-1.4.json +++ b/tools/src/test/resources/1.4/valid-license-id-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-license-name-1.4.json b/tools/src/test/resources/1.4/valid-license-name-1.4.json index 03c884ca..e052a56d 100644 --- a/tools/src/test/resources/1.4/valid-license-name-1.4.json +++ b/tools/src/test/resources/1.4/valid-license-name-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-metadata-author-1.4.json b/tools/src/test/resources/1.4/valid-metadata-author-1.4.json index febeed4f..faa208b8 100644 --- a/tools/src/test/resources/1.4/valid-metadata-author-1.4.json +++ b/tools/src/test/resources/1.4/valid-metadata-author-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tools/src/test/resources/1.4/valid-metadata-license-1.4.json b/tools/src/test/resources/1.4/valid-metadata-license-1.4.json index 10e75af0..08323ed9 100644 --- a/tools/src/test/resources/1.4/valid-metadata-license-1.4.json +++ b/tools/src/test/resources/1.4/valid-metadata-license-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tools/src/test/resources/1.4/valid-metadata-manufacture-1.4.json b/tools/src/test/resources/1.4/valid-metadata-manufacture-1.4.json index 68705c41..852919d5 100644 --- a/tools/src/test/resources/1.4/valid-metadata-manufacture-1.4.json +++ b/tools/src/test/resources/1.4/valid-metadata-manufacture-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tools/src/test/resources/1.4/valid-metadata-supplier-1.4.json b/tools/src/test/resources/1.4/valid-metadata-supplier-1.4.json index 33b1af25..6c25fe53 100644 --- a/tools/src/test/resources/1.4/valid-metadata-supplier-1.4.json +++ b/tools/src/test/resources/1.4/valid-metadata-supplier-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tools/src/test/resources/1.4/valid-metadata-timestamp-1.4.json b/tools/src/test/resources/1.4/valid-metadata-timestamp-1.4.json index 26ab14ad..7833ecb3 100644 --- a/tools/src/test/resources/1.4/valid-metadata-timestamp-1.4.json +++ b/tools/src/test/resources/1.4/valid-metadata-timestamp-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tools/src/test/resources/1.4/valid-metadata-tool-1.4.json b/tools/src/test/resources/1.4/valid-metadata-tool-1.4.json index 19175ee0..d26d668c 100644 --- a/tools/src/test/resources/1.4/valid-metadata-tool-1.4.json +++ b/tools/src/test/resources/1.4/valid-metadata-tool-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tools/src/test/resources/1.4/valid-minimal-viable-1.4.json b/tools/src/test/resources/1.4/valid-minimal-viable-1.4.json index c1029f0f..da251e41 100644 --- a/tools/src/test/resources/1.4/valid-minimal-viable-1.4.json +++ b/tools/src/test/resources/1.4/valid-minimal-viable-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-patch-1.4.json b/tools/src/test/resources/1.4/valid-patch-1.4.json index 66db19aa..0c0f55e3 100644 --- a/tools/src/test/resources/1.4/valid-patch-1.4.json +++ b/tools/src/test/resources/1.4/valid-patch-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-properties-1.4.json b/tools/src/test/resources/1.4/valid-properties-1.4.json index bdf67f7e..5f32b4ca 100644 --- a/tools/src/test/resources/1.4/valid-properties-1.4.json +++ b/tools/src/test/resources/1.4/valid-properties-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "metadata": { diff --git a/tools/src/test/resources/1.4/valid-release-notes-1.4.json b/tools/src/test/resources/1.4/valid-release-notes-1.4.json index bd45f940..2923b86e 100644 --- a/tools/src/test/resources/1.4/valid-release-notes-1.4.json +++ b/tools/src/test/resources/1.4/valid-release-notes-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-service-1.4.json b/tools/src/test/resources/1.4/valid-service-1.4.json index db7c1555..4cf82bdc 100644 --- a/tools/src/test/resources/1.4/valid-service-1.4.json +++ b/tools/src/test/resources/1.4/valid-service-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-service-empty-objects-1.4.json b/tools/src/test/resources/1.4/valid-service-empty-objects-1.4.json index c54c1efe..11ef4e8c 100644 --- a/tools/src/test/resources/1.4/valid-service-empty-objects-1.4.json +++ b/tools/src/test/resources/1.4/valid-service-empty-objects-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "services": [ diff --git a/tools/src/test/resources/1.4/valid-signatures-1.4.json b/tools/src/test/resources/1.4/valid-signatures-1.4.json index 48dec3ef..1d7a85df 100644 --- a/tools/src/test/resources/1.4/valid-signatures-1.4.json +++ b/tools/src/test/resources/1.4/valid-signatures-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [ diff --git a/tools/src/test/resources/1.4/valid-vulnerability-1.4.json b/tools/src/test/resources/1.4/valid-vulnerability-1.4.json index 184a6641..b13a288d 100644 --- a/tools/src/test/resources/1.4/valid-vulnerability-1.4.json +++ b/tools/src/test/resources/1.4/valid-vulnerability-1.4.json @@ -1,6 +1,7 @@ { + "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json", "bomFormat": "CycloneDX", - "specVersion": "1.4", + "specVersion": "1.3", "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", "version": 1, "components": [