Merge pull request #82 from casework/release-0.6.0

Release 0.6.0

ChangeLog

@@ -1,3 +1,20 @@
+2022-03-24
+	* ONT-463: Release CASE 0.6.0, with release notes at https://caseontology.org/releases/0.6.0/
+
+2022-03-23
+	* (a1b5d0b) ONT-471: Adopt UCO 0.8.0
+	* (8f7c87a) ONT-438, CP-36: Corrected rootExhibitNumber definition issues and aligned with exhibitNumber
+	* CP-36: https://drive.google.com/file/d/114XogkDDIqciWuJBJ3oRlMR5HoHCXwU7/view
+
+2022-03-08
+	* (cc19756) UCO OC-62, CP-89: Removed ActionReferencesFacet
+	* (bfc6d02) UCO OC-125, CP-56: Updated UCO ontology file paths
+	* (bc99cf7) UCO OC-217, CP-107: Revised ontology IRI structure as in CASE CP-34
+
+2022-02-14
+	* (ee4143d) ONT-468, CP-44: Made sh:targetClass shape application statements consistent between CASE and UCO
+	* CP-44: https://drive.google.com/file/d/1GN9lbqTpWLiU-TGPj53wYQzTQ9AvYb4l/view
+
 2021-10-26
 	* ONT-437: Release CASE 0.5.0, with release notes at https://caseontology.org/releases/0.5.0/
 

ontology/investigation/investigation.ttl

@@ -1,19 +1,19 @@
 # baseURI: https://ontology.caseontology.org/case/investigation
 # imports: https://ontology.caseontology.org/case/vocabulary
-# imports: https://unifiedcyberontology.org/ontology/uco/action
-# imports: https://unifiedcyberontology.org/ontology/uco/core
-# imports: https://unifiedcyberontology.org/ontology/uco/location
-# imports: https://unifiedcyberontology.org/ontology/uco/role
+# imports: https://ontology.unifiedcyberontology.org/uco/action
+# imports: https://ontology.unifiedcyberontology.org/uco/core
+# imports: https://ontology.unifiedcyberontology.org/uco/location
+# imports: https://ontology.unifiedcyberontology.org/uco/role
 
 @base <https://ontology.caseontology.org/case/investigation> .
 @prefix investigation: <https://ontology.caseontology.org/case/investigation/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix sh: <http://www.w3.org/ns/shacl#> .
-@prefix uco-action: <https://unifiedcyberontology.org/ontology/uco/action#> .
-@prefix uco-core: <https://unifiedcyberontology.org/ontology/uco/core#> .
-@prefix uco-role: <https://unifiedcyberontology.org/ontology/uco/role#> .
+@prefix uco-action: <https://ontology.unifiedcyberontology.org/uco/action/> .
+@prefix uco-core: <https://ontology.unifiedcyberontology.org/uco/core/> .
+@prefix uco-role: <https://ontology.unifiedcyberontology.org/uco/role/> .
 @prefix vocabulary: <https://ontology.caseontology.org/case/vocabulary/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
@@ -23,10 +23,10 @@
 	rdfs:comment "This ontology defines key concepts, and their associated properties and relationships, for characterizing cyber-investigations in the broadest range of contexts, including security incidents, criminal investigations, civil and regulatory matters, intelligence operations, international disputes, accident inquiries, policy violations, and others." ;
 	owl:imports
 		<https://ontology.caseontology.org/case/vocabulary> ,
-		<https://unifiedcyberontology.org/ontology/uco/action> ,
-		<https://unifiedcyberontology.org/ontology/uco/core> ,
-		<https://unifiedcyberontology.org/ontology/uco/location> ,
-		<https://unifiedcyberontology.org/ontology/uco/role>
+		<https://ontology.unifiedcyberontology.org/uco/action> ,
+		<https://ontology.unifiedcyberontology.org/uco/core> ,
+		<https://ontology.unifiedcyberontology.org/uco/location> ,
+		<https://ontology.unifiedcyberontology.org/uco/role>
 		;
 	.
 
