Skip to content

Commit 714813c

Browse files
committed
licenseexpression details bom-ref
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
1 parent 85e903d commit 714813c

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

schema/bom-1.7.proto

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,10 @@ message LicenseExpressionDetailed {
431431
// - "GPL-3.0-only WITH Classpath-exception-2.0"
432432
// - "LicenseRef-my-custom-license"
433433
string license_identifier = 1;
434+
// An optional identifier which can be used to reference the license elsewhere in the BOM. Uniqueness is enforced within all elements and children of the root-level bom element.
435+
optional string bom_ref = 2;
434436
// An optional way to include the textual content of the license.
435-
optional AttachedText text = 2;
437+
optional AttachedText text = 3;
436438
}
437439

438440
// A valid SPDX license expression. Refer to https://spdx.org/specifications for syntax requirements.

schema/bom-1.7.schema.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,6 +1515,11 @@
15151515
"LicenseRef-my-custom-license"
15161516
]
15171517
},
1518+
"bom-ref": {
1519+
"$ref": "#/definitions/refType",
1520+
"title": "BOM Reference",
1521+
"description": "An optional identifier which can be used to reference the license elsewhere in the BOM. Every bom-ref must be unique within the BOM.\nValue SHOULD not start with the BOM-Link intro 'urn:cdx:' to avoid conflicts with BOM-Links."
1522+
},
15181523
"text": {
15191524
"title": "License texts",
15201525
"description": "An optional way to include the textual content of the license.",

schema/bom-1.7.xsd

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,6 +1029,14 @@ limitations under the License.
10291029
</xs:documentation>
10301030
</xs:annotation>
10311031
</xs:attribute>
1032+
<xs:attribute name="bom-ref" type="bom:refType">
1033+
<xs:annotation>
1034+
<xs:documentation>
1035+
An optional identifier which can be used to reference the license elsewhere in the BOM.
1036+
Uniqueness is enforced within all elements and children of the root-level bom element.
1037+
</xs:documentation>
1038+
</xs:annotation>
1039+
</xs:attribute>
10321040
</xs:complexType>
10331041
</xs:element>
10341042
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">

0 commit comments

Comments
 (0)