Update for Community Specification 1.0 license

This commit implements details for the change to the Community-Spec-1.0
license for the v3.0 branch. It reflects similar changes as previously
submitted in #679, with some conforming edits reflecting the move of
license texts out of annexes and into a separate licenses folder.

Signed-off-by: Steve Winslow <[email protected]>

Author: swinslow

CONTRIBUTING.md

@@ -3,6 +3,10 @@
 The SPDX specification is maintained by the SPDX [legal][spdx-legal] and [tech][spdx-tech] teams.
 Design and planning is primarily done via the team [mailing][spdx-legal-list] [lists][spdx-tech-list] and meetings.
 
+## Contribution License Agreement
+
+Contributions to this repo are made pursuant to the [SPDX Community Specification Contributor License Agreement 1.0][cla]. You do not need to submit a signed copy of the contributor license agreement; by making a contribution to this repo, you agree to the terms set forth in that agreement.
+
 ## Submitting changes
 
 Always write a clear log message for your commits. One-line messages are fine for small changes, but significant changes should look like this:
@@ -33,6 +37,7 @@ When submitting an issue or pull request, please add a suggested release milesto
 
 If your issue or pull request is independent of a release, you can use the `release-independent` milestone.
 
+[cla]: https://github.com/spdx/governance/blob/main/0._SPDX_Contributor_License_Agreement.md
 [issues]: https://github.com/spdx/spdx-spec/issues/
 [pull-requests]: https://github.com/spdx/spdx-spec/pulls/
 [spdx-legal]: https://wiki.spdx.org/view/Legal_Team

LICENSE

@@ -3,9 +3,9 @@
 Copyright © 2010-2024 Linux Foundation and its Contributors.
 
 This work is licensed under the
-Creative Commons Attribution License 3.0 Unported (CC-BY-3.0)
-and the Community specification License 1.0,
-both reproduced in their entirety in annexes herein.
+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.
 
 With thanks to
 Adam Cohn,

docs/index.md

@@ -1,4 +1,4 @@
-# Annex J Creative Commons Attribution License 3.0 Unported (Informative)
+# Creative Commons Attribution License 3.0 Unported
 
 **License**
 

docs/licenses/cc-by-3.0-unported.md docs/licenses/CC-BY-3.0.md

@@ -308,5 +308,5 @@ nav:
   - 'SPDX License Expressions': annexes/SPDX-license-expressions.md
   - 'Using SPDX short identifiers in Source Files': annexes/using-SPDX-short-identifiers-in-source-files.md
 - licenses:
-  - 'Creative Commons Attribution License 3.0 Unported': licenses/cc-by-3.0-unported.md
-  - 'Community Spec License 1.0': licenses/community-spec.md
+  - 'Creative Commons Attribution License 3.0 Unported': licenses/CC-BY-3.0.md
+  - 'Community Specification License 1.0': licenses/Community-Spec-1.0.md

docs/licenses/community-spec.md docs/licenses/Community-Spec-1.0.md

@@ -11,11 +11,11 @@ def read(fname):
 
 setup(
     name = "spdx_specification",
-    version = "2.3",
+    version = "3.0",
     author = "Linux Foundation and SPDX Contributors",
-    author_email = "[email protected]",
+    author_email = "[email protected]",
     description = ("The Software Package Data Exchange® (SPDX®) specification is a standard format for communicating the components, licenses and copyrights associated with software packages."),
-    license = "CC-BY-3.0 AND MIT",
+    license = "Community-Spec-1.0 AND CC-BY-3.0 AND MIT",
     keywords = "SPDX Software Package Data Exchange SPDX-License-Identifier specification licenses license",
     url = "https://spdx.org",
     long_description=read('README.md'),