Enforce vocabulary pattern revision

A follow-on patch will regenerate Make-managed files. References: * #629 Signed-off-by: Alex Nelson <[email protected]>
ucoProject · Feb 18, 2025 · 243f481 · 243f481
1 parent 5c94b41
commit 243f481
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 230 deletions.
diff --git a/ontology/uco/action/action.ttl b/ontology/uco/action/action.ttl
@@ -109,9 +109,9 @@ action:Action
 		] ,
 		[
 			sh:datatype xsd:string ;
-			sh:message "As of UCO 1.4.0, the datatype to use for action:actionStatus should be xsd:string.  Not using xsd:string will be an error in UCO 2.0.0." ;
+			sh:maxCount "1"^^xsd:integer ;
+			sh:nodeKind sh:Literal ;
 			sh:path action:actionStatus ;
-			sh:severity sh:Warning ;
 		] ,
 		[
 			sh:in (
@@ -126,11 +126,6 @@ action:Action
 			sh:message "Value is not member of the vocabulary ActionStatusTypeVocab." ;
 			sh:path action:actionStatus ;
 			sh:severity sh:Info ;
-		] ,
-		[
-			sh:maxCount "1"^^xsd:integer ;
-			sh:nodeKind sh:Literal ;
-			sh:path action:actionStatus ;
 		]
 		;
 	sh:targetClass action:Action ;
@@ -238,13 +233,14 @@ action:ActionFrequencyFacet
 			sh:maxCount "1"^^xsd:integer ;
 			sh:minCount "1"^^xsd:integer ;
 			sh:nodeKind sh:Literal ;
-			sh:path action:units ;
+			sh:path action:trend ;
 		] ,
 		[
 			sh:datatype xsd:string ;
-			sh:message "As of UCO 1.4.0, the datatype to use for action:trend should be xsd:string.  Not using xsd:string will be an error in UCO 2.0.0." ;
-			sh:path action:trend ;
-			sh:severity sh:Warning ;
+			sh:maxCount "1"^^xsd:integer ;
+			sh:minCount "1"^^xsd:integer ;
+			sh:nodeKind sh:Literal ;
+			sh:path action:units ;
 		] ,
 		[
 			sh:in (
@@ -254,12 +250,6 @@ action:ActionFrequencyFacet
 			sh:message "Value is not member of the vocabulary TrendVocab." ;
 			sh:path action:trend ;
 			sh:severity sh:Info ;
-		] ,
-		[
-			sh:maxCount "1"^^xsd:integer ;
-			sh:minCount "1"^^xsd:integer ;
-			sh:nodeKind sh:Literal ;
-			sh:path action:trend ;
 		]
 		;
 	sh:targetClass action:ActionFrequencyFacet ;