From ea5ff3c478c4b023fa6b67eecd8acbd7cc45c789 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Wed, 31 Jul 2024 12:29:43 +0100 Subject: [PATCH 01/14] Add serialization info + NamespaceMap info Use content from https://github.com/spdx/spdx-3-model/blob/main/serialization/README.md and revise to use standard terms like "may", "shall". Signed-off-by: Arthit Suriyawongkul --- docs/serializations.md | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/docs/serializations.md b/docs/serializations.md index a329e0fead..4dc64c7ccd 100644 --- a/docs/serializations.md +++ b/docs/serializations.md @@ -9,6 +9,7 @@ The data may be serialized in a variety of formats for storage and transmission. ## 4.2 RDF Serialization Since the data model is based on RDF, any SPDX data can be serialized in any of the multiple RDF serialization formats, including but not limited to: + - JSON-LD format as defined in [JSON-LD 1.1](https://www.w3.org/TR/json-ld11/); - Turtle (Terse RDF Triple Language) format as defined in [RDF 1.1 Turtle](https://www.w3.org/TR/turtle/); - N-Triples format as defined in [RDF 1.1 N-Triples](https://www.w3.org/TR/n-triples/); and @@ -33,4 +34,28 @@ Canonical serialization is in JSON format, as defined in RFC 8259 (IETF STD 90), - integers: represented in base 10 using decimal digits. This designates an integer component that may be prefixed with an optional minus sign. Leading zeros are not allowed. - strings: UTF-8 representation without specific canonicalisation. A string begins and ends with quotation marks (%x22). Any Unicode characters may be placed within the quotation marks, except for the two characters that MUST be escaped by a reverse solidus: quotation mark, reverse solidus, and the control characters (U+0000 through U+001F). - arrays: An array structure is represented as square brackets surrounding zero or more items. Items are separated by commas. -- objects: An object structure is represented as a pair of curly brackets surrounding zero or more name/value pairs (or members). A name is a string containing only ASCII characters (0x21-0x7F). The names within an object must be unique. A single colon comes after each name, separating the name from the value. A single comma separates a value from a following name. The name/value pairs are ordered by name. \ No newline at end of file +- objects: An object structure is represented as a pair of curly brackets surrounding zero or more name/value pairs (or members). A name is a string containing only ASCII characters (0x21-0x7F). The names within an object must be unique. A single colon comes after each name, separating the name from the value. A single comma separates a value from a following name. The name/value pairs are ordered by name. + +## 4.4 Serialization information + +A collection of elements may be serialized in multiple formats. + +An SpdxDocument element represents the common properties of a collection of +elements across all serialization data formats within the model. + +The actual serialized bytes is represented by an Artifact element within the +model. + +A Relationship of type `serializedInArtifact` links an SpdxDocument to one or +more serialized forms of itself. + +When serializing an SpdxDocument, properties of the logical element that can be +represented using native mechanisms of the specific serialization format +(e.g., @context prefixes in JSON-LD in place of namespaceMap) shall use these +mechanisms. Remaining properties shall be serialized within the “XCollection” +element. + +A serialization shall contain at most one SpdxDocument. + +A given instance of serialization shall define at most one SpdxDocument +element. From d1a84835f0458316524732428d1c8e9a881adbe7 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Wed, 31 Jul 2024 12:58:35 +0100 Subject: [PATCH 02/14] Update serializations.md Signed-off-by: Arthit Suriyawongkul --- docs/serializations.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/serializations.md b/docs/serializations.md index 4dc64c7ccd..54813dc2dc 100644 --- a/docs/serializations.md +++ b/docs/serializations.md @@ -9,7 +9,6 @@ The data may be serialized in a variety of formats for storage and transmission. ## 4.2 RDF Serialization Since the data model is based on RDF, any SPDX data can be serialized in any of the multiple RDF serialization formats, including but not limited to: - - JSON-LD format as defined in [JSON-LD 1.1](https://www.w3.org/TR/json-ld11/); - Turtle (Terse RDF Triple Language) format as defined in [RDF 1.1 Turtle](https://www.w3.org/TR/turtle/); - N-Triples format as defined in [RDF 1.1 N-Triples](https://www.w3.org/TR/n-triples/); and @@ -46,7 +45,7 @@ elements across all serialization data formats within the model. The actual serialized bytes is represented by an Artifact element within the model. -A Relationship of type `serializedInArtifact` links an SpdxDocument to one or +A Relationship of type serializedInArtifact links an SpdxDocument to one or more serialized forms of itself. When serializing an SpdxDocument, properties of the logical element that can be From d35348a32dce1338253668e6c95e9c5b9b64bcba Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Wed, 31 Jul 2024 20:51:59 +0100 Subject: [PATCH 03/14] XCollection -> SpdxDocument Signed-off-by: Arthit Suriyawongkul --- docs/serializations.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/serializations.md b/docs/serializations.md index 54813dc2dc..d913fa77d6 100644 --- a/docs/serializations.md +++ b/docs/serializations.md @@ -48,11 +48,11 @@ model. A Relationship of type serializedInArtifact links an SpdxDocument to one or more serialized forms of itself. -When serializing an SpdxDocument, properties of the logical element that can be -represented using native mechanisms of the specific serialization format -(e.g., @context prefixes in JSON-LD in place of namespaceMap) shall use these -mechanisms. Remaining properties shall be serialized within the “XCollection” -element. +When serializing a physical SpdxDocument, any property of the logical element +that can be natively represented within the chosen serialization format +(e.g., @context prefixes in JSON-LD instead of the namespaceMap) shall utilize +these native mechanisms. All remaining properties shall be serialized within +the SpdxDocument element itself. A serialization shall contain at most one SpdxDocument. From 57fd00c92527f49edad7ff39e96605068e7b7969 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Wed, 7 Aug 2024 15:39:36 +0100 Subject: [PATCH 04/14] Update docs/serializations.md Thank you @maxhbr Co-authored-by: Maximilian Huber Signed-off-by: Arthit Suriyawongkul --- docs/serializations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/serializations.md b/docs/serializations.md index d913fa77d6..216edf6f0e 100644 --- a/docs/serializations.md +++ b/docs/serializations.md @@ -54,7 +54,7 @@ that can be natively represented within the chosen serialization format these native mechanisms. All remaining properties shall be serialized within the SpdxDocument element itself. -A serialization shall contain at most one SpdxDocument. +A serialization must not contain more than one SpdxDocument. A given instance of serialization shall define at most one SpdxDocument element. From 03b25021b0629ac97b09758f73822bdfaa580148 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Wed, 7 Aug 2024 15:48:27 +0100 Subject: [PATCH 05/14] shall..at most -> must not..more than Signed-off-by: Arthit Suriyawongkul --- docs/serializations.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/serializations.md b/docs/serializations.md index 216edf6f0e..3f57380610 100644 --- a/docs/serializations.md +++ b/docs/serializations.md @@ -9,6 +9,7 @@ The data may be serialized in a variety of formats for storage and transmission. ## 4.2 RDF Serialization Since the data model is based on RDF, any SPDX data can be serialized in any of the multiple RDF serialization formats, including but not limited to: + - JSON-LD format as defined in [JSON-LD 1.1](https://www.w3.org/TR/json-ld11/); - Turtle (Terse RDF Triple Language) format as defined in [RDF 1.1 Turtle](https://www.w3.org/TR/turtle/); - N-Triples format as defined in [RDF 1.1 N-Triples](https://www.w3.org/TR/n-triples/); and @@ -56,5 +57,5 @@ the SpdxDocument element itself. A serialization must not contain more than one SpdxDocument. -A given instance of serialization shall define at most one SpdxDocument +A given instance of serialization must not define more than one SpdxDocument element. From 898b42f6776fddf244ca47619a1dae2ee1343b27 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Wed, 7 Aug 2024 16:13:45 +0100 Subject: [PATCH 06/14] Native mechanism: shall -> may Signed-off-by: Arthit Suriyawongkul Co-Authored-By: Alexios Zavras (zvr) <136705+zvr@users.noreply.github.com> --- docs/serializations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/serializations.md b/docs/serializations.md index 3f57380610..a427eaaf74 100644 --- a/docs/serializations.md +++ b/docs/serializations.md @@ -51,7 +51,7 @@ more serialized forms of itself. When serializing a physical SpdxDocument, any property of the logical element that can be natively represented within the chosen serialization format -(e.g., @context prefixes in JSON-LD instead of the namespaceMap) shall utilize +(e.g., @context prefixes in JSON-LD instead of the namespaceMap) may utilize these native mechanisms. All remaining properties shall be serialized within the SpdxDocument element itself. From 7e36bc6fe495cd86f2bcff8d664c1094d72e43b4 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Thu, 8 Aug 2024 17:06:33 +0100 Subject: [PATCH 07/14] Update docs/serializations.md Co-authored-by: Alexios Zavras (zvr) Signed-off-by: Arthit Suriyawongkul --- docs/serializations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/serializations.md b/docs/serializations.md index a427eaaf74..1611db83f2 100644 --- a/docs/serializations.md +++ b/docs/serializations.md @@ -40,7 +40,7 @@ Canonical serialization is in JSON format, as defined in RFC 8259 (IETF STD 90), A collection of elements may be serialized in multiple formats. -An SpdxDocument element represents the common properties of a collection of +An SpdxDocument element represents a collection of elements across all serialization data formats within the model. The actual serialized bytes is represented by an Artifact element within the From 6a33cc6bfd13ae6f75b5f6e188b304dd322a1495 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Thu, 8 Aug 2024 17:10:27 +0100 Subject: [PATCH 08/14] Add anchors for section ref Signed-off-by: Arthit Suriyawongkul --- docs/serializations.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/serializations.md b/docs/serializations.md index 1611db83f2..480c6156e1 100644 --- a/docs/serializations.md +++ b/docs/serializations.md @@ -1,12 +1,12 @@ # 4 Model and serializations -## 4.1 Overview +## 4.1 Overview This specification defines the data model of the SPDX standard, describing every piece of information about systems with software components. The data model is based on the Resource Description Framework (RDF) extensible knowledge representation data model, which provides a flexible and extensible way to represent and exchange information. The data may be serialized in a variety of formats for storage and transmission. -## 4.2 RDF Serialization +## 4.2 RDF Serialization Since the data model is based on RDF, any SPDX data can be serialized in any of the multiple RDF serialization formats, including but not limited to: @@ -17,7 +17,7 @@ Since the data model is based on RDF, any SPDX data can be serialized in any of The SPDX specification is accompanied by a [JSON-LD context](https://www.w3.org/TR/json-ld11/#the-context) definition file that can be used to serialize SPDX in a much simpler and more human-readable JSON-LD format. -## 4.3 Canonical serialization +## 4.3 Canonical serialization Canonical serialization is single, consistent, normalized, deterministic, and reproducible form. @@ -36,7 +36,7 @@ Canonical serialization is in JSON format, as defined in RFC 8259 (IETF STD 90), - arrays: An array structure is represented as square brackets surrounding zero or more items. Items are separated by commas. - objects: An object structure is represented as a pair of curly brackets surrounding zero or more name/value pairs (or members). A name is a string containing only ASCII characters (0x21-0x7F). The names within an object must be unique. A single colon comes after each name, separating the name from the value. A single comma separates a value from a following name. The name/value pairs are ordered by name. -## 4.4 Serialization information +## 4.4 Serialization information A collection of elements may be serialized in multiple formats. From fc057f2bf4d4c36577303122161c1d69ae0b9b98 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sun, 4 Aug 2024 14:29:09 -0700 Subject: [PATCH 09/14] Additional migration documentation for relationship types Rather than removing support for the SPDX 2.X relationships, it looks like we can just reverse the direction and use one of the SPDX 3.X relationship types. Signed-off-by: Gary O'Neall --- docs/annexes/diffs-from-previous-editions.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/annexes/diffs-from-previous-editions.md b/docs/annexes/diffs-from-previous-editions.md index ddf213b8c5..48d467e939 100644 --- a/docs/annexes/diffs-from-previous-editions.md +++ b/docs/annexes/diffs-from-previous-editions.md @@ -222,10 +222,10 @@ Relationship migration is being worked out in the relationships spreadsheet. On | COPY_OF | copiedTo | | | | DATA_FILE_OF | hasDataFile | | | | DEPENDENCY_MANIFEST_OF | hasDependencyManifest | | | -| ~~DEPENDENCY_OF~~ | [removed] | | | +| DEPENDENCY_OF | dependsOn | Y | | | DEPENDS_ON | dependsOn | | various LifecycleScopeType | | DESCENDANT_OF | decendentOf | | | -| ~~DESCRIBED_BY~~ | [removed] | | | +| DESCRIBED_BY | describes | Y | | | DESCRIBES | describes | | | | DEV_DEPENDENCY_OF | dependsOn | | development | | DEV_TOOL_OF | usesTool | | development | @@ -245,8 +245,9 @@ Relationship migration is being worked out in the relationships spreadsheet. On | OPTIONAL_DEPENDENCY_OF | hasOptionalDependency | | lifecycle scope | | OTHER | other | | | | PACKAGE_OF | packagedBy | | | -| ~~PATCH_FOR~~ | [removed] | | | -| ~~PREREQUISITE_FOR~~ | [removed] | | | +| PATCH_FOR | patchedBy | Y | | +| PATCH_APPLIED | patchedBy | | | +| PREREQUISITE_FOR | hasPrerequisite | Y | | | PROVIDED_DEPENDENCY_OF | hasProvidedDependency | | lifecycle scope | | REQUIREMENT_DESCRIPTION_FOR | hasRequirement | | lifecycle scope | | RUNTIME_DEPENDENCY_OF | dependsOn | | runtime | From ce64a6fcdcb83020ac4e2e67424b07b5350caa14 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Mon, 5 Aug 2024 08:03:41 -0700 Subject: [PATCH 10/14] Fix spelling of hasPrerequisite Signed-off-by: Gary O'Neall --- docs/annexes/diffs-from-previous-editions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/annexes/diffs-from-previous-editions.md b/docs/annexes/diffs-from-previous-editions.md index 48d467e939..6326f8af29 100644 --- a/docs/annexes/diffs-from-previous-editions.md +++ b/docs/annexes/diffs-from-previous-editions.md @@ -239,7 +239,7 @@ Relationship migration is being worked out in the relationships spreadsheet. On | FILE_MODIFIED | modifiedBy | | | | GENERATED_FROM | generates | Y | | | GENERATES | generates | | | -| HAS_PREREQUISITE | hasPrequisite | | lifecycle scope | +| HAS_PREREQUISITE | hasPrerequisite | | lifecycle scope | | METAFILE_OF | hasMetadata | | | | OPTIONAL_COMPONENT_OF | hasOptionalComponent | | | | OPTIONAL_DEPENDENCY_OF | hasOptionalDependency | | lifecycle scope | From c53814410027ef1b6b4aff2833c5f6564ee230e3 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Mon, 5 Aug 2024 18:41:25 +0100 Subject: [PATCH 11/14] Update direction in relationshipType translation table Signed-off-by: Arthit Suriyawongkul Signed-off-by: Arthit Suriyawongkul --- docs/annexes/diffs-from-previous-editions.md | 56 ++++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/annexes/diffs-from-previous-editions.md b/docs/annexes/diffs-from-previous-editions.md index 6326f8af29..5323401197 100644 --- a/docs/annexes/diffs-from-previous-editions.md +++ b/docs/annexes/diffs-from-previous-editions.md @@ -215,49 +215,49 @@ Relationship migration is being worked out in the relationships spreadsheet. On |----------------------------|----------------------------|-------------------|--------------------| | AMENDS | amendedBy | Y | | | ANCESTOR_OF | ancestorOf | | | -| BUILD_DEPENDENCY_OF | dependsOn | | build | -| BUILD_TOOL_OF | usesTool | | build (all lifecycle scope could be appropriate) | +| BUILD_DEPENDENCY_OF | dependsOn | Y | build | +| BUILD_TOOL_OF | usesTool | Y | build | | CONTAINED_BY | contains | Y | | | CONTAINS | contains | | | -| COPY_OF | copiedTo | | | -| DATA_FILE_OF | hasDataFile | | | -| DEPENDENCY_MANIFEST_OF | hasDependencyManifest | | | +| COPY_OF | copiedTo | Y | | +| DATA_FILE_OF | hasDataFile | Y | | +| DEPENDENCY_MANIFEST_OF | hasDependencyManifest | Y | | | DEPENDENCY_OF | dependsOn | Y | | -| DEPENDS_ON | dependsOn | | various LifecycleScopeType | +| DEPENDS_ON | dependsOn | | | | DESCENDANT_OF | decendentOf | | | | DESCRIBED_BY | describes | Y | | | DESCRIBES | describes | | | -| DEV_DEPENDENCY_OF | dependsOn | | development | -| DEV_TOOL_OF | usesTool | | development | +| DEV_DEPENDENCY_OF | dependsOn | Y | development | +| DEV_TOOL_OF | usesTool | Y | development | | DISTRIBUTION_ARTIFACT | hasDistributionArtifact | | | -| DOCUMENTATION_OF | hasDocumentation | | | -| DYNAMIC_LINK | hasDynamicLink | | build, runtime | -| EXAMPLE_OF | hasExample | | | -| EXPANDED_FROM_ARCHIVE | expandsTo | | | -| FILE_ADDED | hasAddedFile | | | -| FILE_DELETED | hasDeletedFile | | | +| DOCUMENTATION_OF | hasDocumentation | Y | | +| DYNAMIC_LINK | hasDynamicLink | Y | build, runtime | +| EXAMPLE_OF | hasExample | Y | | +| EXPANDED_FROM_ARCHIVE | expandsTo | Y | | +| FILE_ADDED | hasAddedFile | Y | | +| FILE_DELETED | hasDeletedFile | Y | | | FILE_MODIFIED | modifiedBy | | | | GENERATED_FROM | generates | Y | | | GENERATES | generates | | | | HAS_PREREQUISITE | hasPrerequisite | | lifecycle scope | -| METAFILE_OF | hasMetadata | | | -| OPTIONAL_COMPONENT_OF | hasOptionalComponent | | | -| OPTIONAL_DEPENDENCY_OF | hasOptionalDependency | | lifecycle scope | +| METAFILE_OF | hasMetadata | Y | | +| OPTIONAL_COMPONENT_OF | hasOptionalComponent | Y | | +| OPTIONAL_DEPENDENCY_OF | hasOptionalDependency | Y | lifecycle scope | | OTHER | other | | | -| PACKAGE_OF | packagedBy | | | +| PACKAGE_OF | packagedBy | Y | | | PATCH_FOR | patchedBy | Y | | -| PATCH_APPLIED | patchedBy | | | +| PATCH_APPLIED | patchedBy | Y | | | PREREQUISITE_FOR | hasPrerequisite | Y | | -| PROVIDED_DEPENDENCY_OF | hasProvidedDependency | | lifecycle scope | -| REQUIREMENT_DESCRIPTION_FOR | hasRequirement | | lifecycle scope | -| RUNTIME_DEPENDENCY_OF | dependsOn | | runtime | -| SPECIFICATION_FOR | hasSpecification | | lifecycle scope | +| PROVIDED_DEPENDENCY_OF | hasProvidedDependency | Y | lifecycle scope | +| REQUIREMENT_DESCRIPTION_FOR | hasRequirement | Y | lifecycle scope | +| RUNTIME_DEPENDENCY_OF | dependsOn | Y | runtime | +| SPECIFICATION_FOR | hasSpecification | Y | lifecycle scope | | STATIC_LINK | hasStaticLink | | lifecycle scope | -| TEST_CASE_OF | hasTestCase | | | -| TEST_DEPENDENCY_OF | dependsOn | | test | -| TEST_OF | hasTest | | lifecycle scope | -| TEST_TOOL_OF | usesTool | | test | -| VARIANT_OF | hasVarient | | | +| TEST_CASE_OF | hasTestCase | Y | | +| TEST_DEPENDENCY_OF | dependsOn | Y | test | +| TEST_OF | hasTest | Y | lifecycle scope | +| TEST_TOOL_OF | usesTool | Y | test | +| VARIANT_OF | hasVarient | Y | | ##### Rationale From a48aff2dccbd3af7251474e6d0af18d656714b55 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Mon, 5 Aug 2024 19:01:47 +0100 Subject: [PATCH 12/14] Fix typo: descendantOf, hasVariant Signed-off-by: Arthit Suriyawongkul --- docs/annexes/diffs-from-previous-editions.md | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/annexes/diffs-from-previous-editions.md b/docs/annexes/diffs-from-previous-editions.md index 5323401197..e7471fcf39 100644 --- a/docs/annexes/diffs-from-previous-editions.md +++ b/docs/annexes/diffs-from-previous-editions.md @@ -222,9 +222,9 @@ Relationship migration is being worked out in the relationships spreadsheet. On | COPY_OF | copiedTo | Y | | | DATA_FILE_OF | hasDataFile | Y | | | DEPENDENCY_MANIFEST_OF | hasDependencyManifest | Y | | -| DEPENDENCY_OF | dependsOn | Y | | -| DEPENDS_ON | dependsOn | | | -| DESCENDANT_OF | decendentOf | | | +| DEPENDENCY_OF | dependsOn | Y | various lifecycle scope | +| DEPENDS_ON | dependsOn | | various lifecycle scope | +| DESCENDANT_OF | descendantOf | | | | DESCRIBED_BY | describes | Y | | | DESCRIBES | describes | | | | DEV_DEPENDENCY_OF | dependsOn | Y | development | @@ -239,25 +239,25 @@ Relationship migration is being worked out in the relationships spreadsheet. On | FILE_MODIFIED | modifiedBy | | | | GENERATED_FROM | generates | Y | | | GENERATES | generates | | | -| HAS_PREREQUISITE | hasPrerequisite | | lifecycle scope | +| HAS_PREREQUISITE | hasPrerequisite | | various lifecycle scope | | METAFILE_OF | hasMetadata | Y | | | OPTIONAL_COMPONENT_OF | hasOptionalComponent | Y | | -| OPTIONAL_DEPENDENCY_OF | hasOptionalDependency | Y | lifecycle scope | +| OPTIONAL_DEPENDENCY_OF | hasOptionalDependency | Y | various lifecycle scope | | OTHER | other | | | | PACKAGE_OF | packagedBy | Y | | | PATCH_FOR | patchedBy | Y | | | PATCH_APPLIED | patchedBy | Y | | -| PREREQUISITE_FOR | hasPrerequisite | Y | | -| PROVIDED_DEPENDENCY_OF | hasProvidedDependency | Y | lifecycle scope | -| REQUIREMENT_DESCRIPTION_FOR | hasRequirement | Y | lifecycle scope | +| PREREQUISITE_FOR | hasPrerequisite | Y | various lifecycle scope | +| PROVIDED_DEPENDENCY_OF | hasProvidedDependency | Y | various lifecycle scope | +| REQUIREMENT_DESCRIPTION_FOR | hasRequirement | Y | various lifecycle scope | | RUNTIME_DEPENDENCY_OF | dependsOn | Y | runtime | -| SPECIFICATION_FOR | hasSpecification | Y | lifecycle scope | -| STATIC_LINK | hasStaticLink | | lifecycle scope | +| SPECIFICATION_FOR | hasSpecification | Y | various lifecycle scope | +| STATIC_LINK | hasStaticLink | | various lifecycle scope | | TEST_CASE_OF | hasTestCase | Y | | | TEST_DEPENDENCY_OF | dependsOn | Y | test | | TEST_OF | hasTest | Y | lifecycle scope | | TEST_TOOL_OF | usesTool | Y | test | -| VARIANT_OF | hasVarient | Y | | +| VARIANT_OF | hasVariant | Y | | ##### Rationale From 6f78896ad4c300434d8ed781b3315e57743bd257 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Mon, 5 Aug 2024 19:18:47 +0100 Subject: [PATCH 13/14] Remove "todo" notes Signed-off-by: Arthit Suriyawongkul --- docs/annexes/diffs-from-previous-editions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/annexes/diffs-from-previous-editions.md b/docs/annexes/diffs-from-previous-editions.md index e7471fcf39..d0f710d35a 100644 --- a/docs/annexes/diffs-from-previous-editions.md +++ b/docs/annexes/diffs-from-previous-editions.md @@ -209,7 +209,7 @@ The completeness property would be constructed based on the following: - “to” value is NOASSERTION: noAssertion - “to” value is an SPDX element: No value for the completeness - uses the default -Relationship migration is being worked out in the relationships spreadsheet. Once completed, the following table will reflect the translation for relationship types from SPDX 2.3 to SPDX 3.0: +The following table reflects the translation for relationship types from SPDX 2.3 to SPDX 3.0: | SPDX 2.3 Relationship Type | SPDX 3.0 Relationship Type | Swap to and from? | LifecycleScopeType | |----------------------------|----------------------------|-------------------|--------------------| From 529433cd1ffece77731f9d1b9e715f69d54bd959 Mon Sep 17 00:00:00 2001 From: Kate Stewart <13152682+kestewart@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:33:48 -0500 Subject: [PATCH 14/14] Update docs/annexes/diffs-from-previous-editions.md Co-authored-by: Arthit Suriyawongkul Signed-off-by: Kate Stewart <13152682+kestewart@users.noreply.github.com> --- docs/annexes/diffs-from-previous-editions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/annexes/diffs-from-previous-editions.md b/docs/annexes/diffs-from-previous-editions.md index d0f710d35a..0d8e4582d6 100644 --- a/docs/annexes/diffs-from-previous-editions.md +++ b/docs/annexes/diffs-from-previous-editions.md @@ -255,7 +255,7 @@ The following table reflects the translation for relationship types from SPDX 2. | STATIC_LINK | hasStaticLink | | various lifecycle scope | | TEST_CASE_OF | hasTestCase | Y | | | TEST_DEPENDENCY_OF | dependsOn | Y | test | -| TEST_OF | hasTest | Y | lifecycle scope | +| TEST_OF | hasTest | Y | various lifecycle scope | | TEST_TOOL_OF | usesTool | Y | test | | VARIANT_OF | hasVariant | Y | |