Skip to content

Commit 16c91c3

Browse files
authored
Merge pull request #82 from casework/release-0.6.0
Release 0.6.0
2 parents 6f55b7b + 34222ab commit 16c91c3

8 files changed

Lines changed: 72 additions & 50 deletions

File tree

ChangeLog

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
2022-03-24
2+
* ONT-463: Release CASE 0.6.0, with release notes at https://caseontology.org/releases/0.6.0/
3+
4+
2022-03-23
5+
* (a1b5d0b) ONT-471: Adopt UCO 0.8.0
6+
* (8f7c87a) ONT-438, CP-36: Corrected rootExhibitNumber definition issues and aligned with exhibitNumber
7+
* CP-36: https://drive.google.com/file/d/114XogkDDIqciWuJBJ3oRlMR5HoHCXwU7/view
8+
9+
2022-03-08
10+
* (cc19756) UCO OC-62, CP-89: Removed ActionReferencesFacet
11+
* (bfc6d02) UCO OC-125, CP-56: Updated UCO ontology file paths
12+
* (bc99cf7) UCO OC-217, CP-107: Revised ontology IRI structure as in CASE CP-34
13+
14+
2022-02-14
15+
* (ee4143d) ONT-468, CP-44: Made sh:targetClass shape application statements consistent between CASE and UCO
16+
* CP-44: https://drive.google.com/file/d/1GN9lbqTpWLiU-TGPj53wYQzTQ9AvYb4l/view
17+
118
2021-10-26
219
* ONT-437: Release CASE 0.5.0, with release notes at https://caseontology.org/releases/0.5.0/
320

dependencies/UCO

ontology/investigation/investigation.ttl

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# baseURI: https://ontology.caseontology.org/case/investigation
22
# imports: https://ontology.caseontology.org/case/vocabulary
3-
# imports: https://unifiedcyberontology.org/ontology/uco/action
4-
# imports: https://unifiedcyberontology.org/ontology/uco/core
5-
# imports: https://unifiedcyberontology.org/ontology/uco/location
6-
# imports: https://unifiedcyberontology.org/ontology/uco/role
3+
# imports: https://ontology.unifiedcyberontology.org/uco/action
4+
# imports: https://ontology.unifiedcyberontology.org/uco/core
5+
# imports: https://ontology.unifiedcyberontology.org/uco/location
6+
# imports: https://ontology.unifiedcyberontology.org/uco/role
77

88
@base <https://ontology.caseontology.org/case/investigation> .
99
@prefix investigation: <https://ontology.caseontology.org/case/investigation/> .
1010
@prefix owl: <http://www.w3.org/2002/07/owl#> .
1111
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
1212
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
1313
@prefix sh: <http://www.w3.org/ns/shacl#> .
14-
@prefix uco-action: <https://unifiedcyberontology.org/ontology/uco/action#> .
15-
@prefix uco-core: <https://unifiedcyberontology.org/ontology/uco/core#> .
16-
@prefix uco-role: <https://unifiedcyberontology.org/ontology/uco/role#> .
14+
@prefix uco-action: <https://ontology.unifiedcyberontology.org/uco/action/> .
15+
@prefix uco-core: <https://ontology.unifiedcyberontology.org/uco/core/> .
16+
@prefix uco-role: <https://ontology.unifiedcyberontology.org/uco/role/> .
1717
@prefix vocabulary: <https://ontology.caseontology.org/case/vocabulary/> .
1818
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
1919

@@ -23,10 +23,10 @@
2323
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." ;
2424
owl:imports
2525
<https://ontology.caseontology.org/case/vocabulary> ,
26-
<https://unifiedcyberontology.org/ontology/uco/action> ,
27-
<https://unifiedcyberontology.org/ontology/uco/core> ,
28-
<https://unifiedcyberontology.org/ontology/uco/location> ,
29-
<https://unifiedcyberontology.org/ontology/uco/role>
26+
<https://ontology.unifiedcyberontology.org/uco/action> ,
27+
<https://ontology.unifiedcyberontology.org/uco/core> ,
28+
<https://ontology.unifiedcyberontology.org/uco/location> ,
29+
<https://ontology.unifiedcyberontology.org/uco/role>
3030
;
3131
.
3232

@@ -38,6 +38,7 @@ investigation:Attorney
3838
rdfs:subClassOf uco-role:Role ;
3939
rdfs:label "Attorney"@en ;
4040
rdfs:comment "Attorney is a role involved in preparing, interpreting, and applying law."@en ;
41+
sh:targetClass investigation:Attorney ;
4142
.
4243

4344
investigation:Authorization
@@ -75,6 +76,7 @@ investigation:Authorization
7576
sh:path investigation:authorizationIdentifier ;
7677
]
7778
;
79+
sh:targetClass investigation:Authorization ;
7880
.
7981

