From 866794e420d2bdc104172e81aa9559ebbdf7a141 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Sat, 17 Jun 2023 19:44:42 +0200 Subject: [PATCH 1/2] v1.5 clarify `resourceReferenceChoice.ref`` Signed-off-by: Jan Kowalleck --- schema/bom-1.5.schema.json | 2 +- schema/bom-1.5.xsd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/bom-1.5.schema.json b/schema/bom-1.5.schema.json index 34e56317..0eec8c81 100644 --- a/schema/bom-1.5.schema.json +++ b/schema/bom-1.5.schema.json @@ -3645,7 +3645,7 @@ "ref": { "title": "BOM Reference", "description": "References an object by its bom-ref attribute", - "$ref": "#/definitions/refType" + "$ref": "#/definitions/refLinkType" }, "externalReference": { "title": "External reference", diff --git a/schema/bom-1.5.xsd b/schema/bom-1.5.xsd index ac1e1377..37f81faa 100644 --- a/schema/bom-1.5.xsd +++ b/schema/bom-1.5.xsd @@ -4356,7 +4356,7 @@ limitations under the License. - + References an object by its bom-ref attribute From 864d4f4d4b5aed806758c1a4ac4129bcd3d05bcc Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Mon, 19 Jun 2023 15:37:13 +0200 Subject: [PATCH 2/2] explicitrly allow bomLinkElementType Signed-off-by: Jan Kowalleck --- schema/bom-1.5.schema.json | 5 ++++- schema/bom-1.5.xsd | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/schema/bom-1.5.schema.json b/schema/bom-1.5.schema.json index 0eec8c81..0d0804a4 100644 --- a/schema/bom-1.5.schema.json +++ b/schema/bom-1.5.schema.json @@ -3645,7 +3645,10 @@ "ref": { "title": "BOM Reference", "description": "References an object by its bom-ref attribute", - "$ref": "#/definitions/refLinkType" + "anyOf": [ + {"$ref": "#/definitions/refLinkType"}, + {"$ref": "#/definitions/bomLinkElementType"} + ] }, "externalReference": { "title": "External reference", diff --git a/schema/bom-1.5.xsd b/schema/bom-1.5.xsd index 37f81faa..bb8ea874 100644 --- a/schema/bom-1.5.xsd +++ b/schema/bom-1.5.xsd @@ -4356,12 +4356,15 @@ limitations under the License. - + References an object by its bom-ref attribute + + +