Skip to content

Commit

Permalink
Update schemas per review comments
Browse files Browse the repository at this point in the history 
Signed-off-by: Gary O'Neall <gary@sourceauditor.com>
  • Loading branch information
@goneall
goneall committed Jun 23, 2022
1 parent a86c4b2 commit 2175124
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
14 changes: 7 additions & 7 deletions ontology/spdx-ontology.owl.ttl
View file
Expand Up @@ -219,9 +219,9 @@ xsd:date rdf:type rdfs:Datatype .
]
)
] ;
rdfs:comment """The licensing that the preparer of this SPDX document has concluded, based on the evidence, actually applies to the package.
rdfs:comment """The licensing that the preparer of this SPDX document has concluded, based on the evidence, actually applies to the SPDX Item.
If the Concluded License field is not present for an SPDX Item, it implies an equivalent meaning to NOASSERTION."""@en ;
If the licenseConcluded field is not present for an SPDX Item, it implies an equivalent meaning to NOASSERTION."""@en ;
ns:term_status "stable"@en .


Expand Down Expand Up @@ -258,7 +258,7 @@ If the Concluded License field is not present for an SPDX Item, it implies an eq
] ;
rdfs:comment """The licensing information that was discovered directly within the package. There will be an instance of this property for each distinct value of alllicenseInfoInFile properties of all files contained in the package.
If the All Licenses Information from Files field is not present for a package and FilesAnalyzed property for that same pacakge is true or omitted, it implies an equivalent meaning to NOASSERTION."""@en ;
If the licenseInfoFromFiles field is not present for a package and filesAnalyzed property for that same pacakge is true or omitted, it implies an equivalent meaning to NOASSERTION."""@en ;
ns:term_status "stable"@en .


Expand All @@ -280,7 +280,7 @@ If the All Licenses Information from Files field is not present for a package an
] ;
rdfs:comment """Licensing information that was discovered directly in the subject file. This is also considered a declared license for the file.
If the License Information in File field is not present for a file, it implies an equivalent meaning to NOASSERTION."""@en ;
If the licenseInfoInFile field is not present for a file, it implies an equivalent meaning to NOASSERTION."""@en ;
ns:term_status "stable" .