8082
investigation:Examiner
@@ -85,6 +87,7 @@ investigation:Examiner
8587
rdfs:subClassOf uco-role:Role ;
8688
rdfs:label "Examiner"@en ;
8789
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 ;
90+
sh:targetClass investigation:Examiner ;
8891
.
8992

9093
investigation:ExaminerActionLifecylce
@@ -95,6 +98,7 @@ investigation:ExaminerActionLifecylce
9598
rdfs:subClassOf uco-action:ActionLifecycle ;
9699
rdfs:label "ExaminerActionLifecylce"@en ;
97100
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 ;
101+
sh:targetClass investigation:ExaminerActionLifecylce ;
98102
.
99103

100104
investigation:Investigation
@@ -142,6 +146,7 @@ investigation:Investigation
142146
sh:path investigation:investigationForm ;
143147
]
144148
;
149+
sh:targetClass investigation:Investigation ;
145150
.
146151

147152
investigation:InvestigativeAction
@@ -157,6 +162,7 @@ investigation:InvestigativeAction
157162
sh:nodeKind sh:BlankNodeOrIRI ;
158163
sh:path investigation:wasInformedBy ;
159164
] ;
165+
sh:targetClass investigation:InvestigativeAction ;
160166
.
161167

162168
investigation:Investigator
@@ -167,6 +173,7 @@ investigation:Investigator
167173
rdfs:subClassOf uco-role:Role ;
168174
rdfs:label "Investigator"@en ;
169175
rdfs:comment "Investigator is a role involved in coordinating an investigation."@en ;
176+
sh:targetClass investigation:Investigator ;
170177
.
171178

172179
investigation:ProvenanceRecord
@@ -191,6 +198,7 @@ investigation:ProvenanceRecord
191198
sh:path investigation:rootExhibitNumber ;
192199
]
193200
;
201+
sh:targetClass investigation:ProvenanceRecord ;
194202
.
195203

196204
investigation:Subject
@@ -201,6 +209,7 @@ investigation:Subject
201209
rdfs:subClassOf uco-role:Role ;
202210
rdfs:label "Subject"@en ;
203211
rdfs:comment "Subject is a role whose conduct is within the scope of an investigation."@en ;
212+
sh:targetClass investigation:Subject ;
204213
.
205214

206215
investigation:SubjectActionLifecycle
@@ -211,6 +220,7 @@ investigation:SubjectActionLifecycle
211220
rdfs:subClassOf uco-action:ActionLifecycle ;
212221
rdfs:label "SubjectActionLifecycle"@en ;
213222
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 ;
223+
sh:targetClass investigation:SubjectActionLifecycle ;
214224
.
215225

216226
investigation:VictimActionLifecycle
@@ -221,6 +231,7 @@ investigation:VictimActionLifecycle
221231
rdfs:subClassOf uco-action:ActionLifecycle ;
222232
rdfs:label "VictimActionLifecycle"@en ;
223233
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 ;
234+
sh:targetClass investigation:VictimActionLifecycle ;
224235
.
225236

226237
investigation:authorizationIdentifier
@@ -240,7 +251,7 @@ investigation:authorizationType
240251
investigation:exhibitNumber
241252
a owl:DatatypeProperty ;
242253
rdfs:label "exhibitNumber"@en ;
243-
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 ;
254+
rdfs:comment "The exhibit number specifies an identifier assigned to a set of objects, unique within the scope of an investigation."@en ;
244255
rdfs:range xsd:string ;
245256
.
246257

@@ -275,7 +286,7 @@ investigation:relevantAuthorization
275286
investigation:rootExhibitNumber
276287
a owl:DatatypeProperty ;
277288
rdfs:label "rootExhibitNumber"@en ;
278-
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 ;
289+
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 ;
279290
rdfs:range xsd:string ;
280291
.
281292

ontology/master/case.ttl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# baseURI: https://ontology.caseontology.org/case/case
22
# imports: https://ontology.caseontology.org/case/investigation
33
# imports: https://ontology.caseontology.org/case/vocabulary
4-
# imports: https://unifiedcyberontology.org/ontology/uco/uco
4+
# imports: https://ontology.unifiedcyberontology.org/uco/uco
55

66
@base <https://ontology.caseontology.org/case/case> .
77
@prefix dct: <http://purl.org/dc/terms/> .
@@ -21,11 +21,11 @@
2121
owl:imports
2222
<https://ontology.caseontology.org/case/investigation> ,
2323
<https://ontology.caseontology.org/case/vocabulary> ,
24-
<https://unifiedcyberontology.org/ontology/uco/uco>
24+
<https://ontology.unifiedcyberontology.org/uco/uco>
2525
;
2626
owl:incompatibleWith <http://case.example.org/core> ;
2727
owl:ontologyIRI <https://ontology.caseontology.org/case/case> ;
2828
owl:priorVersion <http://case.example.org/core> ;
29-
owl:versionInfo "0.5.0" ;
29+
owl:versionInfo "0.6.0" ;
3030
.
3131

tests/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ top_srcdir := $(shell cd .. ; pwd)
1818
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)
1919

