Skip to content

Commit 2c55cb5

Browse files
authored
Merge pull request #207 from CycloneDX/feat/update-schemas
feat: Update CycloneDX Schemas to latest patch versions
2 parents dad8538 + a9c3e77 commit 2c55cb5

26 files changed

+2143
-29
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
cyclonedx/schema/** linguist-language
3+

cyclonedx/output/json.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,13 @@ def _get_schema_uri(self) -> Optional[str]:
210210
class JsonV1Dot2(Json, SchemaVersion1Dot2):
211211

212212
def _get_schema_uri(self) -> Optional[str]:
213-
return 'http://cyclonedx.org/schema/bom-1.2a.schema.json'
213+
return 'http://cyclonedx.org/schema/bom-1.2b.schema.json'
214214

215215

216216
class JsonV1Dot3(Json, SchemaVersion1Dot3):
217217

218218
def _get_schema_uri(self) -> Optional[str]:
219-
return 'http://cyclonedx.org/schema/bom-1.3.schema.json'
219+
return 'http://cyclonedx.org/schema/bom-1.3a.schema.json'
220220

221221

222222
class JsonV1Dot4(Json, SchemaVersion1Dot4):

cyclonedx/schema/bom-1.2.xsd

Lines changed: 3 additions & 3 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="spdx.xsd"/>
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

@@ -1415,4 +1415,4 @@ limitations under the License.
14151415
<xs:field xpath="@bom-ref"/>
14161416
</xs:unique>
14171417
</xs:element>
1418-
</xs:schema>
1418+
</xs:schema>

0 commit comments

Comments
 (0)