Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change declared and concluded licenses to relationships #448

Merged
merged 2 commits into from
Aug 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions model/Core/Vocabularies/RelationshipType.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ between a Package and a File, between two Packages, or between one SPDXDocument
- buildDependency: Every `to` Element is a build dependency of the `from` Element
- buildTool: Build tool used to build an Element. This may be used to describe the build tool of a Build instance
- coordinatedBy: (Security) Used to identify the vendor, researcher, or consumer agent performing coordination for a vulnerability
- concludedLicense: The `to` specifices the license the SPDX data creator has concluded as governing the `from` software Artifact.
- contains: Every `to` Element is contained by the `from` Element
- configOf: (Build) Configuration information applied to an Element instance during a LifeycleScopeType period. Example: Build configuration of the build instance
- copy: Every `to` Element is a copy of the `from` Element
- dataFile: Every `to` Element is a data file related to the the `from` Element
- declaredLicense: The `to` license information identifies the license information actually found in the `from` software Artifact, for example as detected by use of automated tooling.
- dependencyManifest: Every `to` Element is manifest file containing dependency information related to the `from` Element
- dependsOn: Every `to` Element is a dependecy of the `from` Element
- descendant: This relationship may be used to describe child builds of a Build instance.
Expand Down
2 changes: 1 addition & 1 deletion model/ExpandedLicensing/Classes/ExtendableLicense.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The WithAdditionOperator can have a License or an OrLaterOperator as the license
## Metadata

- name: ExtendableLicense
- SubclassOf: /Licensing/AnyLicenseInfo
- SubclassOf: /SimpleLicensing/AnyLicenseInfo
- Instantiability: Abstract

## Properties
8 changes: 0 additions & 8 deletions model/Software/Classes/SoftwareArtifact.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,6 @@ such as a package, a file, or a snippet.
- additionalPurpose
- type: SoftwarePurpose
- minCount: 0
- concludedLicense
- type: /Licensing/AnyLicenseInfo
- minCount: 0
- maxCount: 1
- declaredLicense
- type: /Licensing/AnyLicenseInfo
- minCount: 0
- maxCount: 1
- copyrightText
- type: xsd:string
- minCount: 0
Expand Down
45 changes: 0 additions & 45 deletions model/Software/Properties/concludedLicense.md

This file was deleted.

57 changes: 0 additions & 57 deletions model/Software/Properties/declaredLicense.md

This file was deleted.