Merge branch 'develop' into BugFix-Issue-629

ucoProject · Oct 17, 2024 · ceaa62e · ceaa62e
2 parents 6d385ba + fe4c001
commit ceaa62e
Show file tree

Hide file tree

Showing 9 changed files with 187 additions and 44 deletions.
diff --git a/ontology/uco/core/core.ttl b/ontology/uco/core/core.ttl
@@ -317,6 +317,19 @@ core:ModusOperandi
 	sh:targetClass core:ModusOperandi ;
 	.
 
+core:ObjectStatusVocab
+	a rdfs:Datatype ;
+	rdfs:label "Object Status Vocabulary"@en-US ;
+	owl:equivalentClass [
+		a rdfs:Datatype ;
+		owl:oneOf (
+			"Draft"^^core:ObjectStatusVocab
+			"Final"^^core:ObjectStatusVocab
+			"Deprecated"^^core:ObjectStatusVocab
+		) ;
+	] ;
+	.
+
 core:Relationship
 	a
 		owl:Class ,
@@ -451,6 +464,17 @@ core:UcoObject
 			sh:datatype xsd:string ;
 			sh:nodeKind sh:Literal ;
 			sh:path core:tag ;
+		] ,
+		[
+			sh:datatype core:ObjectStatusVocab ;
+			sh:in (
+				"Draft"^^core:ObjectStatusVocab
+				"Final"^^core:ObjectStatusVocab
+				"Deprecated"^^core:ObjectStatusVocab
+			) ;
+			sh:maxCount "1"^^xsd:integer ;
+			sh:nodeKind sh:Literal ;
+			sh:path core:objectStatus ;
 		]
 		;
 	sh:targetClass core:UcoObject ;
@@ -697,6 +721,19 @@ core:objectMarking
 	rdfs:range core:MarkingDefinitionAbstraction ;
 	.
 
+core:objectStatus
+	a owl:AnnotationProperty ;
+	rdfs:label "objectStatus"@en ;
+	rdfs:comment "The current state of formality and acceptance for a UCO object."@en-US ;
+	rdfs:range core:ObjectStatusVocab ;
+	.
+
+core:objectStatus-subjects-shape
+	a sh:NodeShape ;
+	sh:class core:UcoObject ;
+	sh:targetSubjectsOf core:objectStatus ;
+	.
+
 core:referenceURL
 	a owl:DatatypeProperty ;
 	rdfs:label "referenceURL"@en ;

diff --git a/ontology/uco/observable/observable.ttl b/ontology/uco/observable/observable.ttl
@@ -2437,6 +2437,14 @@ observable:Disk
 	rdfs:subClassOf observable:ObservableObject ;
 	rdfs:label "Disk"@en ;
 	rdfs:comment "A disk is a storage mechanism where data is recorded by various electronic, magnetic, optical, or mechanical changes to a surface layer of one or more rotating disks."@en ;
+	rdfs:seeAlso [
+		a sh:NodeShape ;
+		rdfs:comment "This anonymous shape is attached with rdfs:seeAlso in order to associate a warning-severity class constraint, that will only be necessary as an independent shape until UCO 2.0.0."@en ;
+		sh:class observable:StorageMedium ;
+		sh:message "In UCO 2.0.0, uco-observable:Disk will be a subclass of uco-observable:StorageMedium.  In preparation for UCO 2.0.0, the additional type uco-observable:StorageMedium should be assigned to this node."@en ;
+		sh:severity sh:Warning ;
+		sh:targetClass observable:Disk ;
+	] ;
 	sh:targetClass observable:Disk ;
 	.