fix(xml): requirement descriptions should be unbounded (#533)

fixes #528 where occurrences of `definitions.standards.requirements.descriptions` should be unbounded --------- Signed-off-by: Hakan Dilek <[email protected]> Co-authored-by: Jan Kowalleck <[email protected]>
CycloneDX · Nov 7, 2024 · 8ded79c · 8ded79c
1 parent 136479a
commit 8ded79c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/schema/bom-1.6.xsd b/schema/bom-1.6.xsd
@@ -8144,7 +8144,7 @@ limitations under the License.
                                         </xs:annotation>
                                         <xs:complexType>
                                             <xs:sequence>
-                                                <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                                                <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
                                             </xs:sequence>
                                         </xs:complexType>
                                     </xs:element>

diff --git a/tools/src/test/resources/1.6/valid-standard-1.6.json b/tools/src/test/resources/1.6/valid-standard-1.6.json
@@ -22,6 +22,11 @@
             "bom-ref": "requirement-1.1",
             "identifier": "v1.1",
             "title": "Title here",
+            "text": "Text here",
+            "descriptions": [
+              "Requirement is described here",
+              "and here"
+            ],
             "parent": "requirement-1"
           },
           {

diff --git a/tools/src/test/resources/1.6/valid-standard-1.6.textproto b/tools/src/test/resources/1.6/valid-standard-1.6.textproto
@@ -22,6 +22,11 @@ definitions {
           bom_ref: "requirement-1.1"
           identifier: "v1.1"
           title: "Title here"
+          text: "Text here"
+          descriptions: [
+            "Requirement is described here"
+            "and here"
+          ]
           parent: "requirement-1"
         },
         {

diff --git a/tools/src/test/resources/1.6/valid-standard-1.6.xml b/tools/src/test/resources/1.6/valid-standard-1.6.xml
@@ -15,6 +15,11 @@
                     <requirement bom-ref="requirement-1.1">
                         <identifier>v1.1</identifier>
                         <title>Title here</title>
+                        <text>Text here</text>
+                        <descriptions>
+                            <description>Requirement is described here</description>
+                            <description>and here</description>
+                        </descriptions>
                         <parent>requirement-1</parent>
                     </requirement>
                     <requirement bom-ref="requirement-1.1.1">