Skip to content

Commit a032bf6

Browse files
jkowalleckjkowalleck
committed
feat: schma CDX1.7
Signed-off-by: Jan Kowalleck <[email protected]>
1 parent 341a2b7 commit a032bf6

File tree

10 files changed

+16466
-22
lines changed

10 files changed

+16466
-22
lines changed

‎res/schema/README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ some schema for offline use as download via [script](../../tools/schema-download
44
original sources: <https://github.com/CycloneDX/specification/blob/master>
55

66
Currently using version
7-
[8a27bfd1be5be0dcb2c208a34d2f4fa0b6d75bd7](https://github.com/CycloneDX/specification/commit/8a27bfd1be5be0dcb2c208a34d2f4fa0b6d75bd7)
7+
[4b3f59453366e27c8073fd24e98bf21ef8892c8e](https://github.com/CycloneDX/specification/commit/4b3f59453366e27c8073fd24e98bf21ef8892c8e)
88

99
| file | note |
1010
|------|------|
@@ -15,11 +15,13 @@ Currently using version
1515
| [`bom-1.4.SNAPSHOT.xsd`](bom-1.4.SNAPSHOT.xsd) | applied changes: 1 |
1616
| [`bom-1.5.SNAPSHOT.xsd`](bom-1.5.SNAPSHOT.xsd) | applied changes: 1 |
1717
| [`bom-1.6.SNAPSHOT.xsd`](bom-1.6.SNAPSHOT.xsd) | applied changes: 1 |
18+
| [`bom-1.7.SNAPSHOT.xsd`](bom-1.7.SNAPSHOT.xsd) | applied changes: 1 |
1819
| [`bom-1.2.SNAPSHOT.schema.json`](bom-1.2.SNAPSHOT.schema.json) | applied changes: 2,3,4,5,6 |
1920
| [`bom-1.3.SNAPSHOT.schema.json`](bom-1.3.SNAPSHOT.schema.json) | applied changes: 2,3,4,5,6 |
2021
| [`bom-1.4.SNAPSHOT.schema.json`](bom-1.4.SNAPSHOT.schema.json) | applied changes: 2,3,4,5,6 |
2122
| [`bom-1.5.SNAPSHOT.schema.json`](bom-1.5.SNAPSHOT.schema.json) | applied changes: 2,3,4,5,6 |
2223
| [`bom-1.6.SNAPSHOT.schema.json`](bom-1.6.SNAPSHOT.schema.json) | applied changes: 2,3,4,5,6 |
24+
| [`bom-1.7.SNAPSHOT.schema.json`](bom-1.7.SNAPSHOT.schema.json) | applied changes: 2,3,4,5,6 |
2325
| [`bom-1.2-strict.SNAPSHOT.schema.json`](bom-1.2-strict.SNAPSHOT.schema.json) | applied changes: 2,3,4,5,6 |
2426
| [`bom-1.3-strict.SNAPSHOT.schema.json`](bom-1.3-strict.SNAPSHOT.schema.json) | applied changes: 2,3,4,5,6 |
2527
| [`spdx.SNAPSHOT.xsd`](spdx.SNAPSHOT.xsd) | |

‎res/schema/bom-1.4.SNAPSHOT.schema.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1636,7 +1636,7 @@
16361636
"$ref": "#/definitions/version"
16371637
},
16381638
"range": {
1639-
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst",
1639+
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/vers-spec",
16401640
"$ref": "#/definitions/range"
16411641
},
16421642
"status": {
@@ -1679,7 +1679,7 @@
16791679
"maxLength": 1024
16801680
},
16811681
"range": {
1682-
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst",
1682+
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/vers-spec",
16831683
"type": "string",
16841684
"minLength": 1,
16851685
"maxLength": 1024

‎res/schema/bom-1.4.SNAPSHOT.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1993,7 +1993,7 @@ limitations under the License.
19931993
</xs:element>
19941994
<xs:element name="range" type="xs:normalizedString" minOccurs="1" maxOccurs="1">
19951995
<xs:annotation>
1996-
<xs:documentation>A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst</xs:documentation>
1996+
<xs:documentation>A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/vers-spec</xs:documentation>
19971997
</xs:annotation>
19981998
</xs:element>
19991999
</xs:choice>

‎res/schema/bom-1.5.SNAPSHOT.schema.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2281,7 +2281,7 @@
22812281
"$ref": "#/definitions/version"
22822282
},
22832283
"range": {
2284-
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst",
2284+
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/vers-spec",
22852285
"$ref": "#/definitions/range"
22862286
},
22872287
"status": {
@@ -2323,7 +2323,7 @@
23232323
"maxLength": 1024
23242324
},
23252325
"range": {
2326-
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst",
2326+
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/vers-spec",
23272327
"type": "string",
23282328
"minLength": 1,
23292329
"maxLength": 1024

‎res/schema/bom-1.5.SNAPSHOT.xsd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2433,12 +2433,12 @@ limitations under the License.
24332433
</xs:enumeration>
24342434
<xs:enumeration value="incomplete_first_party_proprietary_only">
24352435
<xs:annotation>
2436-
<xs:documentation>The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented, limited specifically to those that are proprietary.</xs:documentation>
2436+
<xs:documentation>The relationship is incomplete. Only relationships for first-party components, services, or their dependencies are represented, limited specifically to those that are proprietary.</xs:documentation>
24372437
</xs:annotation>
24382438
</xs:enumeration>
24392439
<xs:enumeration value="incomplete_first_party_opensource_only">
24402440
<xs:annotation>
2441-
<xs:documentation>The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented, limited specifically to those that are opensource.</xs:documentation>
2441+
<xs:documentation>The relationship is incomplete. Only relationships for first-party components, services, or their dependencies are represented, limited specifically to those that are opensource.</xs:documentation>
24422442
</xs:annotation>
24432443
</xs:enumeration>
24442444
<xs:enumeration value="incomplete_third_party_only">
@@ -3644,7 +3644,7 @@ limitations under the License.
36443644
</xs:element>
36453645
<xs:element name="range" type="xs:normalizedString" minOccurs="1" maxOccurs="1">
36463646
<xs:annotation>
3647-
<xs:documentation>A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst</xs:documentation>
3647+
<xs:documentation>A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/vers-spec</xs:documentation>
36483648
</xs:annotation>
36493649
</xs:element>
36503650
</xs:choice>

‎res/schema/bom-1.6.SNAPSHOT.schema.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"type": "string",
2626
"title": "CycloneDX Specification Version",
2727
"description": "The version of the CycloneDX specification the BOM conforms to.",
28-
"examples": ["1.6.1"]
28+
"examples": ["1.6"]
2929
},
3030
"serialNumber": {
3131
"type": "string",
@@ -2237,7 +2237,7 @@
22372237
"aggregate": {
22382238
"$ref": "#/definitions/aggregateType",
22392239
"title": "Aggregate",
2240-
"description": "Specifies an aggregate type that describe how complete a relationship is."
2240+
"description": "Specifies an aggregate type that describes how complete a relationship is."
22412241
},
22422242
"assemblies": {
22432243
"type": "array",
@@ -2928,7 +2928,7 @@
29282928
},
29292929
"range": {
29302930
"title": "Version Range",
2931-
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst",
2931+
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/vers-spec",
29322932
"$ref": "#/definitions/versionRange"
29332933
},
29342934
"status": {
@@ -2983,7 +2983,7 @@
29832983
]
29842984
},
29852985
"versionRange": {
2986-
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst",
2986+
"description": "A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/vers-spec",
29872987
"type": "string",
29882988
"minLength": 1,
29892989
"maxLength": 4096,

‎res/schema/bom-1.6.SNAPSHOT.xsd‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ limitations under the License.
7676
<xs:simpleType name="versionRangeType">
7777
<xs:annotation>
7878
<xs:documentation xml:lang="en"><![CDATA[
79-
A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst
79+
A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/vers-spec
8080
8181
Example values:
8282
- "vers:cargo/9.0.14"
@@ -2672,7 +2672,7 @@ limitations under the License.
26722672
<xs:element name="copyright" type="bom:copyrightsType" minOccurs="0" maxOccurs="1">
26732673
<xs:annotation>
26742674
<xs:documentation>
2675-
opyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection.
2675+
Copyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection.
26762676
</xs:documentation>
26772677
</xs:annotation>
26782678
</xs:element>
@@ -2715,7 +2715,7 @@ limitations under the License.
27152715
<xs:sequence minOccurs="0" maxOccurs="unbounded">
27162716
<xs:element name="aggregate" type="bom:aggregateType" default="not_specified">
27172717
<xs:annotation>
2718-
<xs:documentation>Specifies an aggregate type that describe how complete a relationship is.</xs:documentation>
2718+
<xs:documentation>Specifies an aggregate type that describes how complete a relationship is.</xs:documentation>
27192719
</xs:annotation>
27202720
</xs:element>
27212721
<xs:element name="assemblies" minOccurs="0" maxOccurs="1">
@@ -2810,12 +2810,12 @@ limitations under the License.
28102810
</xs:enumeration>
28112811
<xs:enumeration value="incomplete_first_party_proprietary_only">
28122812
<xs:annotation>
2813-
<xs:documentation>The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented, limited specifically to those that are proprietary.</xs:documentation>
2813+
<xs:documentation>The relationship is incomplete. Only relationships for first-party components, services, or their dependencies are represented, limited specifically to those that are proprietary.</xs:documentation>
28142814
</xs:annotation>
28152815
</xs:enumeration>
28162816
<xs:enumeration value="incomplete_first_party_opensource_only">
28172817
<xs:annotation>
2818-
<xs:documentation>The relationship is incomplete. Only relationships for third-party components, services, or their dependencies are represented, limited specifically to those that are opensource.</xs:documentation>
2818+
<xs:documentation>The relationship is incomplete. Only relationships for first-party components, services, or their dependencies are represented, limited specifically to those that are opensource.</xs:documentation>
28192819
</xs:annotation>
28202820
</xs:enumeration>
28212821
<xs:enumeration value="incomplete_third_party_only">
@@ -4475,7 +4475,7 @@ limitations under the License.
44754475
</xs:element>
44764476
<xs:element name="range" type="bom:versionRangeType" minOccurs="1" maxOccurs="1">
44774477
<xs:annotation>
4478-
<xs:documentation>A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/purl-spec/VERSION-RANGE-SPEC.rst</xs:documentation>
4478+
<xs:documentation>A version range specified in Package URL Version Range syntax (vers) which is defined at https://github.com/package-url/vers-spec</xs:documentation>
44794479
</xs:annotation>
44804480
</xs:element>
44814481
</xs:choice>

0 commit comments

Comments
 (0)