@@ -38,6 +38,7 @@ investigation:Attorney
 	rdfs:subClassOf uco-role:Role ;
 	rdfs:label "Attorney"@en ;
 	rdfs:comment "Attorney is a role involved in preparing, interpreting, and applying law."@en ;
+	sh:targetClass investigation:Attorney ;
 	.
 
 investigation:Authorization
@@ -75,6 +76,7 @@ investigation:Authorization
 			sh:path investigation:authorizationIdentifier ;
 		]
 		;
+	sh:targetClass investigation:Authorization ;
 	.
 
 investigation:Examiner
@@ -85,6 +87,7 @@ investigation:Examiner
 	rdfs:subClassOf uco-role:Role ;
 	rdfs:label "Examiner"@en ;
 	rdfs:comment "Examiner is a role involved in providing scientific evaluations of evidence that are used to aid law enforcement investigations and court cases."@en ;
+	sh:targetClass investigation:Examiner ;
 	.
 
 investigation:ExaminerActionLifecylce
@@ -95,6 +98,7 @@ investigation:ExaminerActionLifecylce
 	rdfs:subClassOf uco-action:ActionLifecycle ;
 	rdfs:label "ExaminerActionLifecylce"@en ;
 	rdfs:comment "An examiner action life cycle is an action pattern consisting of an ordered set of actions or subordinate action-lifecycles performed by an entity acting in a role involved in providing scientific evaluations of evidence that is used to aid law enforcement investigations and court cases."@en ;
+	sh:targetClass investigation:ExaminerActionLifecylce ;
 	.
 
 investigation:Investigation
@@ -142,6 +146,7 @@ investigation:Investigation
 			sh:path investigation:investigationForm ;
 		]
 		;
+	sh:targetClass investigation:Investigation ;
 	.
 
 investigation:InvestigativeAction
@@ -157,6 +162,7 @@ investigation:InvestigativeAction
 		sh:nodeKind sh:BlankNodeOrIRI ;
 		sh:path investigation:wasInformedBy ;
 	] ;
+	sh:targetClass investigation:InvestigativeAction ;
 	.
 
 investigation:Investigator
@@ -167,6 +173,7 @@ investigation:Investigator
 	rdfs:subClassOf uco-role:Role ;
 	rdfs:label "Investigator"@en ;
 	rdfs:comment "Investigator is a role involved in coordinating an investigation."@en ;
+	sh:targetClass investigation:Investigator ;
 	.
 
 investigation:ProvenanceRecord
@@ -191,6 +198,7 @@ investigation:ProvenanceRecord
 			sh:path investigation:rootExhibitNumber ;
 		]
 		;
+	sh:targetClass investigation:ProvenanceRecord ;
 	.
 
 investigation:Subject
@@ -201,6 +209,7 @@ investigation:Subject
 	rdfs:subClassOf uco-role:Role ;
 	rdfs:label "Subject"@en ;
 	rdfs:comment "Subject is a role whose conduct is within the scope of an investigation."@en ;
+	sh:targetClass investigation:Subject ;
 	.
 
 investigation:SubjectActionLifecycle
@@ -211,6 +220,7 @@ investigation:SubjectActionLifecycle
 	rdfs:subClassOf uco-action:ActionLifecycle ;
 	rdfs:label "SubjectActionLifecycle"@en ;
 	rdfs:comment "A subject action life cycle is an action pattern consisting of an ordered set of multiple actions or subordinate action-lifecycles performed by an entity acting in a role whose conduct may be within the scope of an investigation."@en ;
+	sh:targetClass investigation:SubjectActionLifecycle ;
 	.
 
 investigation:VictimActionLifecycle
