Merge branch 'spdx:development/v3.0.1' into update-contributing-3.0.1

docs/annexes/RDF-object-model-and-identifier-syntax.md

@@ -1,23 +1,38 @@
 # Annex B: RDF object model and identifier syntax (Normative)
 
-TODO: update for SPDXv3
-
 ## B.1 Introduction <a name="B.1"></a>
 
-SPDX ® Vocabulary Specification
+SPDX ® Vocabulary Specification Version: 3.0.1
 
 [SPDX 3.0.1 Model SHACL](https://spdx.org/rdf/3.0.1/spdx-model.ttl)
 
-Version: 3.0.1
+### Core and Software Profiles
+
+[![SPDX 3.0 Core and Software Profiles diagram][fig_core_software]][fig_core_software]
+
+### AI Profile
+
+[![SPDX 3.0 AI Profile diagram][fig_ai]][fig_ai]
+
+### Build Profile
+
+[![SPDX 3.0 Build Profile diagram][fig_build]][fig_build]
+
+### Dataset Profile
 
-![SPDX 3.0.1 Core and Software models diagram](../images/model Core+Software.png)
+[![SPDX 3.0 Dataset Profile diagram][fig_dataset]][fig_dataset]
 
-![SPDX 3.0.1 Dataset model diagram](../images/model Dataset.png)
+### Licensing Profile
 
-![SPDX 3.0.1 AI model diagram](../images/model AI.png)
+[![SPDX 3.0 Licensing Profile diagram][fig_licensing]][fig_licensing]
 
-![SPDX 3.0.1 Build model diagram](../images/model Build.png)
+### Security Profile
 
-![SPDX 3.0.1 Licensing model diagram](../images/model Licensing.png)
+[![SPDX 3.0 Security Profile diagram][fig_security]][fig_security]
 
-![SPDX 3.0.1 Security model diagram](../images/model Security.png)
+[fig_core_software]: ../images/model-core-software.png "SPDX 3.0 Core and Software Profiles diagram"
+[fig_ai]: ../images/model-ai.png "SPDX 3.0 AI Profile diagram"
+[fig_build]: ../images/model-build.png "SPDX 3.0 Build Profile diagram"
+[fig_dataset]: ../images/model-dataset.png "SPDX 3.0 Dataset Profile diagram"
+[fig_licensing]: ../images/model-licensing.png "SPDX 3.0 Licensing Profile diagram"
+[fig_security]: ../images/model-security.png "SPDX 3.0 Security Profile diagram"

docs/annexes/diffs-from-previous-editions.md

@@ -2,6 +2,12 @@
 
 ## A.1 Differences between V3.0 and V2.3 <a name="A.1"></a>
 
+### SPDX meaning
+
+In previous editions of the specification, SPDX meant "Software Package Data Exchange".
+
+Starting with V3.0, the scope of SPDX has expanded beyond software and now means "System Package Data Exchange".
+
 ### Structural Differences
 
 These are the most significant breaking changes requiring a change in logic to handle a different model or structure for the information.  Each structural difference will describe the change, describe an approach to translate from 2.3 to 3.0, and provide a rationale for the change.
@@ -209,54 +215,55 @@ 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 |
 |----------------------------|----------------------------|-------------------|--------------------|
 | 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 | | |
-| ~~DEPENDENCY_OF~~ | [removed] | | |
-| DEPENDS_ON | dependsOn | | various LifecycleScopeType |
-| DESCENDANT_OF | decendentOf | | |
-| ~~DESCRIBED_BY~~ | [removed] | | |
+| COPY_OF | copiedTo | Y | |
+| DATA_FILE_OF | hasDataFile | Y | |
+| DEPENDENCY_MANIFEST_OF | hasDependencyManifest | Y | |
+| 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 | | 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 | hasPrequisite | | lifecycle scope |
-| METAFILE_OF | hasMetadata | | |
-| OPTIONAL_COMPONENT_OF | hasOptionalComponent | | |
-| OPTIONAL_DEPENDENCY_OF | hasOptionalDependency | | lifecycle scope |
+| HAS_PREREQUISITE | hasPrerequisite | | various lifecycle scope |
+| METAFILE_OF | hasMetadata | Y | |
+| OPTIONAL_COMPONENT_OF | hasOptionalComponent | Y | |
+| OPTIONAL_DEPENDENCY_OF | hasOptionalDependency | Y | various lifecycle scope |
 | OTHER | other | | |
-| PACKAGE_OF | packagedBy | | |
-| ~~PATCH_FOR~~ | [removed] | | |
-| ~~PREREQUISITE_FOR~~ | [removed] | | |
-| PROVIDED_DEPENDENCY_OF | hasProvidedDependency | | lifecycle scope |
-| REQUIREMENT_DESCRIPTION_FOR | hasRequirement | | lifecycle scope |
-| RUNTIME_DEPENDENCY_OF | dependsOn | | runtime |
-| SPECIFICATION_FOR | hasSpecification | | 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 | | |
+| PACKAGE_OF | packagedBy | Y | |
+| PATCH_FOR | patchedBy | Y | |
+| PATCH_APPLIED | patchedBy | Y | |
+| 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 | various lifecycle scope |
+| STATIC_LINK | hasStaticLink | | various lifecycle scope |
+| TEST_CASE_OF | hasTestCase | Y | |
+| TEST_DEPENDENCY_OF | dependsOn | Y | test |
+| TEST_OF | hasTest | Y | various lifecycle scope |
+| TEST_TOOL_OF | usesTool | Y | test |
+| VARIANT_OF | hasVariant | Y | |
 
 ##### Rationale