From e22ac52740c8ceb57513803a8b59b17c4fc522ab Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Thu, 11 Jul 2024 00:55:04 +0100 Subject: [PATCH 1/3] Resolve conflicts Signed-off-by: Arthit Suriyawongkul --- .../RDF-object-model-and-identifier-syntax.md | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/docs/annexes/RDF-object-model-and-identifier-syntax.md b/docs/annexes/RDF-object-model-and-identifier-syntax.md index e2a8273f29..ca03123aa7 100644 --- a/docs/annexes/RDF-object-model-and-identifier-syntax.md +++ b/docs/annexes/RDF-object-model-and-identifier-syntax.md @@ -10,14 +10,33 @@ SPDX ® Vocabulary Specification Version: 3.0.1 -![SPDX 3.0.1 Core and Software models diagram](../images/model Core+Software.png) +### Core and Software Profiles -![SPDX 3.0.1 Dataset model diagram](../images/model Dataset.png) +![SPDX 3.0 Core and Software Profiles diagram][fig_Core_Software] -![SPDX 3.0.1 AI model diagram](../images/model AI.png) +### AI Profile -![SPDX 3.0.1 Build model diagram](../images/model Build.png) +![SPDX 3.0 AI Profile diagram][fig_AI] -![SPDX 3.0.1 Licensing model diagram](../images/model Licensing.png) +### Build Profile -![SPDX 3.0.1 Security model diagram](../images/model Security.png) +![SPDX 3.0 Build Profile diagram][fig_Build] + +### Dataset Profile + +![SPDX 3.0 Dataset Profile diagram][fig_Dataset] + +### Licensing Profile + +![SPDX 3.0 Licensing Profile diagram][fig_Licensing] + +### Security Profile + +![SPDX 3.0 Security Profile diagram][fig_Security] + +[fig_Core_Software]: ../images/model%20Core+Software.png "SPDX 3.0 Core and Software Profiles diagram" +[fig_Dataset]: ../images/model%20Dataset.png "SPDX 3.0 Dataset Profile diagram" +[fig_AI]: ../images/model%20AI.png "SPDX 3.0 AI Profile diagram" +[fig_Build]: ../images/model%20Build.png "SPDX 3.0 Build Profile diagram" +[fig_Licensing]: ../images/model%20Licensing.png "SPDX 3.0 Licensing Profile diagram" +[fig_Security]: ../images/model%20Security.png "SPDX 3.0 Security Profile diagram" From b6aceb3aed3cc30baf793110c803ad2071094d91 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Fri, 9 Aug 2024 20:05:43 +0100 Subject: [PATCH 2/3] Remove "TODO" Signed-off-by: Arthit Suriyawongkul --- docs/annexes/RDF-object-model-and-identifier-syntax.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/annexes/RDF-object-model-and-identifier-syntax.md b/docs/annexes/RDF-object-model-and-identifier-syntax.md index ca03123aa7..1671aeacde 100644 --- a/docs/annexes/RDF-object-model-and-identifier-syntax.md +++ b/docs/annexes/RDF-object-model-and-identifier-syntax.md @@ -1,7 +1,5 @@ # Annex B: RDF object model and identifier syntax (Normative) -TODO: update for SPDXv3 - ## B.1 Introduction SPDX ® Vocabulary Specification From 001f4673ff960fb58d37649c08a444160556bebb Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Fri, 9 Aug 2024 22:49:41 +0100 Subject: [PATCH 3/3] Make images clickable to see full size Signed-off-by: Arthit Suriyawongkul --- .../RDF-object-model-and-identifier-syntax.md | 28 ++++++++---------- docs/images/{model AI.png => model-ai.png} | Bin .../{model Build.png => model-build.png} | Bin ...e+Software.png => model-core-software.png} | Bin .../{model Dataset.png => model-dataset.png} | Bin ...odel Extension.png => model-extension.png} | Bin ...odel Licensing.png => model-licensing.png} | Bin ...{model Security.png => model-security.png} | Bin 8 files changed, 13 insertions(+), 15 deletions(-) rename docs/images/{model AI.png => model-ai.png} (100%) rename docs/images/{model Build.png => model-build.png} (100%) rename docs/images/{model Core+Software.png => model-core-software.png} (100%) rename docs/images/{model Dataset.png => model-dataset.png} (100%) rename docs/images/{model Extension.png => model-extension.png} (100%) rename docs/images/{model Licensing.png => model-licensing.png} (100%) rename docs/images/{model Security.png => model-security.png} (100%) diff --git a/docs/annexes/RDF-object-model-and-identifier-syntax.md b/docs/annexes/RDF-object-model-and-identifier-syntax.md index 1671aeacde..d6d6d41516 100644 --- a/docs/annexes/RDF-object-model-and-identifier-syntax.md +++ b/docs/annexes/RDF-object-model-and-identifier-syntax.md @@ -2,39 +2,37 @@ ## B.1 Introduction -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] +[![SPDX 3.0 Core and Software Profiles diagram][fig_core_software]][fig_core_software] ### AI Profile -![SPDX 3.0 AI Profile diagram][fig_AI] +[![SPDX 3.0 AI Profile diagram][fig_ai]][fig_ai] ### Build Profile -![SPDX 3.0 Build Profile diagram][fig_Build] +[![SPDX 3.0 Build Profile diagram][fig_build]][fig_build] ### Dataset Profile -![SPDX 3.0 Dataset Profile diagram][fig_Dataset] +[![SPDX 3.0 Dataset Profile diagram][fig_dataset]][fig_dataset] ### Licensing Profile -![SPDX 3.0 Licensing Profile diagram][fig_Licensing] +[![SPDX 3.0 Licensing Profile diagram][fig_licensing]][fig_licensing] ### Security Profile -![SPDX 3.0 Security Profile diagram][fig_Security] +[![SPDX 3.0 Security Profile diagram][fig_security]][fig_security] -[fig_Core_Software]: ../images/model%20Core+Software.png "SPDX 3.0 Core and Software Profiles diagram" -[fig_Dataset]: ../images/model%20Dataset.png "SPDX 3.0 Dataset Profile diagram" -[fig_AI]: ../images/model%20AI.png "SPDX 3.0 AI Profile diagram" -[fig_Build]: ../images/model%20Build.png "SPDX 3.0 Build Profile diagram" -[fig_Licensing]: ../images/model%20Licensing.png "SPDX 3.0 Licensing Profile diagram" -[fig_Security]: ../images/model%20Security.png "SPDX 3.0 Security Profile diagram" +[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" diff --git a/docs/images/model AI.png b/docs/images/model-ai.png similarity index 100% rename from docs/images/model AI.png rename to docs/images/model-ai.png diff --git a/docs/images/model Build.png b/docs/images/model-build.png similarity index 100% rename from docs/images/model Build.png rename to docs/images/model-build.png diff --git a/docs/images/model Core+Software.png b/docs/images/model-core-software.png similarity index 100% rename from docs/images/model Core+Software.png rename to docs/images/model-core-software.png diff --git a/docs/images/model Dataset.png b/docs/images/model-dataset.png similarity index 100% rename from docs/images/model Dataset.png rename to docs/images/model-dataset.png diff --git a/docs/images/model Extension.png b/docs/images/model-extension.png similarity index 100% rename from docs/images/model Extension.png rename to docs/images/model-extension.png diff --git a/docs/images/model Licensing.png b/docs/images/model-licensing.png similarity index 100% rename from docs/images/model Licensing.png rename to docs/images/model-licensing.png diff --git a/docs/images/model Security.png b/docs/images/model-security.png similarity index 100% rename from docs/images/model Security.png rename to docs/images/model-security.png