Merge branch 'develop' into Feature-Issue-544

ucoProject · Feb 2, 2024 · e5a633f · e5a633f
2 parents 16a6b3d + 250f5cc
commit e5a633f
Show file tree

Hide file tree

Showing 36 changed files with 644 additions and 275 deletions.
diff --git a/.github/ISSUE_TEMPLATE/change-request.md b/.github/ISSUE_TEMPLATE/change-request.md
@@ -96,4 +96,6 @@ Some requirements are narrow enough they could be considered "Self-documenting."
 > Requirement 1 also fully describes the solution, implemented in [PR X](https://github.com/ucoProject/UCO/pull/X).
 
 If there is an accompanying pull request, please do link it under the "Development" box on the right of the Issues page.
+
+If example snippets of instance data are provided, please note if you provide permission for the examples to be transcribed to one of the tested example repositories (such as CASE-Examples).  This is a significant aid in confirming examples represent the semantics that the submitter intended.  "I am fine with my examples being transcribed and credited" should be sufficient.
 -->
diff --git a/ontology/co/co.ttl b/ontology/co/co.ttl
@@ -12,10 +12,10 @@
 	a owl:Ontology ;
 	rdfs:label "uco-co"@en ;
 	rdfs:comment "This ontology defines SHACL shapes to supplement the OWL 2 DL definitions in the Collections Ontology."@en ;
-	owl:backwardCompatibleWith uco-co:1.1.0 ;
+	owl:backwardCompatibleWith uco-co:1.2.0 ;
 	owl:imports <http://purl.org/co> ;
-	owl:priorVersion uco-co:1.1.0 ;
-	owl:versionIRI uco-co:1.2.0 ;
+	owl:priorVersion uco-co:1.2.0 ;
+	owl:versionIRI uco-co:1.3.0 ;
 	.
 
 co:ListItem

diff --git a/ontology/owl/owl.ttl b/ontology/owl/owl.ttl
@@ -10,9 +10,9 @@
 	rdfs:label "uco-owl"@en ;
 	rdfs:comment "This ontology defines SHACL shapes to perform conformance testing of OWL 2 DL.  Some of these shapes follow rules specified from the canonical, subtractive parsing process of Section 3 of the OWL 2 mapping to RDF.  From the last line of that document's Section 3, 'At the end of this process, the graph G MUST be empty,' anything not strictly matching patterns specified in that section cause the input graph to be non-conformant with OWL 2 DL."@en ;
 	rdfs:seeAlso <https://www.w3.org/TR/2012/REC-owl2-mapping-to-rdf-20121211/#Mapping_from_RDF_Graphs_to_the_Structural_Specification> ;
-	owl:backwardCompatibleWith uco-owl:1.1.0 ;
-	owl:priorVersion uco-owl:1.1.0 ;
-	owl:versionIRI uco-owl:1.2.0 ;
+	owl:backwardCompatibleWith uco-owl:1.2.0 ;
+	owl:priorVersion uco-owl:1.2.0 ;
+	owl:versionIRI uco-owl:1.3.0 ;
 	.
 
 uco-owl:Axiom-shape
@@ -179,25 +179,14 @@ uco-owl:Disjointedness-DP-OP-shape
 	.
 
 uco-owl:List-shape
-	a sh:NodeShape ;
-	sh:property [
-		a sh:PropertyShape ;
-		sh:maxCount "1"^^xsd:integer ;
-		sh:path rdf:first ;
-	] ;
-	sh:sparql [
-		a sh:SPARQLConstraint ;
-		rdfs:comment "This requirement is determined from review of the canonical parsing process in Section 3 of the OWL 2 mapping to RDF.  Table 5 removes any triple matching the pattern 'x a rdf:List`.  All other references throughout Section 3 to rdf:first are identified as blank nodes.  Therefore, any non-blank node that is an rdf:List will not be mapped and consumed by the mapping process, making the graph non-conformant with OWL 2 DL."@en ;
-		rdfs:seeAlso <https://www.w3.org/TR/2012/REC-owl2-mapping-to-rdf-20121211/#Mapping_from_RDF_Graphs_to_the_Structural_Specification> ;
-		sh:message "The subject of a triple with rdf:first as predicate must be a blank node."@en ;
-		sh:select """
-			SELECT $this
-			WHERE {
-				FILTER isIRI($this)
-			}
-		""" ;
-	] ;
-	sh:targetSubjectsOf rdf:first ;
+	a sh:Shape ;
+	rdfs:comment "This shape's functionality has been exported"@en ;
+	rdfs:seeAlso
+		uco-owl:Sequence-shape ,
+		uco-owl:rdf-first-subjects-shape ,
+		uco-owl:rdf-rest-subjects-shape
+		;
+	sh:deactivated "true"^^xsd:boolean ;
 	.
 
 uco-owl:ObjectProperty-shacl-constraints-shape
@@ -250,6 +239,75 @@ uco-owl:ObjectProperty-shacl-constraints-shape
 	sh:targetClass owl:ObjectProperty ;
 	.
 
+uco-owl:Sequence-shape
+	a sh:NodeShape ;
+	rdfs:comment "This shape intentionally has no target declaration.  It is instead intended to be incorporated using 'sh:node'."@en ;
+	rdfs:seeAlso <https://www.w3.org/TR/2012/REC-owl2-mapping-to-rdf-20121211/#Mapping_from_RDF_Graphs_to_the_Structural_Specification> ;
+	sh:description "This shape is determined from review of the canonical parsing process in Section 3 of the OWL 2 mapping to RDF, particularly Tables 3 and 5.  Table 5 removes any triple matching the pattern 'x a rdf:List`.  All other references throughout Section 3 to rdf:first are in the context of mapping a Sequence in OWL structure translation, and are denoted as blank nodes, starting with Table 3.  A non-blank node that is an rdf:List and used with a sequence-valued property IRI in the OWL namespace will not be mapped and consumed by the mapping process, making the graph non-conformant with OWL 2 DL.  But a non-blank node that is an rdf:List can be used if not directly attached to a sequence-valued property IRI in the OWL namespace."@en ;
+	sh:xone (
+		[
+			a sh:NodeShape ;
+			sh:hasValue rdf:nil ;
+		]
+		[
+			a sh:NodeShape ;
+			sh:nodeKind sh:BlankNode ;
+			sh:property [
+				a sh:PropertyShape ;
+				sh:path [
+					sh:oneOrMorePath rdf:rest ;
+				] ;
+				sh:xone (
+					[
+						a sh:NodeShape ;
+						sh:hasValue rdf:nil ;
+					]
+					[
+						a sh:NodeShape ;
+						sh:nodeKind sh:BlankNode ;
+						sh:property [
+							a sh:PropertyShape ;
+							sh:maxCount "1"^^xsd:integer ;
+							sh:minCount "1"^^xsd:integer ;
+							sh:path rdf:first ;
+						] ;
+					]
+				) ;
+			] ;
+		]
+	) ;
+	.
+
+uco-owl:disjointUnionOf-subjects-shape
+	a sh:NodeShape ;
+	sh:property [
+		a sh:PropertyShape ;
+		sh:node uco-owl:Sequence-shape ;
+		sh:path owl:disjointUnionOf ;
+	] ;
+	sh:targetSubjectsOf owl:disjointUnionOf ;
+	.
+
+uco-owl:distinctMembers-subjects-shape
+	a sh:NodeShape ;
+	sh:property [
+		a sh:PropertyShape ;
+		sh:node uco-owl:Sequence-shape ;
+		sh:path owl:distinctMembers ;
+	] ;
+	sh:targetSubjectsOf owl:distinctMembers ;
+	.
+
+uco-owl:hasKey-subjects-shape
+	a sh:NodeShape ;
+	sh:property [
+		a sh:PropertyShape ;
+		sh:node uco-owl:Sequence-shape ;
+		sh:path owl:hasKey ;
+	] ;
+	sh:targetSubjectsOf owl:hasKey ;
+	.
+
 uco-owl:incompatibleWith-direct-import-shape
 	a sh:PropertyShape ;
 	rdfs:seeAlso <https://www.w3.org/TR/owl2-syntax/#Imports> ;
@@ -285,6 +343,46 @@ uco-owl:incompatibleWith-imported-version-iri-shape
 	sh:targetObjectsOf owl:incompatibleWith ;
 	.
 
+uco-owl:intersectionOf-subjects-shape
+	a sh:NodeShape ;
+	sh:property [
+		a sh:PropertyShape ;
+		sh:node uco-owl:Sequence-shape ;
+		sh:path owl:intersectionOf ;
+	] ;
+	sh:targetSubjectsOf owl:intersectionOf ;
+	.
+
+uco-owl:members-subjects-shape
+	a sh:NodeShape ;
+	sh:property [
+		a sh:PropertyShape ;
+		sh:node uco-owl:Sequence-shape ;
+		sh:path owl:members ;
+	] ;
+	sh:targetSubjectsOf owl:members ;
+	.
+
+uco-owl:onProperties-subjects-shape
+	a sh:NodeShape ;
+	sh:property [
+		a sh:PropertyShape ;
+		sh:node uco-owl:Sequence-shape ;
+		sh:path owl:onProperties ;
+	] ;
+	sh:targetSubjectsOf owl:onProperties ;
+	.
+
+uco-owl:oneOf-subjects-shape
+	a sh:NodeShape ;
+	sh:property [
+		a sh:PropertyShape ;
+		sh:node uco-owl:Sequence-shape ;
+		sh:path owl:oneOf ;
+	] ;
+	sh:targetSubjectsOf owl:oneOf ;
+	.
+
 uco-owl:ontologyIRI-versionIRI-prerequisite-shape
 	a sh:NodeShape ;
 	rdfs:seeAlso <https://www.w3.org/TR/owl2-syntax/#Ontology_IRI_and_Version_IRI> ;
@@ -293,6 +391,60 @@ uco-owl:ontologyIRI-versionIRI-prerequisite-shape
 	sh:targetSubjectsOf owl:versionIRI ;
 	.
 
+uco-owl:propertyChainAxiom-subjects-shape
+	a sh:NodeShape ;
+	sh:property [
+		a sh:PropertyShape ;
+		sh:node uco-owl:Sequence-shape ;
+		sh:path owl:propertyChainAxiom ;
+	] ;
+	sh:targetSubjectsOf owl:propertyChainAxiom ;
+	.
+
+uco-owl:rdf-first-subjects-shape
+	a sh:NodeShape ;
+	sh:property
+		[
+			a sh:PropertyShape ;
+			sh:maxCount "1"^^xsd:integer ;
+			sh:path rdf:first ;
+		] ,
+		[
+			a sh:PropertyShape ;
+			sh:minCount "1"^^xsd:integer ;
+			sh:path rdf:rest ;
+		]
+		;
+	sh:targetSubjectsOf rdf:first ;
+	.
+
+uco-owl:rdf-rest-subjects-shape
+	a sh:NodeShape ;
+	sh:property
+		[
+			a sh:PropertyShape ;
+			sh:maxCount "1"^^xsd:integer ;
+			sh:path rdf:rest ;
+		] ,
+		[
+			a sh:PropertyShape ;
+			sh:minCount "1"^^xsd:integer ;
+			sh:path rdf:first ;
+		]
+		;
+	sh:targetSubjectsOf rdf:rest ;
+	.
+
+uco-owl:unionOf-subjects-shape
+	a sh:NodeShape ;
+	sh:property [
+		a sh:PropertyShape ;
+		sh:node uco-owl:Sequence-shape ;
+		sh:path owl:unionOf ;
+	] ;
+	sh:targetSubjectsOf owl:unionOf ;
+	.
+
 uco-owl:versionIRI-multiversion-shape
 	a sh:PropertyShape ;
 	rdfs:seeAlso <https://www.w3.org/TR/owl2-syntax/#Imports> ;
@@ -310,3 +462,13 @@ uco-owl:versionIRI-nodeKind-shape
 	sh:targetSubjectsOf owl:versionIRI ;
 	.
 
+uco-owl:withRestrictions-subjects-shape
+	a sh:NodeShape ;
+	sh:property [
+		a sh:PropertyShape ;
+		sh:node uco-owl:Sequence-shape ;
+		sh:path owl:withRestrictions ;
+	] ;
+	sh:targetSubjectsOf owl:withRestrictions ;
+	.
+
diff --git a/ontology/uco/action/action.ttl b/ontology/uco/action/action.ttl
@@ -1,8 +1,8 @@
-# imports: https://ontology.unifiedcyberontology.org/uco/core/1.2.0
-# imports: https://ontology.unifiedcyberontology.org/uco/location/1.2.0
-# imports: https://ontology.unifiedcyberontology.org/uco/pattern/1.2.0
-# imports: https://ontology.unifiedcyberontology.org/uco/types/1.2.0
-# imports: https://ontology.unifiedcyberontology.org/uco/vocabulary/1.2.0
+# imports: https://ontology.unifiedcyberontology.org/uco/core/1.3.0
+# imports: https://ontology.unifiedcyberontology.org/uco/location/1.3.0
+# imports: https://ontology.unifiedcyberontology.org/uco/pattern/1.3.0
+# imports: https://ontology.unifiedcyberontology.org/uco/types/1.3.0
+# imports: https://ontology.unifiedcyberontology.org/uco/vocabulary/1.3.0
 
 @prefix action: <https://ontology.unifiedcyberontology.org/uco/action/> .
 @prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@@ -20,16 +20,16 @@
 	a owl:Ontology ;
 	rdfs:label "uco-action"@en ;
 	rdfs:comment "This ontology defines classes and properties for characterizing actions."@en-US ;
-	owl:backwardCompatibleWith action:1.1.0 ;
+	owl:backwardCompatibleWith action:1.2.0 ;
 	owl:imports
-		core:1.2.0 ,
-		location:1.2.0 ,
-		pattern:1.2.0 ,
-		types:1.2.0 ,
-		vocabulary:1.2.0
+		core:1.3.0 ,
+		location:1.3.0 ,
+		pattern:1.3.0 ,
+		types:1.3.0 ,
+		vocabulary:1.3.0
 		;
-	owl:priorVersion action:1.1.0 ;
-	owl:versionIRI action:1.2.0 ;
+	owl:priorVersion action:1.2.0 ;
+	owl:versionIRI action:1.3.0 ;
 	.
 
 action:Action

diff --git a/ontology/uco/action/catalog-v001.xml b/ontology/uco/action/catalog-v001.xml
@@ -2,11 +2,11 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
     <uri id="User Entered Import Resolution" uri="../../../dependencies/collections-ontology/collections.owl" name="http://purl.org/co"/>
     <uri id="User Entered Import Resolution" uri="../../../dependencies/error/docs/current/error.ttl" name="http://purl.org/spar/error"/>
-    <uri id="User Entered Import Resolution" uri="../../co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../../co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.3.0"/>
+    <uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
+    <uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.3.0"/>
+    <uri id="User Entered Import Resolution" uri="../pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.3.0"/>
+    <uri id="User Entered Import Resolution" uri="../types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.3.0"/>
+    <uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.3.0"/>
     <uri id="User Entered Import Resolution" uri="action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action"/>
 </catalog>
diff --git a/ontology/uco/analysis/analysis.ttl b/ontology/uco/analysis/analysis.ttl
@@ -1,4 +1,4 @@
-# imports: https://ontology.unifiedcyberontology.org/uco/action/1.2.0
+# imports: https://ontology.unifiedcyberontology.org/uco/action/1.3.0
 
 @prefix action: <https://ontology.unifiedcyberontology.org/uco/action/> .
 @prefix analysis: <https://ontology.unifiedcyberontology.org/uco/analysis/> .
@@ -14,10 +14,10 @@
 	rdfs:label "uco-analysis"@en ;
 	rdfs:comment "This ontology defines classes and properties for characterizing analytic actions and results."@en-US ;
 	rdfs:seeAlso <https://github.com/ucoProject/UCO/issues/400> ;
-	owl:backwardCompatibleWith analysis:1.1.0 ;
-	owl:imports action:1.2.0 ;
-	owl:priorVersion analysis:1.1.0 ;
-	owl:versionIRI analysis:1.2.0 ;
+	owl:backwardCompatibleWith analysis:1.2.0 ;
+	owl:imports action:1.3.0 ;
+	owl:priorVersion analysis:1.2.0 ;
+	owl:versionIRI analysis:1.3.0 ;
 	.
 
 analysis:Analysis

diff --git a/ontology/uco/analysis/catalog-v001.xml b/ontology/uco/analysis/catalog-v001.xml
@@ -2,12 +2,12 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
     <uri id="User Entered Import Resolution" uri="../../../dependencies/collections-ontology/collections.owl" name="http://purl.org/co"/>
     <uri id="User Entered Import Resolution" uri="../../../dependencies/error/docs/current/error.ttl" name="http://purl.org/spar/error"/>
-    <uri id="User Entered Import Resolution" uri="../../co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.2.0"/>
-    <uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../../co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.3.0"/>
+    <uri id="User Entered Import Resolution" uri="../action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.3.0"/>
+    <uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
+    <uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.3.0"/>
+    <uri id="User Entered Import Resolution" uri="../pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.3.0"/>
+    <uri id="User Entered Import Resolution" uri="../types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.3.0"/>
+    <uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.3.0"/>
     <uri id="User Entered Import Resolution" uri="analysis.ttl" name="https://ontology.unifiedcyberontology.org/uco/analysis"/>
 </catalog>
diff --git a/ontology/uco/configuration/catalog-v001.xml b/ontology/uco/configuration/catalog-v001.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
-    <uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.2.0"/>
+    <uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
     <uri id="User Entered Import Resolution" uri="configuration.ttl" name="https://ontology.unifiedcyberontology.org/uco/configuration"/>
 </catalog>
diff --git a/ontology/uco/configuration/configuration.ttl b/ontology/uco/configuration/configuration.ttl
@@ -1,4 +1,4 @@
-# imports: https://ontology.unifiedcyberontology.org/uco/core/1.2.0
+# imports: https://ontology.unifiedcyberontology.org/uco/core/1.3.0
 
 @prefix configuration: <https://ontology.unifiedcyberontology.org/uco/configuration/> .
 @prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@@ -13,10 +13,10 @@
 	rdfs:label "uco-configuration"@en ;
 	rdfs:comment "This ontology defines classes and properties for characterizing configurations."@en-US ;
 	rdfs:seeAlso <https://github.com/ucoProject/UCO/issues/432> ;
-	owl:backwardCompatibleWith configuration:1.1.0 ;
-	owl:imports core:1.2.0 ;
-	owl:priorVersion configuration:1.1.0 ;
-	owl:versionIRI configuration:1.2.0 ;
+	owl:backwardCompatibleWith configuration:1.2.0 ;
+	owl:imports core:1.3.0 ;
+	owl:priorVersion configuration:1.2.0 ;
+	owl:versionIRI configuration:1.3.0 ;
 	.
 
 configuration:Configuration