2020
case_turtle_files := $(shell /bin/ls $(top_srcdir)/ontology/*/*.ttl)
21-
uco_turtle_files := $(shell /bin/ls $(top_srcdir)/dependencies/UCO/uco-*/*.ttl)
21+
uco_turtle_files := $(shell /bin/ls $(top_srcdir)/dependencies/UCO/ontology/*/*.ttl)
2222

2323
all:
2424

tests/examples/investigative_action_PASS.json

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"@context": {
33
"kb": "http://example.org/kb/",
44
"case-investigation": "https://ontology.caseontology.org/case/investigation/",
5-
"uco-action": "https://unifiedcyberontology.org/ontology/uco/action#",
6-
"uco-core": "https://unifiedcyberontology.org/ontology/uco/core#",
7-
"uco-observable": "https://unifiedcyberontology.org/ontology/uco/observable#",
5+
"uco-action": "https://ontology.unifiedcyberontology.org/uco/action/",
6+
"uco-core": "https://ontology.unifiedcyberontology.org/uco/core/",
7+
"uco-observable": "https://ontology.unifiedcyberontology.org/uco/observable/",
88
"xsd": "http://www.w3.org/2001/XMLSchema#"
99
},
1010
"@graph": [
@@ -31,17 +31,14 @@
3131
{
3232
"@id": "kb:investigative-action-1",
3333
"@type": "case-investigation:InvestigativeAction",
34-
"uco-core:hasFacet": {
35-
"@type": "uco-action:ActionReferencesFacet",
36-
"uco-action:result": [
37-
{
38-
"@id": "kb:file-1"
39-
},
40-
{
41-
"@id": "kb:provenance-record-1"
42-
}
43-
]
44-
},
34+
"uco-action:result": [
35+
{
36+
"@id": "kb:file-1"
37+
},
38+
{
39+
"@id": "kb:provenance-record-1"
40+
}
41+
],
4542
"uco-core:name": "Submit reference graphic"
4643
},
4744
{

tests/examples/investigative_action_XFAIL.json

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"@context": {
33
"kb": "http://example.org/kb/",
44
"case-investigation": "https://ontology.caseontology.org/case/investigation/",
5-
"uco-action": "https://unifiedcyberontology.org/ontology/uco/action#",
6-
"uco-core": "https://unifiedcyberontology.org/ontology/uco/core#",
7-
"uco-observable": "https://unifiedcyberontology.org/ontology/uco/observable#",
5+
"uco-action": "https://ontology.unifiedcyberontology.org/uco/action/",
6+
"uco-core": "https://ontology.unifiedcyberontology.org/uco/core/",
7+
"uco-observable": "https://ontology.unifiedcyberontology.org/uco/observable/",
88
"xsd": "http://www.w3.org/2001/XMLSchema#"
99
},
1010
"@graph": [
@@ -32,17 +32,14 @@
3232
{
3333
"@id": "kb:investigative-action-1",
3434
"@type": "case-investigation:InvestigativeAction",
35-
"uco-core:hasFacet": {
36-
"@type": "uco-action:ActionReferencesFacet",
37-
"uco-action:result": [
38-
{
39-
"@id": "kb:file-1"
40-
},
41-
{
42-
"@id": "kb:provenance-record-1"
43-
}
44-
]
45-
},
35+
"uco-action:result": [
36+
{
37+
"@id": "kb:file-1"
38+
},
39+
{
40+
"@id": "kb:provenance-record-1"
41+
}
42+
],
4643
"uco-core:name": "Submit reference graphic"
4744
},
4845
{

tests/examples/test_validation.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929

3030
NS_CASE_INVESTIGATION = rdflib.Namespace("https://ontology.caseontology.org/case/investigation/")
3131
NS_SH = rdflib.SH
32-
NS_UCO_ACTION = rdflib.Namespace("https://unifiedcyberontology.org/ontology/uco/action#")
33-
NS_UCO_CORE = rdflib.Namespace("https://unifiedcyberontology.org/ontology/uco/core#")
34-
NS_UCO_LOCATION = rdflib.Namespace("https://unifiedcyberontology.org/ontology/uco/location#")
35-
NS_UCO_OBSERVABLE = rdflib.Namespace("https://unifiedcyberontology.org/ontology/uco/observable#")
32+
NS_UCO_ACTION = rdflib.Namespace("https://ontology.unifiedcyberontology.org/uco/action/")
33+
NS_UCO_CORE = rdflib.Namespace("https://ontology.unifiedcyberontology.org/uco/core/")
34+
NS_UCO_LOCATION = rdflib.Namespace("https://ontology.unifiedcyberontology.org/uco/location/")
35+
NS_UCO_OBSERVABLE = rdflib.Namespace("https://ontology.unifiedcyberontology.org/uco/observable/")
3636

3737
NSDICT = {"sh": NS_SH}
3838

0 commit comments

Comments
 (0)