Skip to content

Commit bfb6f8b

Browse files
authored
1.6 ecma -- docs carry over (#512)
carry over the JSON docs from #478 to XML and PR --------- Signed-off-by: Jan Kowalleck <[email protected]>
1 parent 6c96568 commit bfb6f8b

File tree

3 files changed

+83
-74
lines changed

3 files changed

+83
-74
lines changed

schema/bom-1.6.proto

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ message Component {
106106
optional string group = 7;
107107
// The name of the component. This will often be a shortened, single name of the component. Examples: commons-lang3 and jquery
108108
string name = 8;
109-
// The component version. The version should ideally comply with semantic versioning but is not enforced. Version was made optional in v1.4 of the spec. For backward compatibility, it is RECOMMENDED to use an empty string to represent components without version information.
109+
// The component version. The version should ideally comply with semantic versioning but is not enforced. Version was made optional in v1.4 of the spec. For backward compatibility, it is recommended to use an empty string to represent components without version information.
110110
string version = 9;
111111
// Specifies a description for the component
112112
optional string description = 10;
@@ -139,7 +139,7 @@ message Component {
139139
optional ReleaseNotes releaseNotes = 24;
140140
// A model card describes the intended uses of a machine learning model, potential limitations, biases, ethical considerations, training parameters, datasets used to train the model, performance metrics, and other relevant data useful for ML transparency.
141141
optional ModelCard modelCard = 25;
142-
// This object SHOULD be specified for any component of type `data` and MUST NOT be specified for other component types.
142+
// This object SHOULD be specified for any component of type `data` and must not be specified for other component types.
143143
optional ComponentData data = 26;
144144
// Cryptographic assets have properties that uniquely define them and that make them actionable for further reasoning. As an example, it makes a difference if one knows the algorithm family (e.g. AES) or the specific variant or instantiation (e.g. AES-128-GCM). This is because the security level and the algorithm primitive (authenticated encryption) is only defined by the definition of the algorithm variant. The presence of a weak cryptographic algorithm like SHA1 vs. HMAC-SHA1 also makes a difference.
145145
optional CryptoProperties cryptoProperties = 27;
@@ -149,9 +149,9 @@ message Component {
149149
repeated OrganizationalContact authors = 29;
150150
// Textual strings that aid in discovery, search, and retrieval of the associated object. Tags often serve as a way to group or categorize similar or related objects by various attributes. Examples include "json-parser", "object-persistence", "text-to-image", "translation", and "object-detection".
151151
repeated string tags = 30;
152-
// Specifies the OmniBOR Artifact ID. The OmniBOR, if specified, MUST be valid and conform to the specification defined at: https://www.iana.org/assignments/uri-schemes/prov/gitoid
152+
// Specifies the OmniBOR Artifact ID. The OmniBOR, if specified, must be valid and conform to the specification defined at: https://www.iana.org/assignments/uri-schemes/prov/gitoid
153153
repeated string omniborId = 31;
154-
// Specifies the Software Heritage persistent identifier (SWHID). The SWHID, if specified, MUST be valid and conform to the specification defined at: https://docs.softwareheritage.org/devel/swh-model/persistent-identifiers.html
154+
// Specifies the Software Heritage persistent identifier (SWHID). The SWHID, if specified, must be valid and conform to the specification defined at: https://docs.softwareheritage.org/devel/swh-model/persistent-identifiers.html
155155
repeated string swhid = 32;
156156
}
157157

@@ -279,7 +279,7 @@ enum ExternalReferenceType {
279279
EXTERNAL_REFERENCE_TYPE_CODIFIED_INFRASTRUCTURE = 31;
280280
// A model card describes the intended uses of a machine learning model, potential limitations, biases, ethical considerations, training parameters, datasets used to train the model, performance metrics, and other relevant data useful for ML transparency.
281281
EXTERNAL_REFERENCE_TYPE_MODEL_CARD = 32;
282-
// Plans of Action and Milestones (POAM) complement an "attestation" external reference. POAM is defined by NIST as a "document that identifies tasks needing to be accomplished. It details resources required to accomplish the elements of the plan, any milestones in meeting the tasks and scheduled completion dates for the milestones".
282+
// Plans of Action and Milestones (POA&M) complement an "attestation" external reference. POA&M is defined by NIST as a "document that identifies tasks needing to be accomplished. It details resources required to accomplish the elements of the plan, any milestones in meeting the tasks and scheduled completion dates for the milestones".
283283
EXTERNAL_REFERENCE_TYPE_POAM = 33;
284284
// A record of events that occurred in a computer system or application, such as problems, errors, or information on current operations.
285285
EXTERNAL_REFERENCE_TYPE_LOG = 34;
@@ -375,11 +375,12 @@ message LicenseChoice {
375375
optional LicenseAcknowledgementEnumeration acknowledgement = 3;
376376
}
377377

378+
// Specifies the details and attributes related to a software license. It can either include a valid SPDX license identifier or a named license, along with additional properties such as license acknowledgment, comprehensive commercial licensing information, and the full text of the license.
378379
message License {
379380
oneof license {
380-
// A valid SPDX license ID
381+
// A valid SPDX license identifier. If specified, this value must be one of the enumeration of valid SPDX license identifiers defined in the spdx.schema.json (or spdx.xml) subschema which is synchronized with the official SPDX license list.
381382
string id = 1;
382-
// If SPDX does not define the license used, this field may be used to provide the license name
383+
// The name of the license. This may include the name of a commercial or proprietary license or an open source license that may not be defined by SPDX.
383384
string name = 2;
384385
}
385386
// Specifies the optional full text of the attachment
@@ -704,7 +705,7 @@ message Composition {
704705
repeated string dependencies = 3;
705706
// The bom-ref identifiers of the vulnerabilities being described.
706707
repeated string vulnerabilities = 4;
707-
// An optional identifier which can be used to reference the composition elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
708+
// An optional identifier which can be used to reference the composition elsewhere in the BOM. Every bom-ref must be unique within the BOM.
708709
optional string bom_ref = 5;
709710
}
710711

@@ -767,7 +768,7 @@ message EvidenceMethods {
767768
}
768769

769770
message EvidenceOccurrences {
770-
// An optional identifier which can be used to reference the occurrence elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
771+
// An optional identifier which can be used to reference the occurrence elsewhere in the BOM. Every bom-ref must be unique within the BOM.
771772
optional string bom_ref = 1;
772773
// The location or path to where the component was found.
773774
string location = 2;
@@ -818,7 +819,7 @@ message Note {
818819
}
819820

820821
message ReleaseNotes {
821-
// The software versioning type. It is RECOMMENDED that the release type use one of 'major', 'minor', 'patch', 'pre-release', or 'internal'. Representing all possible software release types is not practical, so standardizing on the recommended values, whenever possible, is strongly encouraged.
822+
// The software versioning type. It is recommended that the release type use one of 'major', 'minor', 'patch', 'pre-release', or 'internal'. Representing all possible software release types is not practical, so standardizing on the recommended values, whenever possible, is strongly encouraged.
822823
string type = 1;
823824
// The title of the release.
824825
optional string title = 2;
@@ -1072,7 +1073,7 @@ message AnnotatorChoice {
10721073
}
10731074

10741075
message Annotation {
1075-
// An optional identifier which can be used to reference the annotation elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
1076+
// An optional identifier which can be used to reference the annotation elsewhere in the BOM. Every bom-ref must be unique within the BOM.
10761077
optional string bom_ref = 1;
10771078
// The object in the BOM identified by its bom-ref. This is often a component or service but may be any object type supporting bom-refs.
10781079
repeated string subjects = 2;
@@ -1085,7 +1086,7 @@ message Annotation {
10851086
}
10861087

10871088
message ModelCard {
1088-
// An optional identifier which can be used to reference the model card elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
1089+
// An optional identifier which can be used to reference the model card elsewhere in the BOM. Every bom-ref must be unique within the BOM.
10891090
optional string bom_ref = 1;
10901091
// Hyper-parameters for construction of the model.
10911092
optional ModelParameters modelParameters = 2;
@@ -1302,7 +1303,7 @@ message CO2MeasureType {
13021303

13031304
// An address used to identify a contactable location.
13041305
message PostalAddressType {
1305-
// An optional identifier which can be used to reference the address elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
1306+
// An optional identifier which can be used to reference the address elsewhere in the BOM. Every bom-ref must be unique within the BOM.
13061307
optional string bom_ref = 1;
13071308
// The country name or the two-letter ISO 3166-1 country code.
13081309
optional string country = 2;
@@ -1333,7 +1334,7 @@ enum ModelParameterApproachType {
13331334
}
13341335

13351336
message ComponentData {
1336-
// An optional identifier which can be used to reference the dataset elsewhere in the BOM. Every bom-ref MUST be unique within the BOM.
1337+
// An optional identifier which can be used to reference the dataset elsewhere in the BOM. Every bom-ref must be unique within the BOM.
13371338
optional string bom_ref = 1;
13381339
// The general theme or subject matter of the data being specified.
13391340
ComponentDataType type = 2;
@@ -1401,7 +1402,7 @@ message GraphicsCollection {
14011402
message Graphic {
14021403
// The name of the graphic.
14031404
optional string name = 1;
1404-
// The graphic (vector or raster). Base64 encoding MUST be specified for binary images.
1405+
// The graphic (vector or raster). Base64 encoding must be specified for binary images.
14051406
optional AttachedText image = 2;
14061407
}
14071408
}
@@ -1592,7 +1593,7 @@ message Trigger {
15921593
TriggerType type = 7;
15931594
// The event data that caused the associated trigger to activate.
15941595
optional Event event = 8;
1595-
// Conditions
1596+
// A list of conditions used to determine if a trigger should be activated.
15961597
repeated Condition conditions = 9;
15971598
// The date and time (timestamp) when the trigger was activated.
15981599
optional google.protobuf.Timestamp timeActivated = 10;

schema/bom-1.6.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@
11611161
"contentType": {
11621162
"type": "string",
11631163
"title": "Content-Type",
1164-
"description": "Specifies the format and nature of the data being attached, helping systems correctly interpret and process the content. Common content type examples include `application/json` for JSON data and `text/plain` for plan text documents. [RFC 2045 section 5.1](https://www.ietf.org/rfc/rfc2045.html#section-5.1) outlines the structure and use of content types. For a comprehensive list of registered content types, refer to the [IANA media types registry](https://www.iana.org/assignments/media-types/media-types.xhtml).",
1164+
"description": "Specifies the format and nature of the data being attached, helping systems correctly interpret and process the content. Common content type examples include `application/json` for JSON data and `text/plain` for plan text documents.\n [RFC 2045 section 5.1](https://www.ietf.org/rfc/rfc2045.html#section-5.1) outlines the structure and use of content types. For a comprehensive list of registered content types, refer to the [IANA media types registry](https://www.iana.org/assignments/media-types/media-types.xhtml).",
11651165
"default": "text/plain",
11661166
"examples": [
11671167
"text/plain",

0 commit comments

Comments
 (0)