@@ -221,6 +231,7 @@ investigation:VictimActionLifecycle
 	rdfs:subClassOf uco-action:ActionLifecycle ;
 	rdfs:label "VictimActionLifecycle"@en ;
 	rdfs:comment "A victim action life cycle is an action pattern consisting of an ordered set of multiple actions or subordinate action-lifecycles performed by an entity acting in a role characterized by its potential to be harmed as a result of a crime, accident, or other event or action."@en ;
+	sh:targetClass investigation:VictimActionLifecycle ;
 	.
 
 investigation:authorizationIdentifier
@@ -240,7 +251,7 @@ investigation:authorizationType
 investigation:exhibitNumber
 	a owl:DatatypeProperty ;
 	rdfs:label "exhibitNumber"@en ;
-	rdfs:comment "Specifies a unique identifier assigned to a given object at any stage of an investigation to differentiate it from all other objects."@en ;
+	rdfs:comment "The exhibit number specifies an identifier assigned to a set of objects, unique within the scope of an investigation."@en ;
 	rdfs:range xsd:string ;
 	.
 
@@ -275,7 +286,7 @@ investigation:relevantAuthorization
 investigation:rootExhibitNumber
 	a owl:DatatypeProperty ;
 	rdfs:label "rootExhibitNumber"@en ;
-	rdfs:comment "Specifies a unique identifier assigned to a given object at the start of its treatment as part of an investigation. The first node in a provenance chain, which can be viewed as a heirarchical tree originating from a single root."@en ;
+	rdfs:comment "The root exhibit number specifies a unique identifier assigned to a set of objects at the start of their treatment as part of an investigation. When found on a provenance record that comes after initial investigative treatment, the root exhibit number is a reference to the initial provenance record."@en ;
 	rdfs:range xsd:string ;
 	.
 

ontology/master/case.ttl

@@ -1,7 +1,7 @@
 # baseURI: https://ontology.caseontology.org/case/case
 # imports: https://ontology.caseontology.org/case/investigation
 # imports: https://ontology.caseontology.org/case/vocabulary
-# imports: https://unifiedcyberontology.org/ontology/uco/uco
+# imports: https://ontology.unifiedcyberontology.org/uco/uco
 
 @base <https://ontology.caseontology.org/case/case> .
 @prefix dct: <http://purl.org/dc/terms/> .
@@ -21,11 +21,11 @@
 	owl:imports
 		<https://ontology.caseontology.org/case/investigation> ,
 		<https://ontology.caseontology.org/case/vocabulary> ,
-		<https://unifiedcyberontology.org/ontology/uco/uco>
+		<https://ontology.unifiedcyberontology.org/uco/uco>
 		;
 	owl:incompatibleWith <http://case.example.org/core> ;
 	owl:ontologyIRI <https://ontology.caseontology.org/case/case> ;
 	owl:priorVersion <http://case.example.org/core> ;
-	owl:versionInfo "0.5.0" ;
+	owl:versionInfo "0.6.0" ;
 	.
 

tests/Makefile

