From 848b8af7fcc05bb3e605997358f278fe928fae3d Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Thu, 17 Aug 2023 12:39:13 -0700 Subject: [PATCH 1/4] Add licenseListVersion to LicenseExpression Fixes #131 This adds the licenseListVersion which in 2.3 was at the document level to the licenseExpression. Signed-off-by: Gary O'Neall --- .../Classes/LicenseExpression.md | 2 ++ .../Properties/licenseListVersion.md | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 model/SimpleLicensing/Properties/licenseListVersion.md diff --git a/model/SimpleLicensing/Classes/LicenseExpression.md b/model/SimpleLicensing/Classes/LicenseExpression.md index 0f58a9083..d3864939b 100644 --- a/model/SimpleLicensing/Classes/LicenseExpression.md +++ b/model/SimpleLicensing/Classes/LicenseExpression.md @@ -23,6 +23,8 @@ SPDX License Expressions provide a way for one to construct expressions that mor - type: xsd:string - minCount: 1 - maxCount: 1 +- licenseListVersion + - type: xsd:string - customIdToUri - type: /Core/DictionaryEntry - minCount: 0 diff --git a/model/SimpleLicensing/Properties/licenseListVersion.md b/model/SimpleLicensing/Properties/licenseListVersion.md new file mode 100644 index 000000000..39d4da265 --- /dev/null +++ b/model/SimpleLicensing/Properties/licenseListVersion.md @@ -0,0 +1,18 @@ +SPDX-License-Identifier: Community-Spec-1.0 + +# licenseListVersion + +## Summary + +The version of the SPDX License List used when the license expression was created. + +## Description + +Recognizing that licenses are added to the SPDX License List with each subsequent version, the intent is to provide consumers with the version of the SPDX License List used. This anticipates that in the future, license expression might have used a version of the SPDX License List that is older than the then current one. + +## Metadata + +- name: licenseListVersion +- Nature: DataProperty +- Range: xsd:string + From 03d6eb7eabe9eefbdc5c0487176d50e957595d14 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Fri, 18 Aug 2023 17:28:43 -0700 Subject: [PATCH 2/4] Add optional cardinality to licenseListVersion Signed-off-by: Gary O'Neall --- model/SimpleLicensing/Classes/LicenseExpression.md | 1 + 1 file changed, 1 insertion(+) diff --git a/model/SimpleLicensing/Classes/LicenseExpression.md b/model/SimpleLicensing/Classes/LicenseExpression.md index d3864939b..0368d818f 100644 --- a/model/SimpleLicensing/Classes/LicenseExpression.md +++ b/model/SimpleLicensing/Classes/LicenseExpression.md @@ -25,6 +25,7 @@ SPDX License Expressions provide a way for one to construct expressions that mor - maxCount: 1 - licenseListVersion - type: xsd:string + - maxCount: 1 - customIdToUri - type: /Core/DictionaryEntry - minCount: 0 From 07c57c6fe8fb6e6e08ca31196bfd40980adf9ab7 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Sat, 19 Aug 2023 10:34:15 -0700 Subject: [PATCH 3/4] Update text of LicenseListVersion per comments Signed-off-by: Gary O'Neall --- model/SimpleLicensing/Properties/licenseListVersion.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/model/SimpleLicensing/Properties/licenseListVersion.md b/model/SimpleLicensing/Properties/licenseListVersion.md index 39d4da265..9fd0da3dc 100644 --- a/model/SimpleLicensing/Properties/licenseListVersion.md +++ b/model/SimpleLicensing/Properties/licenseListVersion.md @@ -4,11 +4,13 @@ SPDX-License-Identifier: Community-Spec-1.0 ## Summary -The version of the SPDX License List used when the license expression was created. +The version of the SPDX License List used in the license expression. ## Description -Recognizing that licenses are added to the SPDX License List with each subsequent version, the intent is to provide consumers with the version of the SPDX License List used. This anticipates that in the future, license expression might have used a version of the SPDX License List that is older than the then current one. +Recognizing that licenses are added to the SPDX License List with each subsequent version, the intent is to provide consumers with the version of the SPDX License List used. +This anticipates that in the future, license expression might have used a version of the SPDX License List that is older than the then current one. +The specified version of the SPDX License List must include all listed licenses and exceptions referenced in the expression. ## Metadata From 5d6953dbc1b00d09744b46b76ee2bd12ec958aac Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Fri, 25 Aug 2023 12:58:36 -0700 Subject: [PATCH 4/4] Change licenseListVersionType to /Core/SemVer Signed-off-by: Gary O'Neall --- model/SimpleLicensing/Classes/LicenseExpression.md | 2 +- model/SimpleLicensing/Properties/licenseListVersion.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model/SimpleLicensing/Classes/LicenseExpression.md b/model/SimpleLicensing/Classes/LicenseExpression.md index 0368d818f..b3e0e1c52 100644 --- a/model/SimpleLicensing/Classes/LicenseExpression.md +++ b/model/SimpleLicensing/Classes/LicenseExpression.md @@ -24,7 +24,7 @@ SPDX License Expressions provide a way for one to construct expressions that mor - minCount: 1 - maxCount: 1 - licenseListVersion - - type: xsd:string + - type: /Core/SemVer - maxCount: 1 - customIdToUri - type: /Core/DictionaryEntry diff --git a/model/SimpleLicensing/Properties/licenseListVersion.md b/model/SimpleLicensing/Properties/licenseListVersion.md index 9fd0da3dc..4aef55e6f 100644 --- a/model/SimpleLicensing/Properties/licenseListVersion.md +++ b/model/SimpleLicensing/Properties/licenseListVersion.md @@ -16,5 +16,5 @@ The specified version of the SPDX License List must include all listed licenses - name: licenseListVersion - Nature: DataProperty -- Range: xsd:string +- Range: /Core/SemVer