Merge branch 'develop' into japanese_translation2

spdx · Dec 11, 2024 · 698b114 · 698b114
2 parents df32320 + 53ae84b
commit 698b114
Show file tree

Hide file tree

Showing 18 changed files with 16 additions and 11 deletions.
diff --git a/docs/annexes/rdf-model.md b/docs/annexes/rdf-model.md
@@ -8,9 +8,13 @@ and is published in online at
 
 ## Diagrams
 
-### Core and Software Profiles
+### Core Profile
 
-[![Core and Software Profiles diagram][fig_core_software]][fig_core_software]
+[![Core Profile diagram][fig_core]][fig_core]
+
+### Software Profile
+
+[![Software Profile diagram][fig_software]][fig_software]
 
 ### Security Profile
 
@@ -36,10 +40,11 @@ and is published in online at
 
 [![Extension Profile diagram][fig_extension]][fig_extension]
 
-[fig_ai]: ../images/model-ai.png "SPDX 3.0.1 AI Profile diagram"
-[fig_build]: ../images/model-build.png "SPDX 3.0.1 Build Profile diagram"
-[fig_core_software]: ../images/model-core-software.png "SPDX 3.0.1 Core and Software Profiles diagram"
-[fig_dataset]: ../images/model-dataset.png "SPDX 3.0.1 Dataset Profile diagram"
-[fig_extension]: ../images/model-extension.png "SPDX 3.0.1 Extension Profile diagram"
-[fig_licensing]: ../images/model-licensing.png "SPDX 3.0.1 Licensing Profile diagram"
-[fig_security]: ../images/model-security.png "SPDX 3.0.1 Security Profile diagram"
+[fig_ai]: ../images/model-AI.png "SPDX 3.0.1 AI Profile diagram"
+[fig_build]: ../images/model-Build.png "SPDX 3.0.1 Build Profile diagram"
+[fig_core]: ../images/model-Core.png "SPDX 3.0.1 Core Profile diagram"
+[fig_dataset]: ../images/model-Dataset.png "SPDX 3.0.1 Dataset Profile diagram"
+[fig_extension]: ../images/model-Extension.png "SPDX 3.0.1 Extension Profile diagram"
+[fig_licensing]: ../images/model-Licensing.png "SPDX 3.0.1 Licensing Profile diagram"
+[fig_security]: ../images/model-Security.png "SPDX 3.0.1 Security Profile diagram"
+[fig_software]: ../images/model-Software.png "SPDX 3.0.1 Software Profile diagram"
diff --git a/docs/annexes/spdx-lite.md b/docs/annexes/spdx-lite.md
@@ -121,7 +121,7 @@ Additionally:
 - Mandatory
     1. created
     1. createdBy (may be multiple), SHOULD be objects of type /Core/Agent
-    1. specVersion, MUST be a fixed string, “3.0.1”.
+    1. specVersion, MUST be a fixed string, “3.0.*” - where * is any supported patch version of the SPDX specification
 - Recommended
     1. comment
 

diff --git a/docs/images/model-AI.png b/docs/images/model-AI.png
diff --git a/docs/images/model-Build.png b/docs/images/model-Build.png
diff --git a/docs/images/model-Core.png b/docs/images/model-Core.png
diff --git a/docs/images/model-Dataset.png b/docs/images/model-Dataset.png
diff --git a/docs/images/model-Extension.png b/docs/images/model-Extension.png
diff --git a/docs/images/model-Licensing.png b/docs/images/model-Licensing.png
diff --git a/docs/images/model-Security.png b/docs/images/model-Security.png
diff --git a/docs/images/model-Software.png b/docs/images/model-Software.png
diff --git a/docs/images/model-ai.png b/docs/images/model-ai.png
diff --git a/docs/images/model-build.png b/docs/images/model-build.png
diff --git a/docs/images/model-core-software.png b/docs/images/model-core-software.png
diff --git a/docs/images/model-dataset.png b/docs/images/model-dataset.png
diff --git a/docs/images/model-extension.png b/docs/images/model-extension.png
diff --git a/docs/images/model-licensing.png b/docs/images/model-licensing.png
diff --git a/docs/images/model-security.png b/docs/images/model-security.png
diff --git a/requirements.txt b/requirements.txt
@@ -2,4 +2,4 @@ mike==2.1.3
 mkdocs==1.6.1
 # mkdocs-pdf-export-plugin==0.5.10
 PyYAML==6.0.2
-shacl2code==0.0.15
+shacl2code==0.0.16