Merge pull request #285 from casework/bump_prerelease_pointers

casework · May 1, 2024 · 1a43a06 · 1a43a06
2 parents 5ef4e10 + 6084451
commit 1a43a06
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/dependencies/CASE-develop b/dependencies/CASE-develop
diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable
diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0
diff --git a/ontology/CASE-develop.ttl b/ontology/CASE-develop.ttl
@@ -887,12 +887,12 @@ uco-owl:Disjointedness-C-DT-shape
 	sh:sparql [
 		a sh:SPARQLConstraint ;
 		rdfs:seeAlso <https://www.w3.org/TR/2012/REC-owl2-syntax-20121211/#Typing_Constraints_of_OWL_2_DL> ;
-		sh:message "An IRI may not be a member of both an owl:Class and owl:Datatype."@en ;
+		sh:message "An IRI may not be a member of both an owl:Class and rdfs:Datatype."@en ;
 		sh:select """
 			PREFIX owl: <http://www.w3.org/2002/07/owl#>
 			SELECT $this
 			WHERE {
-				$this a owl:Datatype ;
+				$this a rdfs:Datatype ;
 			}
 		""" ;
 	] ;
@@ -2171,7 +2171,6 @@ core:ContextualCompilation
 	rdfs:comment "A contextual compilation is a grouping of things sharing some context (e.g., a set of network connections observed on a given day, all accounts associated with a given person)."@en ;
 	sh:property [
 		sh:class core:UcoObject ;
-		sh:minCount "1"^^xsd:integer ;
 		sh:nodeKind sh:IRI ;
 		sh:path core:object ;
 	] ;
@@ -8545,6 +8544,20 @@ observable:ObservableRelationship
 		;
 	rdfs:label "ObservableRelationship"@en ;
 	rdfs:comment "An observable relationship is a grouping of characteristics unique to an assertion of an association between two observable objects."@en ;
+	sh:property
+		[
+			sh:class observable:Observable ;
+			sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+			sh:path core:source ;
+			sh:severity sh:Warning ;
+		] ,
+		[
+			sh:class observable:Observable ;
+			sh:message "The target on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
+			sh:path core:target ;
+			sh:severity sh:Warning ;
+		]
+		;
 	sh:targetClass observable:ObservableRelationship ;
 	.
 

diff --git a/ontology/CASE-unstable-2.0.0.ttl b/ontology/CASE-unstable-2.0.0.ttl
@@ -17696,9 +17696,9 @@ pattern:LogicalPattern
 	rdfs:label "LogicalPattern"@en ;
 	rdfs:comment "A logical pattern is a grouping of characteristics unique to an informational pattern expressed via a structured pattern expression following the rules of logic."@en ;
 	sh:property [
-		sh:class pattern:PatternExpression ;
+		sh:datatype xsd:string ;
 		sh:maxCount "1"^^xsd:integer ;
-		sh:nodeKind sh:IRI ;
+		sh:nodeKind sh:Literal ;
 		sh:path pattern:patternExpression ;
 	] ;
 	sh:targetClass pattern:LogicalPattern ;
@@ -17718,19 +17718,25 @@ pattern:Pattern
 pattern:PatternExpression
 	a
 		owl:Class ,
+		owl:DeprecatedClass ,
 		sh:NodeShape
 		;
 	rdfs:subClassOf core:UcoInherentCharacterizationThing ;
 	rdfs:label "PatternExpression"@en ;
 	rdfs:comment "A pattern expression is a grouping of characteristics unique to an explicit logical expression defining a pattern (e.g., regular expression, SQL Select expression, etc.)."@en ;
+	sh:message "pattern:PatternExpression is deprecated, and an error to use as of UCO 2.0.0.  xsd:string should be used instead." ;
+	sh:not [
+		a sh:NodeShape ;
+		sh:class pattern:PatternExpression ;
+	] ;
 	sh:targetClass pattern:PatternExpression ;
 	.
 
 pattern:patternExpression
-	a owl:ObjectProperty ;
+	a owl:DatatypeProperty ;
 	rdfs:label "patternExpression"@en ;
 	rdfs:comment "An explicit logical pattern expression."@en ;
-	rdfs:range pattern:PatternExpression ;
+	rdfs:range xsd:string ;
 	.
 
 role:BenevolentRole