Skip to content

Commit

Permalink
Merge branch 'development/v3.0.1' into update-ci-for-new-branch-names
Browse files Browse the repository at this point in the history
  • Loading branch information
bact authored Nov 14, 2024
2 parents 163faac + d716993 commit 3345764
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 1 deletion.
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# SPDX-License-Identifier: MIT
# SPDX-FileCopyrightText: Copyright 2024 The SPDX Contributors

version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 10
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "weekly"
open-pull-requests-limit: 10
26 changes: 25 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,30 @@

All notable changes to this project will be documented in this file.

## 3.0.1 (2024-10-04)

* Changes in document structure and location.
The following documents are now located in the
[spdx/using](https://github.com/spdx/using/) repository and are no longer
part of the specification.
* [Cross referencing in SPDX 3](https://github.com/spdx/using/blob/main/docs/cross-reference.md)
* [Differences from previous editions](https://github.com/spdx/using/blob/main/docs/diffs-from-previous-editions.md)
* [Getting started writing SPDX 3](https://github.com/spdx/using/blob/main/docs/getting-started.md)
* [Including Security Information in a SPDX document](https://github.com/spdx/using/blob/main/docs/including-security-information-in-SPDX.md)
* [Using SPDX license list short identifiers in source files](https://github.com/spdx/using/blob/main/docs/using-SPDX-short-identifiers-in-source-files.md)
* [Using SPDX to comply with Norms, Standards and Regulation](https://github.com/spdx/using/blob/main/docs/using-SPDX-to-comply-with-industry-guidance.md)
* The following documents are added for the completeness of the specification:
* [Package URL specification v1](./docs/annexes/pkg-url-specification.md)
* [SPDX License List matching guidelines and templates](./docs/annexes/license-matching-guidelines-and-templates.md)
* [SPDX Lite](./docs/annexes/spdx-lite.md) has been updated with more explicit
sections on "Mandatory" and "Recommended" properties.
* See the fixes in the model from
[the model change log](https://github.com/spdx/spdx-3-model/blob/main/CHANGELOG.md).

See the v3.0.1 GitHub release notes for changes
[in the spec](https://github.com/spdx/spdx-spec/releases/tag/v3.0.1) and
[in the model](https://github.com/spdx/spdx-3-model/releases/tag/3.0.1).

## 3.0 (2024-04-15)

See the v3.0 GitHub release notes for changes
Expand Down Expand Up @@ -34,7 +58,7 @@ See the [v2.3 GitHub release notes](https://github.com/spdx/spdx-spec/releases/t
* Removed support for multi-line license expressions.
* Added `swh` as an external reference to support linking to Software Heritage persistent identifiers.
* Added clarification on the case sensitivity of license expressions.
* Numerous formatting, gramatical, and spelling fixes.
* Numerous formatting, grammatical, and spelling fixes.

See also the [SPDX specification 2.2 release announcement](https://www.linuxfoundation.org/blog/2020/05/spdx-2-2-specification-released/)

Expand Down

0 comments on commit 3345764

Please sign in to comment.