From 4482054bc10e2d7544801a96feb1c9ac15cc519f Mon Sep 17 00:00:00 2001
From: Alex Nelson <alexander.nelson@nist.gov>
Date: Fri, 21 Feb 2025 09:50:25 -0500
Subject: [PATCH] Revise vocabulary pattern for
 `investigation:investigationForm`

No effects were observed on Make-managed files.

References:
* https://github.com/ucoProject/UCO/issues/629

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
---
 dependencies/UCO                         |  2 +-
 ontology/investigation/investigation.ttl | 39 ++++++++----------------
 ontology/vocabulary/vocabulary.ttl       |  6 ++--
 3 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/dependencies/UCO b/dependencies/UCO
index 0405eac..e6decb6 160000
--- a/dependencies/UCO
+++ b/dependencies/UCO
@@ -1 +1 @@
-Subproject commit 0405eac9c93f1fc6f06ef731f784f4b00cbc339c
+Subproject commit e6decb6f6db604ea106d52365105663df282f0a7
diff --git a/ontology/investigation/investigation.ttl b/ontology/investigation/investigation.ttl
index 532a702..90781cd 100644
--- a/ontology/investigation/investigation.ttl
+++ b/ontology/investigation/investigation.ttl
@@ -128,45 +128,30 @@ investigation:Investigation
 			sh:nodeKind sh:Literal ;
 			sh:path investigation:investigationStatus ;
 		] ,
+		[
+			sh:datatype xsd:string ;
+			sh:message "As of CASE 1.4.0, the datatype to use for investigation:investigationForm should be xsd:string.  Not using xsd:string will be an error in CASE 2.0.0." ;
+			sh:path investigation:investigationForm ;
+			sh:severity sh:Warning ;
+		] ,
 		[
 			sh:datatype xsd:string ;
 			sh:nodeKind sh:Literal ;
 			sh:path investigation:focus ;
 		] ,
 		[
-			sh:datatype vocabulary:InvestigationFormVocab ;
-			sh:message "Value is outside the default vocabulary InvestigationFormVocab." ;
+			sh:in (
+				"case"
+				"incident"
+				"suspicious-activity"
+			) ;
+			sh:message "Value is not member of the vocabulary InvestigationFormVocab." ;
 			sh:path investigation:investigationForm ;
 			sh:severity sh:Info ;
 		] ,
 		[
 			sh:maxCount "1"^^xsd:integer ;
 			sh:nodeKind sh:Literal ;
-			sh:or (
-				[
-					sh:datatype vocabulary:InvestigationFormVocab ;
-				]
-				[
-					sh:datatype xsd:string ;
-				]
-			) ;
-			sh:path investigation:investigationForm ;
-		] ,
-		[
-			sh:message "Value is not member of the vocabulary InvestigationFormVocab." ;
-			sh:or (
-				[
-					sh:datatype vocabulary:InvestigationFormVocab ;
-					sh:in (
-						"case"^^vocabulary:InvestigationFormVocab
-						"incident"^^vocabulary:InvestigationFormVocab
-						"suspicious-activity"^^vocabulary:InvestigationFormVocab
-					) ;
-				]
-				[
-					sh:datatype xsd:string ;
-				]
-			) ;
 			sh:path investigation:investigationForm ;
 		]
 		;
diff --git a/ontology/vocabulary/vocabulary.ttl b/ontology/vocabulary/vocabulary.ttl
index b470af5..e2a34f2 100644
--- a/ontology/vocabulary/vocabulary.ttl
+++ b/ontology/vocabulary/vocabulary.ttl
@@ -19,9 +19,9 @@ vocab:InvestigationFormVocab
 	owl:equivalentClass [
 		a rdfs:Datatype ;
 		owl:oneOf (
-			"case"^^vocab:InvestigationFormVocab
-			"incident"^^vocab:InvestigationFormVocab
-			"suspicious-activity"^^vocab:InvestigationFormVocab
+			"case"
+			"incident"
+			"suspicious-activity"
 		) ;
 	] ;
 	.