Skip to content

Commit 4099927

Browse files
ajnelson-nistajnelson-nist
authored
Merge pull request #109 from casework/release-0.7.1
Release 0.7.1
2 parents 760c954 + 101c9ed commit 4099927

File tree

11 files changed

+196
-34
lines changed

11 files changed

+196
-34
lines changed

‎ChangeLog

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1-
2022-06-16
1+
2022-08-31
2+
* ONT-410: Release CASE 0.7.1, with release notes at https://caseontology.org/releases/0.7.1/
3+
* (5b8c03f): UCO Issue 437: Adopt UCO 0.9.1
4+
* (e673017): UCO OC-217, CP-107: Revise ontology IRI to be slash-based and drop IRI base
5+
* (0e7337e): UCO Issue 437: Adopt versionIRI practice prepared for UCO 0.9.1
6+
7+
2022-06-17
28
* ONT-476: Release CASE 0.7.0, with release notes at https://caseontology.org/releases/0.7.0/
9+
10+
2022-06-16
311
* (3d13cc1): Adopt UCO 0.9.0
412

513
2022-06-14

‎dependencies/UCO

Submodule UCO updated 39 files

‎ontology/investigation/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ all:
1919
$(top_srcdir)/.lib.done.log \
2020
investigation.ttl
2121
java -jar $(top_srcdir)/dependencies/UCO/lib/rdf-toolkit.jar \
22-
--infer-base-iri \
2322
--inline-blank-nodes \
2423
--source investigation.ttl \
2524
--source-format turtle \

‎ontology/investigation/investigation.ttl

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
# baseURI: https://ontology.caseontology.org/case/investigation
2-
# imports: https://ontology.caseontology.org/case/vocabulary
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
1+
# imports: https://ontology.caseontology.org/case/vocabulary/0.7.1
2+
# imports: https://ontology.unifiedcyberontology.org/uco/action/0.9.1
3+
# imports: https://ontology.unifiedcyberontology.org/uco/role/0.9.1
74

8-
@base <https://ontology.caseontology.org/case/investigation> .
95
@prefix investigation: <https://ontology.caseontology.org/case/investigation/> .
106
@prefix owl: <http://www.w3.org/2002/07/owl#> .
117
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@@ -22,12 +18,12 @@
2218
rdfs:label "investigation"@en ;
2319
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." ;
2420
owl:imports
25-
<https://ontology.caseontology.org/case/vocabulary> ,
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>
21+
vocabulary:0.7.1 ,
22+
uco-action:0.9.1 ,
23+
uco-role:0.9.1
3024
;
25+
owl:ontologyIRI <https://ontology.caseontology.org/case/investigation> ;
26+
owl:versionIRI investigation:0.7.1 ;
3127
.
3228

3329
investigation:Attorney

‎ontology/master/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ all:
1919
$(top_srcdir)/.lib.done.log \
2020
case.ttl
2121
java -jar $(top_srcdir)/dependencies/UCO/lib/rdf-toolkit.jar \
22-
--infer-base-iri \
2322
--inline-blank-nodes \
2423
--source case.ttl \
2524
--source-format turtle \

‎ontology/master/case.ttl

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
# baseURI: https://ontology.caseontology.org/case/case
2-
# imports: https://ontology.caseontology.org/case/investigation
3-
# imports: https://ontology.caseontology.org/case/vocabulary
4-
# imports: https://ontology.unifiedcyberontology.org/uco/uco
1+
# imports: https://ontology.caseontology.org/case/investigation/0.7.1
2+
# imports: https://ontology.caseontology.org/case/vocabulary/0.7.1
3+
# imports: https://ontology.unifiedcyberontology.org/uco/uco/0.9.1
54