Expand All @@ -302,7 +302,7 @@ If the License Information in File field is not present for a file, it implies a
] ;
rdfs:comment """Licensing information that was discovered directly in the subject snippet. This is also considered a declared license for the snippet.
If the License Information in Snippet field is not present for a snippet, it implies an equivalent meaning to NOASSERTION."""@en ;
If the licenseInfoInSnippet field is not present for a snippet, it implies an equivalent meaning to NOASSERTION."""@en ;
ns:term_status "stable"@en .


Expand Down Expand Up @@ -623,9 +623,9 @@ rdfs:member rdf:type owl:ObjectProperty .
rdfs:domain :SpdxItem ;
rdfs:range rdfs:Literal ,
xsd:string ;
rdfs:comment """The text of copyright declarations recited in the Package, File or snippet.
rdfs:comment """The text of copyright declarations recited in the package, file or snippet.
If the License Information in File field is not present, it implies an equivalent meaning to NOASSERTION."""@en ;
If the copyrightText field is not present, it implies an equivalent meaning to NOASSERTION."""@en ;
ns:term_status "stable"@en .


Expand Down
14 changes: 7 additions & 7 deletions ontology/spdx-ontology.owl.xml
View file
Expand Up @@ -312,9 +312,9 @@ Known issues:
</owl:unionOf>
</owl:Class>
</rdfs:range>
<rdfs:comment xml:lang="en">The licensing that the preparer of this SPDX document has concluded, based on the evidence, actually applies to the package.
<rdfs:comment xml:lang="en">The licensing that the preparer of this SPDX document has concluded, based on the evidence, actually applies to the SPDX Item.

If the Concluded License field is not present for an SPDX Item, it implies an equivalent meaning to NOASSERTION.</rdfs:comment>
If the licenseConcluded field is not present for an SPDX Item, it implies an equivalent meaning to NOASSERTION.</rdfs:comment>
<ns:term_status xml:lang="en">stable</ns:term_status>
</owl:ObjectProperty>

Expand Down Expand Up @@ -363,7 +363,7 @@ If the Concluded License field is not present for an SPDX Item, it implies an eq
</rdfs:range>
<rdfs:comment xml:lang="en">The licensing information that was discovered directly within the package. There will be an instance of this property for each distinct value of alllicenseInfoInFile properties of all files contained in the package.

If the All Licenses Information from Files field is not present for a package and FilesAnalyzed property for that same pacakge is true or omitted, it implies an equivalent meaning to NOASSERTION.</rdfs:comment>
If the licenseInfoFromFiles field is not present for a package and filesAnalyzed property for that same pacakge is true or omitted, it implies an equivalent meaning to NOASSERTION.</rdfs:comment>
<ns:term_status xml:lang="en">stable</ns:term_status>
</owl:ObjectProperty>

Expand Down Expand Up @@ -391,7 +391,7 @@ If the All Licenses Information from Files field is not present for a package an
</rdfs:range>
<rdfs:comment xml:lang="en">Licensing information that was discovered directly in the subject file. This is also considered a declared license for the file.

If the License Information in File field is not present for a file, it implies an equivalent meaning to NOASSERTION.</rdfs:comment>
If the licenseInfoInFile field is not present for a file, it implies an equivalent meaning to NOASSERTION.</rdfs:comment>
<ns:term_status>stable</ns:term_status>
</owl:ObjectProperty>

Expand Down Expand Up @@ -419,7 +419,7 @@ If the License Information in File field is not present for a file, it implies a
</rdfs:range>
<rdfs:comment xml:lang="en">Licensing information that was discovered directly in the subject snippet. This is also considered a declared license for the snippet.

If the License Information in Snippet field is not present for a snippet, it implies an equivalent meaning to NOASSERTION.</rdfs:comment>
If the licenseInfoInSnippet field is not present for a snippet, it implies an equivalent meaning to NOASSERTION.</rdfs:comment>
<ns:term_status xml:lang="en">stable</ns:term_status>
</owl:ObjectProperty>

Expand Down Expand Up @@ -824,9 +824,9 @@ If the License Information in Snippet field is not present for a snippet, it imp
<rdfs:domain rdf:resource="http://spdx.org/rdf/terms#SpdxItem"/>
<rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Literal"/>
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
<rdfs:comment xml:lang="en">The text of copyright declarations recited in the Package, File or snippet.
<rdfs:comment xml:lang="en">The text of copyright declarations recited in the package, file or snippet.

If the License Information in File field is not present, it implies an equivalent meaning to NOASSERTION.</rdfs:comment>
If the copyrightText field is not present, it implies an equivalent meaning to NOASSERTION.</rdfs:comment>
<ns:term_status xml:lang="en">stable</ns:term_status>
</owl:DatatypeProperty>

Expand Down
26 changes: 13 additions & 13 deletions schemas/spdx-schema.json
View file
@@ -1,6 +1,6 @@
{
"$schema" : "http://json-schema.org/draft-07/schema#",
"$id" : "http://spdx.org/rdf/terms",
"$id" : "http://spdx.org/rdf/terms/2.3",
"title" : "SPDX 2.3",
"type" : "object",
"properties" : {
Expand Down Expand Up @@ -299,7 +299,7 @@
"type" : "string"
},
"copyrightText" : {
"description" : "The text of copyright declarations recited in the Package, File or snippet.\n\nIf the License Information in File field is not present, it implies an equivalent meaning to NOASSERTION.",
"description" : "The text of copyright declarations recited in the package, file or snippet.\n\nIf the copyrightText field is not present, it implies an equivalent meaning to NOASSERTION.",
"type" : "string"
},
"description" : {
Expand Down Expand Up @@ -358,18 +358,18 @@
"type" : "string"
},
"licenseConcluded" : {
"description" : "License expression for licenseConcluded. The licensing that the preparer of this SPDX document has concluded, based on the evidence, actually applies to the package.\n\nIf the Concluded License field is not present for an SPDX Item, it implies an equivalent meaning to NOASSERTION.",
"description" : "License expression for licenseConcluded. The licensing that the preparer of this SPDX document has concluded, based on the evidence, actually applies to the SPDX Item.\n\nIf the licenseConcluded field is not present for an SPDX Item, it implies an equivalent meaning to NOASSERTION.",
"type" : "string"
},
"licenseDeclared" : {
"description" : "License expression for licenseDeclared. The licensing that the creators of the software in the package, or the packager, have declared. Declarations by the original software creator should be preferred, if they exist.",
"type" : "string"
},
"licenseInfoFromFiles" : {
"description" : "The licensing information that was discovered directly within the package. There will be an instance of this property for each distinct value of alllicenseInfoInFile properties of all files contained in the package.\n\nIf the All Licenses Information from Files field is not present for a package and FilesAnalyzed property for that same pacakge is true or omitted, it implies an equivalent meaning to NOASSERTION.",
"description" : "The licensing information that was discovered directly within the package. There will be an instance of this property for each distinct value of alllicenseInfoInFile properties of all files contained in the package.\n\nIf the licenseInfoFromFiles field is not present for a package and filesAnalyzed property for that same pacakge is true or omitted, it implies an equivalent meaning to NOASSERTION.",
"type" : "array",
"items" : {
"description" : "License expression for licenseInfoFromFiles. The licensing information that was discovered directly within the package. There will be an instance of this property for each distinct value of alllicenseInfoInFile properties of all files contained in the package.\n\nIf the All Licenses Information from Files field is not present for a package and FilesAnalyzed property for that same pacakge is true or omitted, it implies an equivalent meaning to NOASSERTION.",
"description" : "License expression for licenseInfoFromFiles. The licensing information that was discovered directly within the package. There will be an instance of this property for each distinct value of alllicenseInfoInFile properties of all files contained in the package.\n\nIf the licenseInfoFromFiles field is not present for a package and filesAnalyzed property for that same pacakge is true or omitted, it implies an equivalent meaning to NOASSERTION.",
"type" : "string"
}
},
Expand Down Expand Up @@ -521,7 +521,7 @@
"type" : "string"
},
"copyrightText" : {
"description" : "The text of copyright declarations recited in the Package, File or snippet.\n\nIf the License Information in File field is not present, it implies an equivalent meaning to NOASSERTION.",
"description" : "The text of copyright declarations recited in the package, file or snippet.\n\nIf the copyrightText field is not present, it implies an equivalent meaning to NOASSERTION.",
"type" : "string"
},
"fileContributors" : {
Expand Down Expand Up @@ -558,14 +558,14 @@
"type" : "string"
},
"licenseConcluded" : {
"description" : "License expression for licenseConcluded. The licensing that the preparer of this SPDX document has concluded, based on the evidence, actually applies to the package.\n\nIf the Concluded License field is not present for an SPDX Item, it implies an equivalent meaning to NOASSERTION.",
"description" : "License expression for licenseConcluded. The licensing that the preparer of this SPDX document has concluded, based on the evidence, actually applies to the SPDX Item.\n\nIf the licenseConcluded field is not present for an SPDX Item, it implies an equivalent meaning to NOASSERTION.",
"type" : "string"
},
"licenseInfoInFiles" : {
"description" : "Licensing information that was discovered directly in the subject file. This is also considered a declared license for the file.\n\nIf the License Information in File field is not present for a file, it implies an equivalent meaning to NOASSERTION.",
"description" : "Licensing information that was discovered directly in the subject file. This is also considered a declared license for the file.\n\nIf the licenseInfoInFile field is not present for a file, it implies an equivalent meaning to NOASSERTION.",
"type" : "array",
"items" : {
"description" : "License expression for licenseInfoInFile. Licensing information that was discovered directly in the subject file. This is also considered a declared license for the file.\n\nIf the License Information in File field is not present for a file, it implies an equivalent meaning to NOASSERTION.",
"description" : "License expression for licenseInfoInFile. Licensing information that was discovered directly in the subject file. This is also considered a declared license for the file.\n\nIf the licenseInfoInFile field is not present for a file, it implies an equivalent meaning to NOASSERTION.",
"type" : "string"
}
},
Expand Down Expand Up @@ -628,22 +628,22 @@
"type" : "string"
},
"copyrightText" : {
"description" : "The text of copyright declarations recited in the Package, File or snippet.\n\nIf the License Information in File field is not present, it implies an equivalent meaning to NOASSERTION.",
"description" : "The text of copyright declarations recited in the package, file or snippet.\n\nIf the copyrightText field is not present, it implies an equivalent meaning to NOASSERTION.",
"type" : "string"
},
"licenseComments" : {
"description" : "The licenseComments property allows the preparer of the SPDX document to describe why the licensing in spdx:licenseConcluded was chosen.",
"type" : "string"
},
"licenseConcluded" : {
"description" : "License expression for licenseConcluded. The licensing that the preparer of this SPDX document has concluded, based on the evidence, actually applies to the package.\n\nIf the Concluded License field is not present for an SPDX Item, it implies an equivalent meaning to NOASSERTION.",
"description" : "License expression for licenseConcluded. The licensing that the preparer of this SPDX document has concluded, based on the evidence, actually applies to the SPDX Item.\n\nIf the licenseConcluded field is not present for an SPDX Item, it implies an equivalent meaning to NOASSERTION.",
"type" : "string"
},
"licenseInfoInSnippets" : {
"description" : "Licensing information that was discovered directly in the subject snippet. This is also considered a declared license for the snippet.\n\nIf the License Information in Snippet field is not present for a snippet, it implies an equivalent meaning to NOASSERTION.",
"description" : "Licensing information that was discovered directly in the subject snippet. This is also considered a declared license for the snippet.\n\nIf the licenseInfoInSnippet field is not present for a snippet, it implies an equivalent meaning to NOASSERTION.",
"type" : "array",
"items" : {
"description" : "License expression for licenseInfoInSnippet. Licensing information that was discovered directly in the subject snippet. This is also considered a declared license for the snippet.\n\nIf the License Information in Snippet field is not present for a snippet, it implies an equivalent meaning to NOASSERTION.",
"description" : "License expression for licenseInfoInSnippet. Licensing information that was discovered directly in the subject snippet. This is also considered a declared license for the snippet.\n\nIf the licenseInfoInSnippet field is not present for a snippet, it implies an equivalent meaning to NOASSERTION.",
"type" : "string"
}
},
Expand Down

0 comments on commit 2175124

Please sign in to comment.