Skip to content

Commit

Permalink
docs(spdx): Consistently refer to patch-level version 2 of SPDX 2.2
Browse files Browse the repository at this point in the history
While at it, simplify the `SpdxDocument` docs to just point at the
Markdown specification for version 2.2.2.

Signed-off-by: Sebastian Schuberth <[email protected]>
  • Loading branch information
sschuberth committed Feb 15, 2024
1 parent 70cc2e1 commit 8b346d1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions utils/spdx/src/main/kotlin/model/SpdxDocument.kt
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ private const val SPDX_VERSION_MAJOR_MINOR = "SPDX-2.2"
private val DATA_LICENSE = SpdxLicense.CC0_1_0.id

/**
* An SPDX document as specified by https://github.com/spdx/spdx-spec/tree/development/v2.2.1/chapters and
* https://github.com/spdx/spdx-spec/blob/development/v2.2.1/examples/ in revision 947271b.
* An SPDX document as specified by https://spdx.github.io/spdx-spec/v2.2.2/.
*/
data class SpdxDocument(
/**
Expand Down
6 changes: 3 additions & 3 deletions utils/spdx/src/test/kotlin/model/SpdxDocumentTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import org.ossreviewtoolkit.utils.spdx.SpdxModelMapper
import org.ossreviewtoolkit.utils.spdx.yamlMapper

/**
* This test uses the following test assets copied from the SPDX 2.2.1 specification examples.
* This test uses the following test assets copied from the SPDX 2.2.2 specification examples.
*
* 1. https://github.com/spdx/spdx-spec/blob/development/v2.2.1/examples/SPDXYAMLExample-2.2.spdx.yaml
* 2. https://github.com/spdx/spdx-spec/blob/development/v2.2.1/examples/SPDXJSONExample-v2.2.spdx.json
* 1. https://github.com/spdx/spdx-spec/blob/development/v2.2.2/examples/SPDXYAMLExample-2.2.spdx.yaml
* 2. https://github.com/spdx/spdx-spec/blob/development/v2.2.2/examples/SPDXJSONExample-v2.2.spdx.json
*
* The "*-no-ranges.spdx.*" resource files have the "ranges" property removed, which is actually broken in the
* specification and impossible to implement.
Expand Down

0 comments on commit 8b346d1

Please sign in to comment.