Restructure licensing profile (#399)

* rework licensing profile according to June 27th meeting Signed-off-by: Armin Tänzer <[email protected]> * change SimpleCustomLicense to SimpleLicensingText Signed-off-by: Armin Tänzer <[email protected]> * change superclass of SimpleLicensingText to Element Signed-off-by: Armin Tänzer <[email protected]> * move licenseText property to Licensing profile to replace simpleLicensingText Signed-off-by: Armin Tänzer <[email protected]> * rename Licensing to SimpleLicensing and ExpandedLicense to ExpandedLicensing also add the corresponding ProfileIdentifierTypes Signed-off-by: Armin Tänzer <[email protected]> * fix reference to licenseText in SimpleLicensingText Signed-off-by: Armin Tänzer <[email protected]> --------- Signed-off-by: Armin Tänzer <[email protected]>
spdx · Jul 27, 2023 · 87e131f · 87e131f
1 parent 82dcaed
commit 87e131f
Show file tree

Hide file tree

Showing 42 changed files with 54 additions and 25 deletions.
diff --git a/model/Core/Vocabularies/ProfileIdentifierType.md b/model/Core/Vocabularies/ProfileIdentifierType.md
@@ -18,7 +18,8 @@ There are a set of profiles that have been defined to be valid for a specific re
 
 - core: the element follows the Core profile specification
 - software: the element follows the Software profile specification
-- licensing: the element follows the Licensing profile specification
+- simpleLicensing: the element follows the simple Licensing profile specification
+- expandedLicensing: the element follows the expanded Licensing profile specification
 - security: the element follows the Security profile specification
 - build: the element follows the Build profile specification
 - ai: the element follows the AI profile specification

diff --git a/...dLicense/Classes/ConjunctiveLicenseSet.md → ...icensing/Classes/ConjunctiveLicenseSet.md b/...dLicense/Classes/ConjunctiveLicenseSet.md → ...icensing/Classes/ConjunctiveLicenseSet.md
@@ -24,11 +24,11 @@ left to the consumer of SPDX data to determine for themselves.
 ## Metadata
 
 - name: ConjunctiveLicenseSet
-- SubclassOf: Licensing/AnyLicenseInfo
+- SubclassOf: /SimpleLicensing/AnyLicenseInfo
 - Instantiability: Concrete
 
 ## Properties
 
 - member
-  - type: Licensing/AnyLicenseInfo
+  - type: /SimpleLicensing/AnyLicenseInfo
   - minCount: 2
diff --git a/model/Licensing/Classes/CustomLicense.md → ...xpandedLicensing/Classes/CustomLicense.md b/model/Licensing/Classes/CustomLicense.md → ...xpandedLicensing/Classes/CustomLicense.md
diff --git a/...icensing/Classes/CustomLicenseAddition.md → ...icensing/Classes/CustomLicenseAddition.md b/...icensing/Classes/CustomLicenseAddition.md → ...icensing/Classes/CustomLicenseAddition.md
diff --git a/...dLicense/Classes/DisjunctiveLicenseSet.md → ...icensing/Classes/DisjunctiveLicenseSet.md b/...dLicense/Classes/DisjunctiveLicenseSet.md → ...icensing/Classes/DisjunctiveLicenseSet.md
@@ -21,11 +21,11 @@ by the `OR` operator.
 ## Metadata
 
 - name: DisjunctiveLicenseSet
-- SubclassOf: Licensing/AnyLicenseInfo
+- SubclassOf: /SimpleLicensing/AnyLicenseInfo
 - Instantiability: Concrete
 
 ## Properties
 
 - member
-  - type: Licensing/AnyLicenseInfo
+  - type: /SimpleLicensing/AnyLicenseInfo
   - minCount: 2
diff --git a/...andedLicense/Classes/ExtendableLicense.md → ...dedLicensing/Classes/ExtendableLicense.md b/...andedLicense/Classes/ExtendableLicense.md → ...dedLicensing/Classes/ExtendableLicense.md
@@ -13,7 +13,7 @@ The WithAdditionOperator can have a License or an OrLaterOperator as the license
 ## Metadata
 
 - name: ExtendableLicense
-- SubclassOf: Licensing/AnyLicenseInfo
+- SubclassOf: /Licensing/AnyLicenseInfo
 - Instantiability: Abstract
 
 ## Properties
diff --git a/model/Licensing/Classes/License.md → model/ExpandedLicensing/Classes/License.md b/model/Licensing/Classes/License.md → model/ExpandedLicensing/Classes/License.md
@@ -19,7 +19,7 @@ A License represents a license text, whether listed on the SPDX License List
 
 ## Properties
 
-- licenseText
+- /SimpleLicensing/licenseText
   - type: xsd:string
   - minCount: 1
   - maxCount: 1

diff --git a/model/Licensing/Classes/LicenseAddition.md → ...andedLicensing/Classes/LicenseAddition.md b/model/Licensing/Classes/LicenseAddition.md → ...andedLicensing/Classes/LicenseAddition.md
diff --git a/model/Licensing/Classes/ListedLicense.md → ...xpandedLicensing/Classes/ListedLicense.md b/model/Licensing/Classes/ListedLicense.md → ...xpandedLicensing/Classes/ListedLicense.md
diff --git a/...censing/Classes/ListedLicenseException.md → ...censing/Classes/ListedLicenseException.md b/...censing/Classes/ListedLicenseException.md → ...censing/Classes/ListedLicenseException.md
diff --git a/model/Licensing/Classes/OrLaterOperator.md → ...andedLicensing/Classes/OrLaterOperator.md b/model/Licensing/Classes/OrLaterOperator.md → ...andedLicensing/Classes/OrLaterOperator.md
diff --git a/...Licensing/Classes/WithAdditionOperator.md → ...Licensing/Classes/WithAdditionOperator.md b/...Licensing/Classes/WithAdditionOperator.md → ...Licensing/Classes/WithAdditionOperator.md
@@ -5,7 +5,7 @@ SPDX-License-Identifier: Community-Spec-1.0
 ## Summary
 
 Portion of an AnyLicenseInfo representing a License which has additional
-text applied to it
+text applied to it.
 
 ## Description
 
@@ -18,7 +18,7 @@ Syntax by the `WITH` operator.
 ## Metadata
 
 - name: WithAdditionOperator
-- SubclassOf: AnyLicenseInfo
+- SubclassOf: /SimpleLicensing/AnyLicenseInfo
 - Instantiability: Concrete
 
 ## Properties

diff --git a/model/ExpandedLicense/ExpandedLicense.md → model/ExpandedLicensing/ExpandedLicensing.md b/model/ExpandedLicense/ExpandedLicense.md → model/ExpandedLicensing/ExpandedLicensing.md
@@ -1,16 +1,16 @@
 SPDX-License-Identifier: Community-Spec-1.0
 
-# ExpandedLicense
+# ExpandedLicensing
 
 ## Summary
 
-Fully expanded license expresssions.
+Fully expanded license expressions.
 
 ## Description
 
 This profile supports representing a fully expanded license expression in object form.
 
 ## Metadata
 
-- id: https://rdf.spdx.org/v3/ExpandedLicense
-- name: ExpandedLicense
+- id: https://rdf.spdx.org/v3/ExpandedLicensing
+- name: ExpandedLicensing
diff --git a/...License/Individuals/NoAssertionLicense.md → ...censing/Individuals/NoAssertionLicense.md b/...License/Individuals/NoAssertionLicense.md → ...censing/Individuals/NoAssertionLicense.md
@@ -14,7 +14,7 @@ is making no assertion about the license information for the corresponding softw
 ## Metadata
 
 - id: NoAssertionLicense
-- type: Licensing/AnyLicenseInfo
+- type: /SimpleLicensing/AnyLicenseInfo
 
 ## Serialization
 

diff --git a/...xpandedLicense/Individuals/NoneLicense.md → ...andedLicensing/Individuals/NoneLicense.md b/...xpandedLicense/Individuals/NoneLicense.md → ...andedLicensing/Individuals/NoneLicense.md
@@ -14,7 +14,7 @@ the absence of license information from a software artifact.
 ## Metadata
 
 - id: NoneLicense
-- type: Licensing/AnyLicenseInfo
+- type: /SimpleLicensing/AnyLicenseInfo
 
 ## Serialization
 

diff --git a/...l/Licensing/Properties/additionComment.md → ...edLicensing/Properties/additionComment.md b/...l/Licensing/Properties/additionComment.md → ...edLicensing/Properties/additionComment.md
diff --git a/model/Licensing/Properties/additionId.md → ...xpandedLicensing/Properties/additionId.md b/model/Licensing/Properties/additionId.md → ...xpandedLicensing/Properties/additionId.md
diff --git a/model/Licensing/Properties/additionName.md → ...andedLicensing/Properties/additionName.md b/model/Licensing/Properties/additionName.md → ...andedLicensing/Properties/additionName.md
diff --git a/model/Licensing/Properties/additionText.md → ...andedLicensing/Properties/additionText.md b/model/Licensing/Properties/additionText.md → ...andedLicensing/Properties/additionText.md
diff --git a/...Licensing/Properties/deprecatedVersion.md → ...Licensing/Properties/deprecatedVersion.md b/...Licensing/Properties/deprecatedVersion.md → ...Licensing/Properties/deprecatedVersion.md
diff --git a/...sing/Properties/isDeprecatedAdditionId.md → ...sing/Properties/isDeprecatedAdditionId.md b/...sing/Properties/isDeprecatedAdditionId.md → ...sing/Properties/isDeprecatedAdditionId.md
diff --git a/...nsing/Properties/isDeprecatedLicenseId.md → ...nsing/Properties/isDeprecatedLicenseId.md b/...nsing/Properties/isDeprecatedLicenseId.md → ...nsing/Properties/isDeprecatedLicenseId.md
diff --git a/model/Licensing/Properties/isFsfLibre.md → ...xpandedLicensing/Properties/isFsfLibre.md b/model/Licensing/Properties/isFsfLibre.md → ...xpandedLicensing/Properties/isFsfLibre.md
diff --git a/model/Licensing/Properties/isOsiApproved.md → ...ndedLicensing/Properties/isOsiApproved.md b/model/Licensing/Properties/isOsiApproved.md → ...ndedLicensing/Properties/isOsiApproved.md
diff --git a/model/Licensing/Properties/licenseComment.md → ...dedLicensing/Properties/licenseComment.md b/model/Licensing/Properties/licenseComment.md → ...dedLicensing/Properties/licenseComment.md
diff --git a/model/Licensing/Properties/licenseId.md → ...ExpandedLicensing/Properties/licenseId.md b/model/Licensing/Properties/licenseId.md → ...ExpandedLicensing/Properties/licenseId.md
@@ -15,7 +15,7 @@ characters.
 For a ListedLicense, the licenseId will be as specified on the
 [SPDX License List](https://spdx.org/licenses) for the particular license.
 
-For a CustomLicense, the short-form license identifer must begin with the
+For a CustomLicense, the short-form license identifier must begin with the
 prefix `LicenseRef-` and must be unique within the applicable SPDX namespace.
 The short-form license ID may be preceded by an SPDX namespace or a
 fully-qualified URI prefix.

diff --git a/model/Licensing/Properties/licenseName.md → ...pandedLicensing/Properties/licenseName.md b/model/Licensing/Properties/licenseName.md → ...pandedLicensing/Properties/licenseName.md
diff --git a/.../Licensing/Properties/listVersionAdded.md → ...dLicensing/Properties/listVersionAdded.md b/.../Licensing/Properties/listVersionAdded.md → ...dLicensing/Properties/listVersionAdded.md
diff --git a/model/ExpandedLicense/Properties/member.md → model/ExpandedLicensing/Properties/member.md b/model/ExpandedLicense/Properties/member.md → model/ExpandedLicensing/Properties/member.md
@@ -8,12 +8,12 @@ A license expression participating in a license set.
 
 ## Description
 
-A member is a license expression participating in a conjuctive (of type
+A member is a license expression participating in a conjunctive (of type
 ConjunctiveLicenseSet) or a disjunctive (of type DisjunctiveLicenseSet)
 license set.
 
 ## Metadata
 
 - name: member
 - Nature: ObjectProperty
-- Range: Licensing/AnyLicenseInfo
+- Range: /SimpleLicensing/AnyLicenseInfo
diff --git a/model/Licensing/Properties/obsoletedBy.md → ...pandedLicensing/Properties/obsoletedBy.md b/model/Licensing/Properties/obsoletedBy.md → ...pandedLicensing/Properties/obsoletedBy.md
diff --git a/model/Licensing/Properties/seeAlso.md → ...l/ExpandedLicensing/Properties/seeAlso.md b/model/Licensing/Properties/seeAlso.md → ...l/ExpandedLicensing/Properties/seeAlso.md
diff --git a/...ng/Properties/standardAdditionTemplate.md → ...ng/Properties/standardAdditionTemplate.md b/...ng/Properties/standardAdditionTemplate.md → ...ng/Properties/standardAdditionTemplate.md
diff --git a/...nsing/Properties/standardLicenseHeader.md → ...nsing/Properties/standardLicenseHeader.md b/...nsing/Properties/standardLicenseHeader.md → ...nsing/Properties/standardLicenseHeader.md
diff --git a/...ing/Properties/standardLicenseTemplate.md → ...ing/Properties/standardLicenseTemplate.md b/...ing/Properties/standardLicenseTemplate.md → ...ing/Properties/standardLicenseTemplate.md
diff --git a/...ndedLicense/Properties/subjectAddition.md → ...edLicensing/Properties/subjectAddition.md b/...ndedLicense/Properties/subjectAddition.md → ...edLicensing/Properties/subjectAddition.md
diff --git a/...andedLicense/Properties/subjectLicense.md → ...dedLicensing/Properties/subjectLicense.md b/...andedLicense/Properties/subjectLicense.md → ...dedLicensing/Properties/subjectLicense.md
@@ -15,4 +15,4 @@ A subjectLicense is a License which is subject to either an 'or later' effect
 
 - name: subjectLicense
 - Nature: ObjectProperty
-- Range: Licensing/License
+- Range: License
diff --git a/model/Licensing/Classes/AnyLicenseInfo.md → ...SimpleLicensing/Classes/AnyLicenseInfo.md b/model/Licensing/Classes/AnyLicenseInfo.md → ...SimpleLicensing/Classes/AnyLicenseInfo.md
diff --git a/model/Licensing/Classes/LicenseExpression.md → ...pleLicensing/Classes/LicenseExpression.md b/model/Licensing/Classes/LicenseExpression.md → ...pleLicensing/Classes/LicenseExpression.md
diff --git a/model/SimpleLicensing/Classes/SimpleLicensingText.md b/model/SimpleLicensing/Classes/SimpleLicensingText.md
@@ -0,0 +1,26 @@
+SPDX-License-Identifier: Community-Spec-1.0
+
+# SimpleLicensingText
+
+## Summary
+
+A license or addition that is not listed on the SPDX License List.
+
+## Description
+
+A SimpleLicensingText represents a License or Addition that is not listed on the SPDX License
+List at https://spdx.org/licenses, and is therefore defined by an SPDX data
+creator.
+
+## Metadata
+
+- name: SimpleLicensingText
+- SubclassOf: /Core/Element
+- Instantiability: Concrete
+
+## Properties
+
+- licenseText
+  - type: xsd:string
+  - minCount: 1
+  - maxCount: 1
diff --git a/...Licensing/Properties/licenseExpression.md → ...Licensing/Properties/licenseExpression.md b/...Licensing/Properties/licenseExpression.md → ...Licensing/Properties/licenseExpression.md
diff --git a/model/Licensing/Properties/licenseText.md → ...SimpleLicensing/Properties/licenseText.md b/model/Licensing/Properties/licenseText.md → ...SimpleLicensing/Properties/licenseText.md
@@ -4,12 +4,12 @@ SPDX-License-Identifier: Community-Spec-1.0
 
 ## Summary
 
-Identifies the full text of a License.
+Identifies the full text of a License or Addition.
 
 ## Description
 
-A licenseText contains the plain text of the License, without templating
-or other similar markup.
+A licenseText contains the plain text of the License or Addition,
+without templating or other similar markup.
 
 Users of the licenseText for a License can apply the SPDX Matching Guidelines
 when comparing it to another text for matching purposes.

diff --git a/model/Licensing/Licensing.md → model/SimpleLicensing/SimpleLicensing.md b/model/Licensing/Licensing.md → model/SimpleLicensing/SimpleLicensing.md
@@ -1,19 +1,21 @@
 SPDX-License-Identifier: Community-Spec-1.0
 
-# Licensing
+# SimpleLicensing
 
 ## Summary
 
 Additional metadata relating to software licensing.
 
 ## Description
 
+TODO: This text has to be reworked to reflect the new licensing structure "Simple <-> Expanded".
+
 The Licensing namespace defines metadata fields applicable to software
 licensing. It also defines the classes and properties that comprise the
 SPDX License Expression syntax and that relate to the SPDX License List.
 
 ## Metadata
 
-- id: https://rdf.spdx.org/v3/Licensing
-- name: Licensing
+- id: https://rdf.spdx.org/v3/SimpleLicensing
+- name: SimpleLicensing