#15 #12 Added support for license text, content type, and encoding

CycloneDX · Feb 19, 2019 · e5b2f27 · e5b2f27
1 parent e8e89a5
commit e5b2f27
Showing 1 changed file with 31 additions and 0 deletions.
diff --git a/schema/bom-1.1-DRAFT-2.xsd b/schema/bom-1.1-DRAFT-2.xsd
@@ -93,6 +93,11 @@
                                             </xs:annotation>
                                         </xs:element>
                                     </xs:choice>
+                                    <xs:element name="text" type="bom:licenseTextType" minOccurs="0" maxOccurs="1">
+                                        <xs:annotation>
+                                            <xs:documentation>Specifies the optional full text of the license</xs:documentation>
+                                        </xs:annotation>
+                                    </xs:element>
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>
@@ -170,6 +175,26 @@
         </xs:anyAttribute>
     </xs:complexType>
 
+    <xs:complexType name="licenseTextType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Specifies attributes of the license text</xs:documentation>
+                </xs:annotation>
+                <xs:attribute name="content-type" type="xs:normalizedString" default="text/plain">
+                    <xs:annotation>
+                        <xs:documentation>Specifies the content type of the license text. Defaults to text/plain if not specified.</xs:documentation>
+                    </xs:annotation>
+                </xs:attribute>
+                <xs:attribute name="encoding" type="bom:encoding">
+                    <xs:annotation>
+                        <xs:documentation>Specified the optional encoding the license text is represented in</xs:documentation>
+                    </xs:annotation>
+                </xs:attribute>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
     <xs:complexType name="hashType">
         <xs:annotation>
             <xs:documentation>Specifies the file hash of the component</xs:documentation>
@@ -238,6 +263,12 @@
             <xs:pattern value="([a-fA-F0-9]{32})|([a-fA-F0-9]{40})|([a-fA-F0-9]{64})|([a-fA-F0-9]{96})|([a-fA-F0-9]{128})"/>
         </xs:restriction>
     </xs:simpleType>
+
+    <xs:simpleType name="encoding">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="base64"/>
+        </xs:restriction>
+    </xs:simpleType>
 
     <xs:simpleType name="cpe">
         <xs:annotation>