6-
@base <https://ontology.caseontology.org/case/case> .
75
@prefix dct: <http://purl.org/dc/terms/> .
86
@prefix owl: <http://www.w3.org/2002/07/owl#> .
97
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@@ -19,13 +17,12 @@
1917
rdfs:comment "The Cyber-investigation Analysis Standard Expression (CASE) ontology is a community-developed standard that defines concepts used in a broad range of cyber-investigation domains, including digital forensic science, incident response, counter-terrorism, criminal justice, forensic intelligence, and situational awareness. CASE includes all aspects of the digital forensic process, from evidence-gathering and chain of custody, to generating a final report. The goal is to increase sharing and interoperability of cyber-investigation information among organizations and between forensic analytic tools. CASE aligns with and extends the Unified Cyber Ontology (UCO). The preferred namespace abbreviation for this ontology is: case-master."@en ;
2018
dct:title "Cyber-investigation Analysis Standard Expression (CASE)"@en ;
2119
owl:imports
22-
<https://ontology.caseontology.org/case/investigation> ,
23-
<https://ontology.caseontology.org/case/vocabulary> ,
24-
<https://ontology.unifiedcyberontology.org/uco/uco>
20+
<https://ontology.caseontology.org/case/investigation/0.7.1> ,
21+
<https://ontology.caseontology.org/case/vocabulary/0.7.1> ,
22+
<https://ontology.unifiedcyberontology.org/uco/uco/0.9.1>
2523
;
26-
owl:incompatibleWith <http://case.example.org/core> ;
2724
owl:ontologyIRI <https://ontology.caseontology.org/case/case> ;
28-
owl:priorVersion <http://case.example.org/core> ;
29-
owl:versionInfo "0.7.0" ;
25+
owl:versionIRI <https://ontology.caseontology.org/case/case/0.7.1> ;
26+
owl:versionInfo "0.7.1" ;
3027
.
3128

‎ontology/vocabulary/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ all:
1919
$(top_srcdir)/.lib.done.log \
2020
vocabulary.ttl
2121
java -jar $(top_srcdir)/dependencies/UCO/lib/rdf-toolkit.jar \
22-
--infer-base-iri \
2322
--inline-blank-nodes \
2423
--source vocabulary.ttl \
2524
--source-format turtle \

‎ontology/vocabulary/vocabulary.ttl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# baseURI: https://ontology.caseontology.org/case/vocabulary
2-
3-
@base <https://ontology.caseontology.org/case/vocabulary> .
41
@prefix owl: <http://www.w3.org/2002/07/owl#> .
52
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
63
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -10,6 +7,8 @@
107
<https://ontology.caseontology.org/case/vocabulary>
118
a owl:Ontology ;
129
rdfs:label "vocabularies"@en ;
10+
owl:ontologyIRI <https://ontology.caseontology.org/case/vocabulary> ;
11+
owl:versionIRI vocab:0.7.1 ;
1312
.
1413

1514
vocab:InvestigationFormVocab

