Skip to content

Commit bcb4ba1

Browse files
committed
feat: license acknowledge should beunique
Signed-off-by: Jan Kowalleck <[email protected]>
1 parent 2f1fb1e commit bcb4ba1

File tree

3 files changed

+39
-11
lines changed

3 files changed

+39
-11
lines changed

schema/bom-1.7.proto

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ message Component {
122122
optional Scope scope = 11;
123123
// The hashes of the component.
124124
repeated Hash hashes = 12;
125-
// EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)
125+
// EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression).
126+
// There should be no more than one per license acknowledgement.
126127
repeated LicenseChoice licenses = 13;
127128
// An optional copyright notice informing users of the underlying claims to copyright ownership in a published work.
128129
optional string copyright = 14;
@@ -520,7 +521,7 @@ message Metadata {
520521
// The organization that supplied the component that the BOM describes. The supplier may often be the manufacture, but may also be a distributor or repackager.
521522
optional OrganizationalEntity supplier = 6;
522523
// The license information for the BOM document. This may be different from the license(s) of the component(s) that the BOM describes.
523-
// EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)
524+
// There should be no more than one per license acknowledgement.
524525
repeated LicenseChoice licenses = 7;
525526
// Specifies optional, custom, properties
526527
repeated Property properties = 8;
@@ -655,7 +656,8 @@ message Service {
655656
optional bool x_trust_boundary = 9;
656657
// Specifies information about the data including the directional flow of data and the data classification.
657658
repeated DataFlow data = 10;
658-
// EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)
659+
// EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression).
660+
// There should be no more than one per license acknowledgement.
659661
repeated LicenseChoice licenses = 11;
660662
// Provides the ability to document external references related to the service.
661663
repeated ExternalReference external_references = 12;
@@ -759,7 +761,8 @@ message EvidenceCopyright {
759761

760762
// Provides the ability to document evidence collected through various forms of extraction or analysis.
761763
message Evidence {
762-
// EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression)
764+
// EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression).
765+
// There should be no license acknowledgement assigned to any of these.
763766
repeated LicenseChoice licenses = 1;
764767
// Copyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection.
765768
repeated EvidenceCopyright copyright = 2;

schema/bom-1.7.schema.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@
704704
},
705705
"licenses": {
706706
"title": "BOM License(s)",
707-
"description": "The license information for the BOM document.\nThis may be different from the license(s) of the component(s) that the BOM describes.",
707+
"description": "The license information for the BOM document. This may be different from the license(s) of the component(s) that the BOM describes.\nThere should be no more than one per license acknowledgement.",
708708
"$ref": "#/definitions/licenseChoice"
709709
},
710710
"properties": {
@@ -965,7 +965,8 @@
965965
},
966966
"licenses": {
967967
"$ref": "#/definitions/licenseChoice",
968-
"title": "Component License(s)"
968+
"title": "Component License(s)",
969+
"description": "EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression).\nThere should be no more than one per license acknowledgement."
969970
},
970971
"copyright": {
971972
"type": "string",
@@ -1968,7 +1969,8 @@
19681969
},
19691970
"licenses": {
19701971
"$ref": "#/definitions/licenseChoice",
1971-
"title": "Service License(s)"
1972+
"title": "Service License(s)",
1973+
"description": "EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression).\nThere should be no more than one per license acknowledgement."
19721974
},
19731975
"externalReferences": {
19741976
"type": "array",
@@ -2242,7 +2244,8 @@
22422244
},
22432245
"licenses": {
22442246
"$ref": "#/definitions/licenseChoice",
2245-
"title": "License Evidence"
2247+
"title": "License Evidence",
2248+
"description": "EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression).\nThere should be no license acknowledgement assigned to any of these."
22462249
},
22472250
"copyright": {
22482251
"type": "array",

schema/bom-1.7.xsd

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ limitations under the License.
243243
<xs:documentation>
244244
The license information for the BOM document.
245245
This may be different from the license(s) of the component(s) that the BOM describes.
246+
There should be no more than one per license acknowledgement.
246247
</xs:documentation>
247248
</xs:annotation>
248249
</xs:element>
@@ -595,7 +596,14 @@ limitations under the License.
595596
</xs:sequence>
596597
</xs:complexType>
597598
</xs:element>
598-
<xs:element name="licenses" type="bom:licenseChoiceType" minOccurs="0" maxOccurs="1"/>
599+
<xs:element name="licenses" type="bom:licenseChoiceType" minOccurs="0" maxOccurs="1">
600+
<xs:annotation>
601+
<xs:documentation>
602+
"EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression).
603+
There should be no more than one per license acknowledgement.
604+
</xs:documentation>
605+
</xs:annotation>
606+
</xs:element>
599607
<xs:element name="copyright" type="xs:normalizedString" minOccurs="0" maxOccurs="1">
600608
<xs:annotation>
601609
<xs:documentation>A copyright notice informing users of the underlying claims to copyright ownership in a published work.</xs:documentation>
@@ -2214,7 +2222,14 @@ limitations under the License.
22142222
</xs:choice>
22152223
</xs:complexType>
22162224
</xs:element>
2217-
<xs:element name="licenses" type="bom:licenseChoiceType" minOccurs="0" maxOccurs="1"/>
2225+
<xs:element name="licenses" type="bom:licenseChoiceType" minOccurs="0" maxOccurs="1">
2226+
<xs:annotation>
2227+
<xs:documentation>
2228+
"EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression).
2229+
There should be no more than one per license acknowledgement.
2230+
</xs:documentation>
2231+
</xs:annotation>
2232+
</xs:element>
22182233
<xs:element name="externalReferences" type="bom:externalReferences" minOccurs="0" maxOccurs="1">
22192234
<xs:annotation>
22202235
<xs:documentation>Provides the ability to document external references related to the service.</xs:documentation>
@@ -2701,7 +2716,14 @@ limitations under the License.
27012716
</xs:sequence>
27022717
</xs:complexType>
27032718
</xs:element>
2704-
<xs:element name="licenses" type="bom:licenseChoiceType" minOccurs="0" maxOccurs="1"/>
2719+
<xs:element name="licenses" type="bom:licenseChoiceType" minOccurs="0" maxOccurs="1">
2720+
<xs:annotation>
2721+
<xs:documentation>
2722+
EITHER (list of SPDX licenses and/or named licenses) OR (tuple of one SPDX License Expression).
2723+
There should be no license acknowledgement assigned to any of these.
2724+
</xs:documentation>
2725+
</xs:annotation>
2726+
</xs:element>
27052727
<xs:element name="copyright" type="bom:copyrightsType" minOccurs="0" maxOccurs="1">
27062728
<xs:annotation>
27072729
<xs:documentation>

0 commit comments

Comments
 (0)