Skip to content

Commit 1c8bab8

Browse files
Fixed copyright issue to align with how v1.7 does it.
Signed-off-by: Steve Springett <[email protected]>
1 parent 8db8674 commit 1c8bab8

File tree

1 file changed

+25
-6
lines changed

1 file changed

+25
-6
lines changed

schema/2.0/model/cyclonedx-component-2.0.schema.json

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
"title": "Component License(s)"
151151
},
152152
"copyright": {
153-
"$ref": "#/$defs/copyright"
153+
"$ref": "#/$defs/copyrightText"
154154
},
155155
"patentAssertions": {
156156
"$ref": "cyclonedx-patent-2.0.schema.json#/$defs/patentAssertions",
@@ -325,12 +325,34 @@
325325
"vers:gem/>=2.2.0|!= 2.2.1|<2.3.0"
326326
]
327327
},
328-
"copyright": {
328+
"copyrightText": {
329329
"type": "string",
330330
"title": "Component Copyright",
331331
"description": "A copyright notice informing users of the underlying claims to copyright ownership in a published work.",
332332
"examples": ["Acme Inc"]
333333
},
334+
"copyright": {
335+
"type": "array",
336+
"items": {"$ref": "#/$defs/copyrightObject"},
337+
"title": "Copyright",
338+
"description": "Captures intellectual property assertions, providing evidence of possible ownership and legal protection."
339+
},
340+
"copyrightObject": {
341+
"type": "object",
342+
"title": "Copyright",
343+
"description": "A copyright notice informing users of the underlying claims to copyright ownership in a published work.",
344+
"required": [
345+
"text"
346+
],
347+
"additionalProperties": false,
348+
"properties": {
349+
"text": {
350+
"type": "string",
351+
"title": "Copyright Text",
352+
"description": "The textual content of the copyright."
353+
}
354+
}
355+
},
334356
"swid": {
335357
"type": "object",
336358
"title": "SWID Tag",
@@ -503,10 +525,7 @@
503525
"title": "License Evidence"
504526
},
505527
"copyright": {
506-
"type": "array",
507-
"items": {"$ref": "#/$defs/copyright"},
508-
"title": "Copyright Evidence",
509-
"description": "Copyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection."
528+
"$ref": "#/$defs/copyright"
510529
}
511530
}
512531
},

0 commit comments

Comments
 (0)