From 2935c9bbe995e8f539cb6cce96c1be494ce3289d Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Tue, 8 Sep 2026 16:42:18 +0200 Subject: [PATCH 1/2] remove metadata.supplier Signed-off-by: Jan Kowalleck --- schema/2.0/model/cyclonedx-metadata-2.0.schema.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/schema/2.0/model/cyclonedx-metadata-2.0.schema.json b/schema/2.0/model/cyclonedx-metadata-2.0.schema.json index 5da76761..ddbc8ac0 100644 --- a/schema/2.0/model/cyclonedx-metadata-2.0.schema.json +++ b/schema/2.0/model/cyclonedx-metadata-2.0.schema.json @@ -47,11 +47,6 @@ "description": "The component that the BOM describes.", "$ref": "cyclonedx-component-2.0.schema.json#/$defs/component" }, - "supplier": { - "title": "Supplier", - "description": " The organization that supplied the component that the BOM describes. The supplier may often be the manufacturer, but may also be a distributor or repackager.", - "$ref": "cyclonedx-common-2.0.schema.json#/$defs/organizationalEntity" - }, "licenses": { "title": "BOM License(s)", "description": "The license information for the BOM document.\nThis may be different from the license(s) of the component(s) that the BOM describes.", From 2708b90e21147f741ca104dde786a07a6e718d05 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Thu, 10 Sep 2026 17:58:58 +0200 Subject: [PATCH 2/2] tests Signed-off-by: Jan Kowalleck --- .../src/test/resources/2.0/valid-bom-2.0.json | 23 ++++++++---------- .../2.0/valid-metadata-supplier-2.0.json | 24 ------------------- 2 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 tools/src/test/resources/2.0/valid-metadata-supplier-2.0.json diff --git a/tools/src/test/resources/2.0/valid-bom-2.0.json b/tools/src/test/resources/2.0/valid-bom-2.0.json index af4ffa09..cea26cb4 100644 --- a/tools/src/test/resources/2.0/valid-bom-2.0.json +++ b/tools/src/test/resources/2.0/valid-bom-2.0.json @@ -46,6 +46,15 @@ { "roles": [ { "role": "author" } ], "organization": { "name": "Acme Super Heroes" } + }, + { + "roles": [ { "role": "supplier" } ], + "person": { + "name": "Acme Distribution", + "email": [ { + "address": "distribution@example.com" + } ] + } } ], "name": "Acme Application", @@ -74,18 +83,6 @@ "email": "professional.services@example.com" } ] - }, - "supplier": { - "name": "Acme, Inc.", - "url": [ - "https://example.com" - ], - "contact": [ - { - "name": "Acme Distribution", - "email": "distribution@example.com" - } - ] } }, "components": [ @@ -381,4 +378,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/tools/src/test/resources/2.0/valid-metadata-supplier-2.0.json b/tools/src/test/resources/2.0/valid-metadata-supplier-2.0.json deleted file mode 100644 index d6c7e03f..00000000 --- a/tools/src/test/resources/2.0/valid-metadata-supplier-2.0.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "$schema": "https://cyclonedx.org/schema/2.0/cyclonedx-2.0.schema.json", - "specFormat": "CycloneDX", - "specVersion": "2.0", - "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", - "version": 1, - "metadata": { - "supplier": { - "bom-ref": "supplier-1", - "name": "Acme, Inc.", - "url": [ - "https://example.com" - ], - "contact": [ - { - "bom-ref": "contact-1", - "name": "Acme Distribution", - "email": "distribution@example.com" - } - ] - } - }, - "components": [] -}