‎tests/Makefile

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,15 @@ uco_turtle_files := $(shell /bin/ls $(top_srcdir)/dependencies/UCO/ontology/*/*.
2222

2323
all:
2424

25+
# Ensure the CASE-internal shapes pass their own tests.
26+
.shapes.done.log: \
27+
.venv.done.log \
28+
shapes/case-qc.ttl
29+
$(MAKE) \
30+
--directory shapes \
31+
check
32+
touch $@
33+
2534
# The two CASE-Utility... files are to trigger rebuilds based on command-line interface changes or version increments.
2635
.venv.done.log: \
2736
$(top_srcdir)/.git_submodule_init.done.log \
@@ -50,14 +59,46 @@ case_monolithic.ttl: \
5059
$(top_srcdir)/dependencies/UCO/tests/src/glom_graph.py \
5160
$(case_turtle_files) \
5261
$(uco_turtle_files) \
53-
.venv.done.log
62+
.shapes.done.log
5463
source venv/bin/activate \
5564
&& python3 $(top_srcdir)/dependencies/UCO/tests/src/glom_graph.py \
5665
__$@ \
5766
$(case_turtle_files) \
5867
$(uco_turtle_files)
68+
# Review CASE for OWL 2 DL versioning conformance.
69+
source venv/bin/activate \
70+
&& pyshacl \
71+
--data-file-format turtle \
72+
--format turtle \
73+
--inference none \
74+
--shacl $(top_srcdir)/dependencies/UCO/tests/shapes/uco-owl.ttl \
75+
--shacl-file-format turtle \
76+
__$@
77+
source venv/bin/activate \
78+
&& pyshacl \
79+
--data-file-format turtle \
80+
--format turtle \
81+
--inference none \
82+
--shacl $(top_srcdir)/dependencies/UCO/tests/shapes/uco-closure-qc.ttl \
83+
--shacl-file-format turtle \
84+
__$@
85+
source venv/bin/activate \
86+
&& pyshacl \
87+
--data-file-format turtle \
88+
--format turtle \
89+
--inference none \
90+
--shacl $(top_srcdir)/dependencies/UCO/tests/shapes/uco-qc.ttl \
91+
--shacl-file-format turtle \
92+
__$@
93+
source venv/bin/activate \
94+
&& pyshacl \
95+
--data-file-format turtle \
96+
--format turtle \
97+
--inference none \
98+
--shacl shapes/case-qc.ttl \
99+
--shacl-file-format turtle \
100+
__$@
59101
java -jar $(top_srcdir)/dependencies/UCO/lib/rdf-toolkit.jar \
60-
--infer-base-iri \
61102
--inline-blank-nodes \
62103
--source __$@ \
63104
--source-format turtle \
@@ -79,7 +120,7 @@ clean:
79120
--directory examples \
80121
clean
81122
@rm -f \
82-
.venv.done.log \
123+
.*.done.log \
83124
case_monolithic.ttl
84125
@rm -rf \
85126
venv

‎tests/shapes/Makefile

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
#!/usr/bin/make -f
2+
3+
# This software was developed at the National Institute of Standards
4+
# and Technology by employees of the Federal Government in the course
5+
# of their official duties. Pursuant to title 17 Section 105 of the
6+
# United States Code this software is not subject to copyright
7+
# protection and is in the public domain. NIST assumes no
8+
# responsibility whatsoever for its use by other parties, and makes
9+
# no guarantees, expressed or implied, about its quality,
10+
# reliability, or any other characteristic.
11+
#
12+
# We would appreciate acknowledgement if the software is used.
13+
14+
SHELL := /bin/bash
15+
16+
top_srcdir := $(shell cd ../.. ; pwd)
17+
18+
tests_srcdir := $(top_srcdir)/tests
19+
20+
all: \
21+
.check-case-qc.ttl
22+
23+
.PHONY: \
24+
check-%.ttl
25+
26+
.PRECIOUS: \
27+
.check-%.ttl
28+
29+
.check-%.ttl: \
30+
%.ttl \
31+
$(top_srcdir)/.lib.done.log
32+
java -jar $(top_srcdir)/dependencies/UCO/lib/rdf-toolkit.jar \
33+
--inline-blank-nodes \
34+
--source $< \
35+
--source-format turtle \
36+
--target $@_ \
37+
--target-format turtle
38+
mv $@_ $@
39+
40+
check: \
41+
check-case-qc.ttl
42+
43+
# Reminder: diff exits non-0 on finding any differences.
44+
# Reminder: The $^ automatic Make variable is the name of all recipe prerequisites.
45+
check-%.ttl: \
46+
%.ttl \
47+
.check-%.ttl
48+
diff $^ \
49+
|| (echo "ERROR:tests/shapes/Makefile:The local $< does not match the normalized version. If the above reported changes look fine, run 'cp .check-$< $<' while in the sub-folder tests/shapes/ to get a file ready to commit to Git." >&2 ; exit 1)
50+
51+
clean:
52+
@rm -f \
53+
.check-*.ttl*

0 commit comments

Comments
 (0)