From 00161035d0245de6a4d1deed82148f366fab1bd0 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Thu, 25 Jul 2024 13:33:17 +0100 Subject: [PATCH 01/12] Add Copyrights and licensing page Signed-off-by: Arthit Suriyawongkul --- docs/copyrights.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 docs/copyrights.md diff --git a/docs/copyrights.md b/docs/copyrights.md new file mode 100644 index 0000000000..4d204e6c9a --- /dev/null +++ b/docs/copyrights.md @@ -0,0 +1,10 @@ +Copyright © 2010-2024 Linux Foundation and its Contributors +Copyright © 2024, CAST Software +Copyright © 2024, The MITRE Corporation +Copyright © 2024, OMG + +This work is licensed under the Community Specification License 1.0 +(Community-Spec-1.0). Pre-existing portions of this work from copyright holders +who have not subsequently contributed under the Community-Spec-1.0 are provided +under Creative Commons Attribution License 3.0 Unported (CC-BY-3.0). Copies of +these licenses are reproduced in their entirety herein as Annex G and H. From 2e1cfcc8e10ef3aba2a032e462dcb032504b92f1 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Thu, 25 Jul 2024 15:50:35 +0100 Subject: [PATCH 02/12] Apply same copyright line style with OMGs Signed-off-by: Arthit Suriyawongkul --- docs/copyrights.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/copyrights.md b/docs/copyrights.md index 4d204e6c9a..f1ed40654b 100644 --- a/docs/copyrights.md +++ b/docs/copyrights.md @@ -1,4 +1,4 @@ -Copyright © 2010-2024 Linux Foundation and its Contributors +Copyright © 2010-2024, Linux Foundation and its Contributors Copyright © 2024, CAST Software Copyright © 2024, The MITRE Corporation Copyright © 2024, OMG From 25659622948ec5e7f133a98333a18159ac02b02c Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Wed, 7 Aug 2024 17:29:33 +0100 Subject: [PATCH 03/12] Add copyrights.md to draft_docs So it will not be published publicly yet. Signed-off-by: Arthit Suriyawongkul --- mkdocs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/mkdocs.yml b/mkdocs.yml index 88f6258d98..77c7d4a4f7 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -57,6 +57,7 @@ nav: - 'Creative Commons Attribution License 3.0 Unported': licenses/CC-BY-3.0.md - 'Community Specification License 1.0': licenses/Community-Spec-1.0.md draft_docs: | # for preview with `mkdocs serve`, but excluded from `mkdocs build` + copyrights.md omg-preface.md iso-foreword.md conformance.md From 10f6eb9112e30da580d169a9adcce2c6bca944fc Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Fri, 9 Aug 2024 07:01:48 +0100 Subject: [PATCH 04/12] Update copyright line with OMG contributors Merge copyrights.md into index.md Signed-off-by: Arthit Suriyawongkul Co-Authored-By: Steve Winslow <678569+swinslow@users.noreply.github.com> --- docs/copyrights.md | 10 ---------- docs/index.md | 12 ++++++++---- mkdocs.yml | 12 +++++------- 3 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 docs/copyrights.md diff --git a/docs/copyrights.md b/docs/copyrights.md deleted file mode 100644 index f1ed40654b..0000000000 --- a/docs/copyrights.md +++ /dev/null @@ -1,10 +0,0 @@ -Copyright © 2010-2024, Linux Foundation and its Contributors -Copyright © 2024, CAST Software -Copyright © 2024, The MITRE Corporation -Copyright © 2024, OMG - -This work is licensed under the Community Specification License 1.0 -(Community-Spec-1.0). Pre-existing portions of this work from copyright holders -who have not subsequently contributed under the Community-Spec-1.0 are provided -under Creative Commons Attribution License 3.0 Unported (CC-BY-3.0). Copies of -these licenses are reproduced in their entirety herein as Annex G and H. diff --git a/docs/index.md b/docs/index.md index bf20224e61..adb1133d14 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,11 +1,15 @@ -# The System Package Data Exchange® (SPDX®) Specification Version 3.0 +# The System Package Data Exchange® (SPDX®) Specification Version 3.0.1 -Copyright © 2010-2024 Linux Foundation and its Contributors. +Copyright © 2010-2024, Linux Foundation and its Contributors, +including SPDX Model contributions from OMG and its Contributors This work is licensed under the Community Specification License 1.0 (Community-Spec-1.0). -Pre-existing portions of this work from copyright holders who have not subsequently contributed under the Community-Spec-1.0 are provided under Creative Commons Attribution License 3.0 Unported (CC-BY-3.0). -Copies of these licenses are reproduced in their entirety herein. +Pre-existing portions of this work from copyright holders who have not +subsequently contributed under the Community-Spec-1.0 are provided +under Creative Commons Attribution License 3.0 Unported (CC-BY-3.0). +Copies of these licenses are reproduced in their entirety herein as Annex G +and H. With thanks to Adam Cohn, diff --git a/mkdocs.yml b/mkdocs.yml index 77c7d4a4f7..6bafe49a3d 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,17 +1,16 @@ site_name: SPDX v3 Specification -site_description: The System Package Data Exchange (SPDX) Specification Version 3.0.1 (DRAFT) -site_author: Linux Foundation and its Contributors -site_url: https://spdx.github.io/spdx-spec/v3.0.1-draft/ -# site_url: https://spdx.github.io/spdx-spec/v3.0.1/ # for the final version +site_description: The System Package Data Exchange (SPDX) Specification Version 3.0.1 +site_author: Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors +site_url: https://spdx.github.io/spdx-spec/ repo_url: https://github.com/spdx/spdx-spec/ edit_uri: "" # set to an empty string to disable edit links; to enable, set to blob/development/v3.0.1/docs/ -copyright: DRAFT -- v3.0.1 -- DRAFT +copyright: SPDX v3.0.1 Copyright © 2010-2024, Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors use_directory_urls: true theme: readthedocs plugins: - search - mike: - canonical_version: latest # tell search engines to prefer the latest version + canonical_version: v3.0.1 # tell search engines to prefer the latest version - pdf-export: combined: true media_type: print @@ -57,7 +56,6 @@ nav: - 'Creative Commons Attribution License 3.0 Unported': licenses/CC-BY-3.0.md - 'Community Specification License 1.0': licenses/Community-Spec-1.0.md draft_docs: | # for preview with `mkdocs serve`, but excluded from `mkdocs build` - copyrights.md omg-preface.md iso-foreword.md conformance.md From aa16f20240c5e080ba90b6cd8677d52ad92d8963 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Fri, 9 Aug 2024 07:27:15 +0100 Subject: [PATCH 05/12] Remove refs to Annex G and H Signed-off-by: Arthit Suriyawongkul --- docs/index.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/index.md b/docs/index.md index adb1133d14..0234458c0f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,8 +8,7 @@ Community Specification License 1.0 (Community-Spec-1.0). Pre-existing portions of this work from copyright holders who have not subsequently contributed under the Community-Spec-1.0 are provided under Creative Commons Attribution License 3.0 Unported (CC-BY-3.0). -Copies of these licenses are reproduced in their entirety herein as Annex G -and H. +Copies of these licenses are reproduced in their entirety herein. With thanks to Adam Cohn, From 156a9c0cb7f54122a66d619e92a900671772a18a Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Fri, 9 Aug 2024 21:49:13 +0100 Subject: [PATCH 06/12] Add swinslow suggestion Signed-off-by: Arthit Suriyawongkul --- docs/index.md | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/docs/index.md b/docs/index.md index 0234458c0f..4a46be0279 100644 --- a/docs/index.md +++ b/docs/index.md @@ -4,12 +4,33 @@ Copyright © 2010-2024, Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors This work is licensed under the -Community Specification License 1.0 (Community-Spec-1.0). +[Community Specification License 1.0](./licenses/Community-Spec-1.0.md) +(Community-Spec-1.0). Pre-existing portions of this work from copyright holders who have not -subsequently contributed under the Community-Spec-1.0 are provided -under Creative Commons Attribution License 3.0 Unported (CC-BY-3.0). +subsequently contributed under the Community-Spec-1.0 are provided under +[Creative Commons Attribution License 3.0 Unported](./licenses/CC-BY-3.0.md) +(CC-BY-3.0). Copies of these licenses are reproduced in their entirety herein. +## Use of Specification - Terms, Conditions & Notices + +### Trademarks + +SPDX® is a registered trademark of the Linux Foundation. + +### Compliance + +Use of the SPDX trademarks is subject to the SPDX Trademark License, +currently available at +[SPDX Legal Notices page](https://spdx.dev/about/legal-notices/). + +Software developed under the terms of the licenses under which this +specification is issued may claim compliance or conformance with this +specification if and only if the software provider complies with the +SPDX Trademark License given above. + +## Contributors + With thanks to Adam Cohn, Adolfo García Veytia, From 0260612f857c638dd28ca83ab6d50679eb3b43e5 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Sat, 10 Aug 2024 11:53:54 +0100 Subject: [PATCH 07/12] Put "The" to "The Linux Foundation" Signed-off-by: Arthit Suriyawongkul --- docs/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/index.md b/docs/index.md index 4a46be0279..2c8251ba6b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,6 @@ # The System Package Data Exchange® (SPDX®) Specification Version 3.0.1 -Copyright © 2010-2024, Linux Foundation and its Contributors, +Copyright © 2010-2024, The Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors This work is licensed under the @@ -16,7 +16,7 @@ Copies of these licenses are reproduced in their entirety herein. ### Trademarks -SPDX® is a registered trademark of the Linux Foundation. +SPDX® is a registered trademark of The Linux Foundation. ### Compliance @@ -29,7 +29,7 @@ specification is issued may claim compliance or conformance with this specification if and only if the software provider complies with the SPDX Trademark License given above. -## Contributors +## Thanks With thanks to Adam Cohn, From 2e4a1a11dfee2d634363b1dac5caf24b2e05209d Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Sat, 10 Aug 2024 12:14:29 +0100 Subject: [PATCH 08/12] Move Terms heading Signed-off-by: Arthit Suriyawongkul --- docs/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.md b/docs/index.md index 2c8251ba6b..982f819293 100644 --- a/docs/index.md +++ b/docs/index.md @@ -3,6 +3,8 @@ Copyright © 2010-2024, The Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors +## Use of Specification - Terms, Conditions & Notices + This work is licensed under the [Community Specification License 1.0](./licenses/Community-Spec-1.0.md) (Community-Spec-1.0). @@ -12,8 +14,6 @@ subsequently contributed under the Community-Spec-1.0 are provided under (CC-BY-3.0). Copies of these licenses are reproduced in their entirety herein. -## Use of Specification - Terms, Conditions & Notices - ### Trademarks SPDX® is a registered trademark of The Linux Foundation. From cbffb221d91ebb1b6faed0cea222c320f6fa7ad1 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Sat, 10 Aug 2024 12:17:49 +0100 Subject: [PATCH 09/12] Add missing fullstop Signed-off-by: Arthit Suriyawongkul --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 982f819293..bb7bb763c3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,7 +1,7 @@ # The System Package Data Exchange® (SPDX®) Specification Version 3.0.1 Copyright © 2010-2024, The Linux Foundation and its Contributors, -including SPDX Model contributions from OMG and its Contributors +including SPDX Model contributions from OMG and its Contributors. ## Use of Specification - Terms, Conditions & Notices From 98a7bfafa88c111c0992eae66d9eb48dd95e5767 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Sat, 10 Aug 2024 12:43:02 +0100 Subject: [PATCH 10/12] Update copyright line in mkdocs.yml Signed-off-by: Arthit Suriyawongkul --- mkdocs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 6bafe49a3d..b5e6703404 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,10 +1,10 @@ site_name: SPDX v3 Specification site_description: The System Package Data Exchange (SPDX) Specification Version 3.0.1 -site_author: Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors +site_author: The Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors. site_url: https://spdx.github.io/spdx-spec/ repo_url: https://github.com/spdx/spdx-spec/ edit_uri: "" # set to an empty string to disable edit links; to enable, set to blob/development/v3.0.1/docs/ -copyright: SPDX v3.0.1 Copyright © 2010-2024, Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors +copyright: SPDX v3.0.1 Copyright © 2010-2024, The Linux Foundation and its Contributors, including SPDX Model contributions from OMG and its Contributors. use_directory_urls: true theme: readthedocs plugins: From 2d61c2448c2c6ddd9c5677983f482967ab2dd325 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Sat, 10 Aug 2024 12:00:50 +0100 Subject: [PATCH 11/12] "The" in "The Linux Foundation" should be first-letter-capitalized Per @swinslow comment at https://github.com/spdx/spdx-spec/pull/1010#issuecomment-2280946523 Signed-off-by: Arthit Suriyawongkul --- docs/annexes/license-matching-guidelines-and-templates.md | 4 ++-- docs/references.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/annexes/license-matching-guidelines-and-templates.md b/docs/annexes/license-matching-guidelines-and-templates.md index 7d8f3ffe88..eec4c7ee0a 100644 --- a/docs/annexes/license-matching-guidelines-and-templates.md +++ b/docs/annexes/license-matching-guidelines-and-templates.md @@ -48,7 +48,7 @@ The following XML tag is used to implement this guideline. `` with 2 attrib The original text is enclosed within the beginning and ending alt tags. For example: -`Copyright Linux Foundation` +`Copyright The Linux Foundation` The original replaceable text appears on the SPDX License List webpage in red text. @@ -184,7 +184,7 @@ Ignore copyright notices. A copyright notice consists of the following elements, The following XML tag is used to implement this guideline: `` -For example: `Copyright 2022 Linux Foundation` +For example: `Copyright 2022 The Linux Foundation` ## C.12 License name or title diff --git a/docs/references.md b/docs/references.md index 3a7ce06aa2..e3fd4a60a2 100644 --- a/docs/references.md +++ b/docs/references.md @@ -63,10 +63,10 @@ The Internet Society Network Working Group, *SPDX and RDF Ontology*, [http://spdx.org/rdf/ontology/spdx-3-0-1](http://spdx.org/rdf/ontology/spdx-3-0-1) -*SPDX License List*, Linux Foundation, +*SPDX License List*, The Linux Foundation, [https://spdx.org/licenses/](https://spdx.org/licenses/) -*SPDX License Exceptions*, Linux Foundation, +*SPDX License Exceptions*, The Linux Foundation, [https://spdx.org/licenses/exceptions-index.html](https://spdx.org/licenses/exceptions-index.html) ## 2.2 Non-normative References From 1f9518e840edd6f88f41ddfd7db24a3e20d0b183 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Sat, 10 Aug 2024 12:05:24 +0100 Subject: [PATCH 12/12] Linux Foundation -> The Linux Foundation Signed-off-by: Arthit Suriyawongkul --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index fb0bcd8210..ea7472adfc 100644 --- a/setup.py +++ b/setup.py @@ -11,8 +11,8 @@ def read(fname): setup( name = "spdx_specification", - version = "3.0", - author = "Linux Foundation and SPDX Contributors", + version = "3.0.1", + author = "The Linux Foundation and SPDX Contributors", author_email = "spdx-tech@lists.spdx.org", description = ("The System Package Data Exchange (SPDX®) specification is an open standard capable of representing systems with software components in as SBOMs (Software Bill of Materials) and other AI, data and security references supporting a range of risk management use cases."), license = "Community-Spec-1.0 AND CC-BY-3.0 AND MIT",