Skip to content

Commit 29f2132

Browse files
stevespringettstevespringett
committed
Updating to maintenance schema releases.
1 parent e487215 commit 29f2132

File tree

7 files changed

+37
-25
lines changed

7 files changed

+37
-25
lines changed

‎src/main/resources/bom-1.2-strict.schema.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
],
1212
"additionalProperties": false,
1313
"properties": {
14+
"$schema": {
15+
"type": "string",
16+
"enum": [
17+
"http://cyclonedx.org/schema/bom-1.2a.schema.json"
18+
]
19+
},
1420
"bomFormat": {
1521
"$id": "#/properties/bomFormat",
1622
"type": "string",
@@ -146,7 +152,7 @@
146152
"description": "The date and time (timestamp) when the document was created."
147153
},
148154
"hashes": {
149-
"$id": "#/properties/hashes",
155+
"$id": "#/definitions/tool/properties/hashes",
150156
"type": "array",
151157
"items": {"$ref": "#/definitions/hash"},
152158
"title": "Hashes",
@@ -440,7 +446,7 @@
440446
"title": "External References"
441447
},
442448
"components": {
443-
"$id": "#/properties/components",
449+
"$id": "#/definitions/component/properties/components",
444450
"type": "array",
445451
"items": {"$ref": "#/definitions/component"},
446452
"uniqueItems": true,
@@ -979,7 +985,7 @@
979985
"title": "External References"
980986
},
981987
"services": {
982-
"$id": "#/properties/services",
988+
"$id": "#/definitions/service/properties/services",
983989
"type": "array",
984990
"items": {"$ref": "#/definitions/service"},
985991
"uniqueItems": true,

‎src/main/resources/bom-1.2.schema.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
"description": "The date and time (timestamp) when the document was created."
144144
},
145145
"hashes": {
146-
"$id": "#/properties/hashes",
146+
"$id": "#/definitions/tool/properties/hashes",
147147
"type": "array",
148148
"items": {"$ref": "#/definitions/hash"},
149149
"title": "Hashes",
@@ -432,7 +432,7 @@
432432
"title": "External References"
433433
},
434434
"components": {
435-
"$id": "#/properties/components",
435+
"$id": "#/definitions/component/properties/components",
436436
"type": "array",
437437
"items": {"$ref": "#/definitions/component"},
438438
"uniqueItems": true,
@@ -957,7 +957,7 @@
957957
"title": "External References"
958958
},
959959
"services": {
960-
"$id": "#/properties/services",
960+
"$id": "#/definitions/service/properties/services",
961961
"type": "array",
962962
"items": {"$ref": "#/definitions/service"},
963963
"uniqueItems": true,

‎src/main/resources/bom-1.2.xsd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ limitations under the License.
2222
targetNamespace="http://cyclonedx.org/schema/bom/1.2"
2323
vc:minVersion="1.0"
2424
vc:maxVersion="1.1"
25-
version="1.2">
25+
version="1.2.1">
2626

2727
<xs:import namespace="http://cyclonedx.org/schema/spdx" schemaLocation="http://cyclonedx.org/schema/spdx"/>
2828

@@ -593,7 +593,7 @@ limitations under the License.
593593

594594
<xs:simpleType name="mimeType">
595595
<xs:restriction base="xs:token">
596-
<xs:pattern value="^[-+a-z0-9.]+/[-+a-z0-9.]+$"/>
596+
<xs:pattern value="[-+a-z0-9.]+/[-+a-z0-9.]+"/>
597597
</xs:restriction>
598598
</xs:simpleType>
599599

‎src/main/resources/bom-1.3-strict.schema.json‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3-
"$id": "http://cyclonedx.org/schema/bom-1.3.schema.json",
3+
"$id": "http://cyclonedx.org/schema/bom-1.3a.schema.json",
44
"type": "object",
55
"title": "CycloneDX Software Bill-of-Material Specification",
66
"$comment" : "CycloneDX JSON schema is published under the terms of the Apache License 2.0.",
@@ -11,6 +11,12 @@
1111
],
1212
"additionalProperties": false,
1313
"properties": {
14+
"$schema": {
15+
"type": "string",
16+
"enum": [
17+
"http://cyclonedx.org/schema/bom-1.3.schema.json"
18+
]
19+
},
1420
"bomFormat": {
1521
"$id": "#/properties/bomFormat",
1622
"type": "string",
@@ -161,7 +167,7 @@
161167
"description": "The date and time (timestamp) when the document was created."
162168
},
163169
"hashes": {
164-
"$id": "#/properties/hashes",
170+
"$id": "#/definitions/tool/properties/hashes",
165171
"type": "array",
166172
"items": {"$ref": "#/definitions/hash"},
167173
"title": "Hashes",
@@ -402,7 +408,7 @@
402408
"title": "External References"
403409
},
404410
"components": {
405-
"$id": "#/properties/components",
411+
"$id": "#/definitions/component/properties/components",
406412
"type": "array",
407413
"items": {"$ref": "#/definitions/component"},
408414
"uniqueItems": true,
@@ -828,7 +834,7 @@
828834
]
829835
},
830836
"hashes": {
831-
"$id": "#/properties/hashes",
837+
"$id": "#/definitions/externalReference/properties/hashes",
832838
"type": "array",
833839
"items": {"$ref": "#/definitions/hash"},
834840
"title": "Hashes",
@@ -939,7 +945,7 @@
939945
"title": "External References"
940946
},
941947
"services": {
942-
"$id": "#/properties/services",
948+
"$id": "#/definitions/service/properties/services",
943949
"type": "array",
944950
"items": {"$ref": "#/definitions/service"},
945951
"uniqueItems": true,

‎src/main/resources/bom-1.3.schema.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3-
"$id": "http://cyclonedx.org/schema/bom-1.3.schema.json",
3+
"$id": "http://cyclonedx.org/schema/bom-1.3a.schema.json",
44
"type": "object",
55
"title": "CycloneDX Software Bill-of-Material Specification",
66
"$comment" : "CycloneDX JSON schema is published under the terms of the Apache License 2.0.",
@@ -158,7 +158,7 @@
158158
"description": "The date and time (timestamp) when the document was created."
159159
},
160160
"hashes": {
161-
"$id": "#/properties/hashes",
161+
"$id": "#/definitions/tool/properties/hashes",
162162
"type": "array",
163163
"items": {"$ref": "#/definitions/hash"},
164164
"title": "Hashes",
@@ -395,7 +395,7 @@
395395
"title": "External References"
396396
},
397397
"components": {
398-
"$id": "#/properties/components",
398+
"$id": "#/definitions/component/properties/components",
399399
"type": "array",
400400
"items": {"$ref": "#/definitions/component"},
401401
"uniqueItems": true,
@@ -809,7 +809,7 @@
809809
]
810810
},
811811
"hashes": {
812-
"$id": "#/properties/hashes",
812+
"$id": "#/definitions/externalReference/properties/hashes",
813813
"type": "array",
814814
"items": {"$ref": "#/definitions/hash"},
815815
"title": "Hashes",
@@ -918,7 +918,7 @@
918918
"title": "External References"
919919
},
920920
"services": {
921-
"$id": "#/properties/services",
921+
"$id": "#/definitions/service/properties/services",
922922
"type": "array",
923923
"items": {"$ref": "#/definitions/service"},
924924
"uniqueItems": true,

‎src/main/resources/bom-1.3.xsd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ limitations under the License.
2222
targetNamespace="http://cyclonedx.org/schema/bom/1.3"
2323
vc:minVersion="1.0"
2424
vc:maxVersion="1.1"
25-
version="1.3">
25+
version="1.3.1">
2626

2727
<xs:import namespace="http://cyclonedx.org/schema/spdx" schemaLocation="http://cyclonedx.org/schema/spdx"/>
2828

@@ -598,7 +598,7 @@ limitations under the License.
598598

599599
<xs:simpleType name="mimeType">
600600
<xs:restriction base="xs:token">
601-
<xs:pattern value="^[-+a-z0-9.]+/[-+a-z0-9.]+$"/>
601+
<xs:pattern value="[-+a-z0-9.]+/[-+a-z0-9.]+"/>
602602
</xs:restriction>
603603
</xs:simpleType>
604604

@@ -1586,9 +1586,9 @@ limitations under the License.
15861586
<xs:element name="properties" type="bom:propertiesType" minOccurs="0" maxOccurs="1">
15871587
<xs:annotation>
15881588
<xs:documentation>Provides the ability to document properties in a name-value store.
1589-
This provides flexibility to include data not officially supported in the standard
1590-
without having to use additional namespaces or create extensions. Unlike key-value
1591-
stores, properties support duplicate names, each potentially having different values.</xs:documentation>
1589+
This provides flexibility to include data not officially supported in the standard
1590+
without having to use additional namespaces or create extensions. Unlike key-value
1591+
stores, properties support duplicate names, each potentially having different values.</xs:documentation>
15921592
</xs:annotation>
15931593
</xs:element>
15941594
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">

‎src/main/resources/bom-1.4.xsd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ limitations under the License.
2222
targetNamespace="http://cyclonedx.org/schema/bom/1.4"
2323
vc:minVersion="1.0"
2424
vc:maxVersion="1.1"
25-
version="1.4">
25+
version="1.4.1">
2626

2727
<xs:import namespace="http://cyclonedx.org/schema/spdx" schemaLocation="http://cyclonedx.org/schema/spdx"/>
2828

@@ -620,7 +620,7 @@ limitations under the License.
620620

621621
<xs:simpleType name="mimeType">
622622
<xs:restriction base="xs:token">
623-
<xs:pattern value="^[-+a-z0-9.]+/[-+a-z0-9.]+$"/>
623+
<xs:pattern value="[-+a-z0-9.]+/[-+a-z0-9.]+"/>
624624
</xs:restriction>
625625
</xs:simpleType>
626626

0 commit comments

Comments
 (0)