Merge pull request #207 from CycloneDX/feat/update-schemas

feat: Update CycloneDX Schemas to latest patch versions
CycloneDX · Apr 12, 2022 · 2c55cb5 · 2c55cb5
2 parents dad8538 + a9c3e77
commit 2c55cb5
Show file tree

Hide file tree

Showing 26 changed files with 2,143 additions and 29 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+
+cyclonedx/schema/**     linguist-language
+
diff --git a/cyclonedx/output/json.py b/cyclonedx/output/json.py
@@ -210,13 +210,13 @@ def _get_schema_uri(self) -> Optional[str]:
 class JsonV1Dot2(Json, SchemaVersion1Dot2):
 
     def _get_schema_uri(self) -> Optional[str]:
-        return 'http://cyclonedx.org/schema/bom-1.2a.schema.json'
+        return 'http://cyclonedx.org/schema/bom-1.2b.schema.json'
 
 
 class JsonV1Dot3(Json, SchemaVersion1Dot3):
 
     def _get_schema_uri(self) -> Optional[str]:
-        return 'http://cyclonedx.org/schema/bom-1.3.schema.json'
+        return 'http://cyclonedx.org/schema/bom-1.3a.schema.json'
 
 
 class JsonV1Dot4(Json, SchemaVersion1Dot4):

diff --git a/cyclonedx/schema/bom-1.2.xsd b/cyclonedx/schema/bom-1.2.xsd
@@ -22,7 +22,7 @@ limitations under the License.
            targetNamespace="http://cyclonedx.org/schema/bom/1.2"
            vc:minVersion="1.0"
            vc:maxVersion="1.1"
-           version="1.2">
+           version="1.2.1">
 
     <xs:import namespace="http://cyclonedx.org/schema/spdx" schemaLocation="spdx.xsd"/>
 
@@ -593,7 +593,7 @@ limitations under the License.
 
     <xs:simpleType name="mimeType">
         <xs:restriction base="xs:token">
-            <xs:pattern value="^[-+a-z0-9.]+/[-+a-z0-9.]+$"/>
+            <xs:pattern value="[-+a-z0-9.]+/[-+a-z0-9.]+"/>
         </xs:restriction>
     </xs:simpleType>
 
@@ -1415,4 +1415,4 @@ limitations under the License.
             <xs:field xpath="@bom-ref"/>
         </xs:unique>
     </xs:element>
-</xs:schema>
+</xs:schema>