@@ -18,7 +18,7 @@ top_srcdir := $(shell cd .. ; pwd)
 PYTHON3 ?= $(shell which python3.9 2>/dev/null || which python3.8 2>/dev/null || which python3.7 2>/dev/null || which python3.6 2>/dev/null || which python3)
 
 case_turtle_files := $(shell /bin/ls $(top_srcdir)/ontology/*/*.ttl)
-uco_turtle_files := $(shell /bin/ls $(top_srcdir)/dependencies/UCO/uco-*/*.ttl)
+uco_turtle_files := $(shell /bin/ls $(top_srcdir)/dependencies/UCO/ontology/*/*.ttl)
 
 all:
 

tests/examples/investigative_action_PASS.json

@@ -2,9 +2,9 @@
     "@context": {
         "kb": "http://example.org/kb/",
         "case-investigation": "https://ontology.caseontology.org/case/investigation/",
-        "uco-action": "https://unifiedcyberontology.org/ontology/uco/action#",
-        "uco-core": "https://unifiedcyberontology.org/ontology/uco/core#",
-        "uco-observable": "https://unifiedcyberontology.org/ontology/uco/observable#",
+        "uco-action": "https://ontology.unifiedcyberontology.org/uco/action/",
+        "uco-core": "https://ontology.unifiedcyberontology.org/uco/core/",
+        "uco-observable": "https://ontology.unifiedcyberontology.org/uco/observable/",
         "xsd": "http://www.w3.org/2001/XMLSchema#"
     },
     "@graph": [
@@ -31,17 +31,14 @@
         {
             "@id": "kb:investigative-action-1",
             "@type": "case-investigation:InvestigativeAction",
-            "uco-core:hasFacet": {
-                "@type": "uco-action:ActionReferencesFacet",
-                "uco-action:result": [
-                    {
-                        "@id": "kb:file-1"
-                    },
-                    {
-                        "@id": "kb:provenance-record-1"
-                    }
-                ]
-            },
+            "uco-action:result": [
+                {
+                    "@id": "kb:file-1"
+                },
+                {
+                    "@id": "kb:provenance-record-1"
+                }
+            ],
             "uco-core:name": "Submit reference graphic"
         },
         {

tests/examples/investigative_action_XFAIL.json

@@ -2,9 +2,9 @@
     "@context": {
         "kb": "http://example.org/kb/",
         "case-investigation": "https://ontology.caseontology.org/case/investigation/",
-        "uco-action": "https://unifiedcyberontology.org/ontology/uco/action#",
-        "uco-core": "https://unifiedcyberontology.org/ontology/uco/core#",
-        "uco-observable": "https://unifiedcyberontology.org/ontology/uco/observable#",
+        "uco-action": "https://ontology.unifiedcyberontology.org/uco/action/",
+        "uco-core": "https://ontology.unifiedcyberontology.org/uco/core/",
+        "uco-observable": "https://ontology.unifiedcyberontology.org/uco/observable/",
         "xsd": "http://www.w3.org/2001/XMLSchema#"
     },
     "@graph": [
@@ -32,17 +32,14 @@
         {
             "@id": "kb:investigative-action-1",
             "@type": "case-investigation:InvestigativeAction",
-            "uco-core:hasFacet": {
-                "@type": "uco-action:ActionReferencesFacet",
-                "uco-action:result": [
-                    {
-                        "@id": "kb:file-1"
-                    },
-                    {
-                        "@id": "kb:provenance-record-1"
-                    }
-                ]
-            },
+            "uco-action:result": [
+                {
+                    "@id": "kb:file-1"
+                },
+                {
+                    "@id": "kb:provenance-record-1"
+                }
+            ],
             "uco-core:name": "Submit reference graphic"
         },
         {

tests/examples/test_validation.py

@@ -29,10 +29,10 @@
 
 NS_CASE_INVESTIGATION = rdflib.Namespace("https://ontology.caseontology.org/case/investigation/")
 NS_SH = rdflib.SH
-NS_UCO_ACTION = rdflib.Namespace("https://unifiedcyberontology.org/ontology/uco/action#")
-NS_UCO_CORE = rdflib.Namespace("https://unifiedcyberontology.org/ontology/uco/core#")
-NS_UCO_LOCATION = rdflib.Namespace("https://unifiedcyberontology.org/ontology/uco/location#")
-NS_UCO_OBSERVABLE = rdflib.Namespace("https://unifiedcyberontology.org/ontology/uco/observable#")
+NS_UCO_ACTION = rdflib.Namespace("https://ontology.unifiedcyberontology.org/uco/action/")
+NS_UCO_CORE = rdflib.Namespace("https://ontology.unifiedcyberontology.org/uco/core/")
+NS_UCO_LOCATION = rdflib.Namespace("https://ontology.unifiedcyberontology.org/uco/location/")
+NS_UCO_OBSERVABLE = rdflib.Namespace("https://ontology.unifiedcyberontology.org/uco/observable/")
 
 NSDICT = {"sh": NS_SH}