From ce02c851baed355011798178222abd5e8215262b Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 30 Jan 2023 10:34:37 -0500 Subject: [PATCH 01/12] Bump UCO to current state of develop No effects were observed on Make-managed files. Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index 5f77eb9..9245b59 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 5f77eb9e77204488945151773cf6ab66b918a51e +Subproject commit 9245b59d43a581eb865e04271348e34221dd2341 From 6460966b128cc1ef58eccfb3b559fe72d9d8b382 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 14 Mar 2023 15:26:06 -0400 Subject: [PATCH 02/12] Move virtual environment construction to root directory This commit matches the rationale of UCO commit `66d0c38`, in support UCO Issue 449. The UCO submodule pointer is also bumped due to its own motion of virtual environment resources in the commit noted above. References: * https://github.com/ucoProject/UCO/issues/449 * https://github.com/ucoProject/UCO/pull/450/commits/66d0c38e848c8f04271837fda1b2eadcce75da47 --- .gitignore | 1 + Makefile | 47 ++++++++++++++++++++++++++++++++++++--- dependencies/UCO | 2 +- tests/.gitignore | 1 - tests/Makefile | 49 +++++++++-------------------------------- tests/examples/Makefile | 8 +++---- 6 files changed, 61 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index 95f7ebc..961d6f1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ # Unit testing files .*.done.log .*.ttl +venv # Pycharm files .idea diff --git a/Makefile b/Makefile index cac2cac..15fa466 100644 --- a/Makefile +++ b/Makefile @@ -13,9 +13,12 @@ SHELL := /bin/bash -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) +PYTHON3 ?= $(shell which python3) -all: +all: \ + .venv.done.log + $(MAKE) \ + --directory ontology # This recipe guarantees that 'git submodule init' and 'git submodule update' have run at least once. # The recipe avoids running 'git submodule update' more than once, in case a user is testing with the submodule at a different commit than what CASE tracks. @@ -38,8 +41,32 @@ all: .lib.done.log touch $@ +# The two CASE-Utility... files are to trigger rebuilds based on command-line interface changes or version increments. +.venv.done.log: \ + .git_submodule_init.done.log \ + dependencies/UCO/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/case_shacl_inheritance_reviewer/__init__.py \ + dependencies/UCO/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/setup.cfg \ + dependencies/UCO/requirements.txt + rm -rf venv + $(PYTHON3) -m venv \ + venv + source venv/bin/activate \ + && pip install \ + --upgrade \ + pip \ + setuptools \ + wheel + source venv/bin/activate \ + && pip install \ + dependencies/UCO/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer + source venv/bin/activate \ + && pip install \ + --requirement dependencies/UCO/requirements.txt + touch $@ + check: \ - .lib.done.log + .lib.done.log \ + .venv.done.log $(MAKE) \ --directory ontology \ check @@ -70,3 +97,17 @@ clean: ) @rm -f \ .*.done.log + @rm -rf \ + venv + +dependencies/UCO/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/case_shacl_inheritance_reviewer/__init__.py: \ + .git_submodule_init.done.log + $(MAKE) \ + --directory dependencies/UCO \ + dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/case_shacl_inheritance_reviewer/__init__.py + +dependencies/UCO/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/setup.cfg: \ + .git_submodule_init.done.log + $(MAKE) \ + --directory dependencies/UCO \ + dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/setup.cfg diff --git a/dependencies/UCO b/dependencies/UCO index 9245b59..0fd2f71 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 9245b59d43a581eb865e04271348e34221dd2341 +Subproject commit 0fd2f7170a50ec6388e7c4ca0e3b93228eed43c4 diff --git a/tests/.gitignore b/tests/.gitignore index 79839da..e483d2f 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,3 +1,2 @@ case_monolithic.ttl inheritance_review.ttl -venv diff --git a/tests/Makefile b/tests/Makefile index fda3a58..ab00709 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -15,8 +15,6 @@ SHELL := /bin/bash 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/ontology/*/*.ttl $(top_srcdir)/dependencies/UCO/ontology/*/*/*.ttl) @@ -28,55 +26,32 @@ all: # Ensure the CASE-internal shapes pass their own tests. .shapes.done.log: \ - .venv.done.log \ + $(top_srcdir)/.venv.done.log \ shapes/case-qc.ttl $(MAKE) \ --directory shapes \ check touch $@ -# The two CASE-Utility... files are to trigger rebuilds based on command-line interface changes or version increments. -.venv.done.log: \ - $(top_srcdir)/.git_submodule_init.done.log \ - $(top_srcdir)/dependencies/UCO/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/case_shacl_inheritance_reviewer/__init__.py \ - $(top_srcdir)/dependencies/UCO/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer/setup.cfg \ - $(top_srcdir)/dependencies/UCO/tests/requirements.txt - rm -rf venv - $(PYTHON3) -m venv \ - venv - source venv/bin/activate \ - && pip install \ - --upgrade \ - pip \ - setuptools \ - wheel - source venv/bin/activate \ - && pip install \ - $(top_srcdir)/dependencies/UCO/dependencies/CASE-Utility-SHACL-Inheritance-Reviewer - source venv/bin/activate \ - && pip install \ - --requirement $(top_srcdir)/dependencies/UCO/tests/requirements.txt - touch $@ - case_monolithic.ttl: \ $(top_srcdir)/.lib.done.log \ $(top_srcdir)/dependencies/UCO/tests/thing.ttl \ $(case_turtle_files) \ $(uco_turtle_files) \ .shapes.done.log - source venv/bin/activate \ + source $(top_srcdir)/venv/bin/activate \ && rdfpipe \ --output-format turtle \ $(case_turtle_files) \ $(uco_turtle_files) \ > __$@ # Review CASE closure for versioning consistency. - source venv/bin/activate \ + source $(top_srcdir)/venv/bin/activate \ && rdfpipe \ __$@ \ $(imported_ontology_files) \ > ___$@ - source venv/bin/activate \ + source $(top_srcdir)/venv/bin/activate \ && pyshacl \ --data-file-format turtle \ --format turtle \ @@ -85,7 +60,7 @@ case_monolithic.ttl: \ --shacl-file-format turtle \ ___$@ # Review CASE closure with SHACL-SHACL. - source venv/bin/activate \ + source $(top_srcdir)/venv/bin/activate \ && pyshacl \ --data-file-format turtle \ --format turtle \ @@ -97,7 +72,7 @@ case_monolithic.ttl: \ # Closure tests have passed; remove closure file. rm ___$@ # Review CASE for practice conformance. - source venv/bin/activate \ + source $(top_srcdir)/venv/bin/activate \ && pyshacl \ --data-file-format turtle \ --format turtle \ @@ -105,7 +80,7 @@ case_monolithic.ttl: \ --shacl $(top_srcdir)/dependencies/UCO/tests/shapes/uco-qc.ttl \ --shacl-file-format turtle \ __$@ - source venv/bin/activate \ + source $(top_srcdir)/venv/bin/activate \ && pyshacl \ --data-file-format turtle \ --format turtle \ @@ -114,7 +89,7 @@ case_monolithic.ttl: \ --shacl-file-format turtle \ __$@ # Review CASE for OWL 2 DL conformance. - source venv/bin/activate \ + source $(top_srcdir)/venv/bin/activate \ && pyshacl \ --data-file-format turtle \ --format turtle \ @@ -135,7 +110,7 @@ case_monolithic.ttl: \ check: \ inheritance_review.ttl \ case_monolithic.ttl - source venv/bin/activate \ + source $(top_srcdir)/venv/bin/activate \ && pytest \ --ignore examples \ --log-level=DEBUG @@ -150,15 +125,13 @@ clean: @rm -f \ .*.done.log \ case_monolithic.ttl - @rm -rf \ - venv inheritance_review.ttl: \ $(case_turtle_files) \ $(uco_turtle_files) \ - .venv.done.log + $(top_srcdir)/.venv.done.log rm -f _$@ - source venv/bin/activate \ + source $(top_srcdir)/venv/bin/activate \ && case_shacl_inheritance_reviewer \ --strict \ _$@ \ diff --git a/tests/examples/Makefile b/tests/examples/Makefile index 03b782e..b80ad56 100644 --- a/tests/examples/Makefile +++ b/tests/examples/Makefile @@ -35,9 +35,9 @@ all: \ # characteristics. %_validation.ttl: \ %.json \ - $(tests_srcdir)/.venv.done.log \ - $(tests_srcdir)/case_monolithic.ttl - source $(tests_srcdir)/venv/bin/activate \ + $(tests_srcdir)/case_monolithic.ttl \ + $(top_srcdir)/.venv.done.log + source $(top_srcdir)/venv/bin/activate \ && pyshacl \ --data-file-format json-ld \ --format turtle \ @@ -61,7 +61,7 @@ all: \ check: \ investigative_action_PASS_validation.ttl \ investigative_action_XFAIL_validation.ttl - source $(tests_srcdir)/venv/bin/activate \ + source $(top_srcdir)/venv/bin/activate \ && pytest \ --log-level=DEBUG From 1cfe1d04931a97ea57a8db40816d96aa2e1108ec Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 14 Mar 2023 16:23:41 -0400 Subject: [PATCH 03/12] Enable generating catalog files A follow-on patch will regenerate Make-managed files. References: * https://github.com/ucoProject/UCO/issues/449 --- .gitignore | 1 - etc/dependency_files.tsv | 0 etc/domain_directories.tsv | 2 ++ ontology/Makefile | 22 ++++++++++++++++++++- ontology/investigation/Makefile | 34 ++++++++++++++++++++++++++++++--- ontology/master/Makefile | 32 ++++++++++++++++++++++++++++--- ontology/vocabulary/Makefile | 34 ++++++++++++++++++++++++++++++--- 7 files changed, 114 insertions(+), 11 deletions(-) create mode 100644 etc/dependency_files.tsv create mode 100644 etc/domain_directories.tsv diff --git a/.gitignore b/.gitignore index 961d6f1..5f39cdc 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,4 @@ venv .idea # Protege files -catalog-v001.xml .project diff --git a/etc/dependency_files.tsv b/etc/dependency_files.tsv new file mode 100644 index 0000000..e69de29 diff --git a/etc/domain_directories.tsv b/etc/domain_directories.tsv new file mode 100644 index 0000000..aef93ae --- /dev/null +++ b/etc/domain_directories.tsv @@ -0,0 +1,2 @@ +https://ontology.caseontology.org/ ${top_srcdir}/ontology/ +https://ontology.unifiedcyberontology.org/ ${top_srcdir}/dependencies/UCO/ontology/ diff --git a/ontology/Makefile b/ontology/Makefile index dfca17c..21ba472 100644 --- a/ontology/Makefile +++ b/ontology/Makefile @@ -11,11 +11,19 @@ # # We would appreciate acknowledgement if the software is used. -all: +SHELL := /bin/bash top_srcdir := .. +all: \ + all-investigation \ + all-master \ + all-vocabulary + .PHONY: \ + all-investigation \ + all-master \ + all-vocabulary \ check-investigation \ check-master \ check-vocabulary \ @@ -23,6 +31,18 @@ top_srcdir := .. clean-master \ clean-vocabulary +all-investigation: + $(MAKE) \ + --directory investigation + +all-master: + $(MAKE) \ + --directory master + +all-vocabulary: + $(MAKE) \ + --directory vocabulary + check: \ check-master \ check-investigation \ diff --git a/ontology/investigation/Makefile b/ontology/investigation/Makefile index 41c6783..549c381 100644 --- a/ontology/investigation/Makefile +++ b/ontology/investigation/Makefile @@ -11,9 +11,16 @@ # # We would appreciate acknowledgement if the software is used. +SHELL := /bin/bash + top_srcdir := ../.. -all: +uco_srcdir := $(top_srcdir)/dependencies/UCO + +ttl_basenames := investigation.ttl + +all: \ + catalog-v001.xml .check-investigation.ttl: \ $(top_srcdir)/.lib.done.log \ @@ -26,11 +33,32 @@ all: --target-format turtle mv _$@ $@ +catalog-v001.xml: \ + $(top_srcdir)/.venv.done.log \ + $(top_srcdir)/etc/domain_directories.tsv \ + $(top_srcdir)/etc/dependency_files.tsv \ + $(uco_srcdir)/ontology/uco/action/catalog-v001.xml \ + $(uco_srcdir)/ontology/uco/role/catalog-v001.xml \ + $(uco_srcdir)/src/create-catalog-v001.xml.py + rm -f _$@ + source $(top_srcdir)/venv/bin/activate \ + && python3 $(uco_srcdir)/src/create-catalog-v001.xml.py \ + --catalog-xml $(uco_srcdir)/ontology/uco/action/catalog-v001.xml \ + --catalog-xml $(uco_srcdir)/ontology/uco/role/catalog-v001.xml \ + _$@ \ + $(top_srcdir)/etc/domain_directories.tsv \ + $(top_srcdir)/etc/dependency_files.tsv \ + "$(top_srcdir)" \ + $(ttl_basenames) + mv _$@ $@ + check: \ - .check-investigation.ttl + .check-investigation.ttl \ + catalog-v001.xml diff investigation.ttl .check-investigation.ttl clean: @rm -f \ .check-*.ttl \ - _* + _* \ + catalog-v001.xml diff --git a/ontology/master/Makefile b/ontology/master/Makefile index ae8b494..f2420e4 100644 --- a/ontology/master/Makefile +++ b/ontology/master/Makefile @@ -11,9 +11,16 @@ # # We would appreciate acknowledgement if the software is used. +SHELL := /bin/bash + top_srcdir := ../.. -all: +uco_srcdir := $(top_srcdir)/dependencies/UCO + +ttl_basenames := case.ttl + +all: \ + catalog-v001.xml .check-case.ttl: \ $(top_srcdir)/.lib.done.log \ @@ -26,11 +33,30 @@ all: --target-format turtle mv _$@ $@ +catalog-v001.xml: \ + $(top_srcdir)/.venv.done.log \ + $(top_srcdir)/etc/domain_directories.tsv \ + $(top_srcdir)/etc/dependency_files.tsv \ + $(uco_srcdir)/ontology/uco/master/catalog-v001.xml \ + $(uco_srcdir)/src/create-catalog-v001.xml.py + rm -f _$@ + source $(top_srcdir)/venv/bin/activate \ + && python3 $(uco_srcdir)/src/create-catalog-v001.xml.py \ + --catalog-xml $(uco_srcdir)/ontology/uco/master/catalog-v001.xml \ + _$@ \ + $(top_srcdir)/etc/domain_directories.tsv \ + $(top_srcdir)/etc/dependency_files.tsv \ + "$(top_srcdir)" \ + $(ttl_basenames) + mv _$@ $@ + check: \ - .check-case.ttl + .check-case.ttl \ + catalog-v001.xml diff case.ttl .check-case.ttl clean: @rm -f \ .check-*.ttl \ - _* + _* \ + catalog-v001.xml diff --git a/ontology/vocabulary/Makefile b/ontology/vocabulary/Makefile index 5878a57..1e8522e 100644 --- a/ontology/vocabulary/Makefile +++ b/ontology/vocabulary/Makefile @@ -11,9 +11,16 @@ # # We would appreciate acknowledgement if the software is used. +SHELL := /bin/bash + top_srcdir := ../.. -all: +uco_srcdir := $(top_srcdir)/dependencies/UCO + +ttl_basenames := vocabulary.ttl + +all: \ + catalog-v001.xml .check-vocabulary.ttl: \ $(top_srcdir)/.lib.done.log \ @@ -26,11 +33,32 @@ all: --target-format turtle mv _$@ $@ +catalog-v001.xml: \ + $(top_srcdir)/.venv.done.log \ + $(top_srcdir)/etc/domain_directories.tsv \ + $(top_srcdir)/etc/dependency_files.tsv \ + $(uco_srcdir)/ontology/uco/action/catalog-v001.xml \ + $(uco_srcdir)/ontology/uco/role/catalog-v001.xml \ + $(uco_srcdir)/src/create-catalog-v001.xml.py + rm -f _$@ + source $(top_srcdir)/venv/bin/activate \ + && python3 $(uco_srcdir)/src/create-catalog-v001.xml.py \ + --catalog-xml $(uco_srcdir)/ontology/uco/action/catalog-v001.xml \ + --catalog-xml $(uco_srcdir)/ontology/uco/role/catalog-v001.xml \ + _$@ \ + $(top_srcdir)/etc/domain_directories.tsv \ + $(top_srcdir)/etc/dependency_files.tsv \ + "$(top_srcdir)" \ + $(ttl_basenames) + mv _$@ $@ + check: \ - .check-vocabulary.ttl + .check-vocabulary.ttl \ + catalog-v001.xml diff vocabulary.ttl .check-vocabulary.ttl clean: @rm -f \ .check-*.ttl \ - _* + _* \ + catalog-v001.xml From bbf4972abfd78ee18c407a0b1c13a39267a7843e Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 14 Mar 2023 23:10:19 -0400 Subject: [PATCH 04/12] Regenerate Make-managed files References: * https://github.com/ucoProject/UCO/issues/449 Signed-off-by: Alex Nelson --- ontology/investigation/catalog-v001.xml | 15 ++++++++++++++ ontology/master/catalog-v001.xml | 26 +++++++++++++++++++++++++ ontology/vocabulary/catalog-v001.xml | 4 ++++ 3 files changed, 45 insertions(+) create mode 100644 ontology/investigation/catalog-v001.xml create mode 100644 ontology/master/catalog-v001.xml create mode 100644 ontology/vocabulary/catalog-v001.xml diff --git a/ontology/investigation/catalog-v001.xml b/ontology/investigation/catalog-v001.xml new file mode 100644 index 0000000..dfa4989 --- /dev/null +++ b/ontology/investigation/catalog-v001.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/ontology/master/catalog-v001.xml b/ontology/master/catalog-v001.xml new file mode 100644 index 0000000..2ba813b --- /dev/null +++ b/ontology/master/catalog-v001.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ontology/vocabulary/catalog-v001.xml b/ontology/vocabulary/catalog-v001.xml new file mode 100644 index 0000000..51ede9a --- /dev/null +++ b/ontology/vocabulary/catalog-v001.xml @@ -0,0 +1,4 @@ + + + + From 3185d5fedee057cb5f7877d3e79c15e0b8f246b6 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 14 Mar 2023 23:38:19 -0400 Subject: [PATCH 05/12] =?UTF-8?q?Port=20Prot=C3=A9g=C3=A9=20usage=20docume?= =?UTF-8?q?ntation=20from=20new=20UCO=20text?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alex Nelson --- CONTRIBUTE.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md index 4bacd61..154fc45 100644 --- a/CONTRIBUTE.md +++ b/CONTRIBUTE.md @@ -4,3 +4,14 @@ ## Testing prerelease states Practices for users interested in testing prerelease states are documented on the [Cyber Domain Ontology website](https://cyberdomainontology.org/ontology/development/#testing-prereleases). + + +## Using Protégé catalog files + +Interested users of `catalog-v001.xml` files, e.g. users of [Protégé](https://protege.stanford.edu/), can use these XML files to interact with CASE as local files. To do so, CASE must be `git-clone`'d with Git submodules also cloned. This can be done with the following commands: + +* `git clone --recursive https://github.com/casework/CASE.git` (all users) +* `git clone https://github.com/casework/CASE.git ; cd CASE ; make` (macOS or Linux users) + - The narrowest setup operation strictly for purposes of supporting the `catalog-v001.xml` files is to run `make .git_submodule_init.done.log` instead of the default `make all`. + +Protégé should not require network connectivity to load imported ontologies after the above commands are run. From 324d52bcbd39c2d42434257d4a2ce6e4c17d469a Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 28 Mar 2023 08:53:41 -0400 Subject: [PATCH 06/12] Bump UCO to current state of develop No effects were observed on Make-managed files. Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index 0fd2f71..185118f 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 0fd2f7170a50ec6388e7c4ca0e3b93228eed43c4 +Subproject commit 185118f0a48390a07687cacb39dcfbbe2d37fd52 From 373d9936494bc695c42b772067592cf531c16c30 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 28 Mar 2023 14:12:54 -0400 Subject: [PATCH 07/12] Bump UCO to 1.2.0 prerelease state; update import IRIs A follow-on patch will regenerate Make-managed files. Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- ontology/investigation/investigation.ttl | 8 ++++---- ontology/master/case.ttl | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies/UCO b/dependencies/UCO index 185118f..235f90d 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 185118f0a48390a07687cacb39dcfbbe2d37fd52 +Subproject commit 235f90d5411faea0821c187847f233a1c796986f diff --git a/ontology/investigation/investigation.ttl b/ontology/investigation/investigation.ttl index 4dfcdea..93b8e9e 100644 --- a/ontology/investigation/investigation.ttl +++ b/ontology/investigation/investigation.ttl @@ -1,6 +1,6 @@ # imports: https://ontology.caseontology.org/case/vocabulary/1.1.0 -# imports: https://ontology.unifiedcyberontology.org/uco/action/1.1.0 -# imports: https://ontology.unifiedcyberontology.org/uco/role/1.1.0 +# imports: https://ontology.unifiedcyberontology.org/uco/action/1.2.0 +# imports: https://ontology.unifiedcyberontology.org/uco/role/1.2.0 @prefix investigation: . @prefix owl: . @@ -20,8 +20,8 @@ owl:backwardCompatibleWith investigation:1.0.0 ; owl:imports vocabulary:1.1.0 , - uco-action:1.1.0 , - uco-role:1.1.0 + uco-action:1.2.0 , + uco-role:1.2.0 ; owl:priorVersion investigation:1.0.0 ; owl:versionIRI investigation:1.1.0 ; diff --git a/ontology/master/case.ttl b/ontology/master/case.ttl index 2fd7d48..82b2659 100644 --- a/ontology/master/case.ttl +++ b/ontology/master/case.ttl @@ -1,6 +1,6 @@ # imports: https://ontology.caseontology.org/case/investigation/1.1.0 # imports: https://ontology.caseontology.org/case/vocabulary/1.1.0 -# imports: https://ontology.unifiedcyberontology.org/uco/uco/1.1.0 +# imports: https://ontology.unifiedcyberontology.org/uco/uco/1.2.0 @prefix dct: . @prefix owl: . @@ -20,7 +20,7 @@ owl:imports , , - + ; owl:priorVersion ; owl:versionIRI ; From 1a65a68e7f7567e8bf0564336d83f11106229294 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 28 Mar 2023 14:17:07 -0400 Subject: [PATCH 08/12] Regenerate Make-managed files Signed-off-by: Alex Nelson --- ontology/investigation/catalog-v001.xml | 16 +++++------ ontology/master/catalog-v001.xml | 36 ++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ontology/investigation/catalog-v001.xml b/ontology/investigation/catalog-v001.xml index dfa4989..24563ea 100644 --- a/ontology/investigation/catalog-v001.xml +++ b/ontology/investigation/catalog-v001.xml @@ -2,14 +2,14 @@ - - - - - - - - + + + + + + + + diff --git a/ontology/master/catalog-v001.xml b/ontology/master/catalog-v001.xml index 2ba813b..92b63f9 100644 --- a/ontology/master/catalog-v001.xml +++ b/ontology/master/catalog-v001.xml @@ -2,24 +2,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + From 05bcab011fda1938d4723d4f2d5657328a64326b Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 28 Mar 2023 14:19:12 -0400 Subject: [PATCH 09/12] Bump version A follow-on patch will regenerate Make-managed files. Signed-off-by: Alex Nelson --- ontology/investigation/investigation.ttl | 10 +++++----- ontology/master/case.ttl | 16 ++++++++-------- ontology/vocabulary/vocabulary.ttl | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ontology/investigation/investigation.ttl b/ontology/investigation/investigation.ttl index 93b8e9e..4437d10 100644 --- a/ontology/investigation/investigation.ttl +++ b/ontology/investigation/investigation.ttl @@ -1,4 +1,4 @@ -# imports: https://ontology.caseontology.org/case/vocabulary/1.1.0 +# imports: https://ontology.caseontology.org/case/vocabulary/1.2.0 # imports: https://ontology.unifiedcyberontology.org/uco/action/1.2.0 # imports: https://ontology.unifiedcyberontology.org/uco/role/1.2.0 @@ -17,14 +17,14 @@ a owl:Ontology ; rdfs:label "investigation"@en ; 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:backwardCompatibleWith investigation:1.0.0 ; + owl:backwardCompatibleWith investigation:1.1.0 ; owl:imports - vocabulary:1.1.0 , + vocabulary:1.2.0 , uco-action:1.2.0 , uco-role:1.2.0 ; - owl:priorVersion investigation:1.0.0 ; - owl:versionIRI investigation:1.1.0 ; + owl:priorVersion investigation:1.1.0 ; + owl:versionIRI investigation:1.2.0 ; . investigation:Attorney diff --git a/ontology/master/case.ttl b/ontology/master/case.ttl index 82b2659..4806688 100644 --- a/ontology/master/case.ttl +++ b/ontology/master/case.ttl @@ -1,5 +1,5 @@ -# imports: https://ontology.caseontology.org/case/investigation/1.1.0 -# imports: https://ontology.caseontology.org/case/vocabulary/1.1.0 +# imports: https://ontology.caseontology.org/case/investigation/1.2.0 +# imports: https://ontology.caseontology.org/case/vocabulary/1.2.0 # imports: https://ontology.unifiedcyberontology.org/uco/uco/1.2.0 @prefix dct: . @@ -16,14 +16,14 @@ rdfs:label "case-master"@en ; 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 ; dct:title "Cyber-investigation Analysis Standard Expression (CASE)"@en ; - owl:backwardCompatibleWith ; + owl:backwardCompatibleWith ; owl:imports - , - , + , + , ; - owl:priorVersion ; - owl:versionIRI ; - owl:versionInfo "1.1.0" ; + owl:priorVersion ; + owl:versionIRI ; + owl:versionInfo "1.2.0" ; . diff --git a/ontology/vocabulary/vocabulary.ttl b/ontology/vocabulary/vocabulary.ttl index 9861210..6798df0 100644 --- a/ontology/vocabulary/vocabulary.ttl +++ b/ontology/vocabulary/vocabulary.ttl @@ -7,9 +7,9 @@ a owl:Ontology ; rdfs:label "vocabularies"@en ; - owl:backwardCompatibleWith vocab:1.0.0 ; - owl:priorVersion vocab:1.0.0 ; - owl:versionIRI vocab:1.1.0 ; + owl:backwardCompatibleWith vocab:1.1.0 ; + owl:priorVersion vocab:1.1.0 ; + owl:versionIRI vocab:1.2.0 ; . vocab:InvestigationFormVocab From 7bd5a457f2f1a6e051a016a9bdd12dfee9d06afb Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 28 Mar 2023 14:28:53 -0400 Subject: [PATCH 10/12] Regenerate Make-managed files Signed-off-by: Alex Nelson --- ontology/investigation/catalog-v001.xml | 2 +- ontology/master/catalog-v001.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ontology/investigation/catalog-v001.xml b/ontology/investigation/catalog-v001.xml index 24563ea..ff2f784 100644 --- a/ontology/investigation/catalog-v001.xml +++ b/ontology/investigation/catalog-v001.xml @@ -10,6 +10,6 @@ - + diff --git a/ontology/master/catalog-v001.xml b/ontology/master/catalog-v001.xml index 92b63f9..42c3cfd 100644 --- a/ontology/master/catalog-v001.xml +++ b/ontology/master/catalog-v001.xml @@ -20,7 +20,7 @@ - - + + From b2315904a38aa349dbd61a178d1373f742728fc0 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 28 Mar 2023 15:31:49 -0400 Subject: [PATCH 11/12] Log changes Signed-off-by: Alex Nelson --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 80ff924..a1e83ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2023-03-28 + * (0cb7b85) UCO Issue 449: Enable generating Protégé catalog files + 2022-11-22 * ONT-491: Release CASE 1.1.0, with release notes at https://caseontology.org/releases/1.1.0/ From 74aed3b4e72c3fa7e23dac66dc514d52b89fc667 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 29 Mar 2023 07:20:53 -0400 Subject: [PATCH 12/12] Bump UCO pointer to 1.2.0 release No effects were observed on Make-managed files. Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index 235f90d..5bb9243 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 235f90d5411faea0821c187847f233a1c796986f +Subproject commit 5bb9243e62a9978fcf0e9f6e9e5ce19d6a254135