From 49dd8f39b621e8e8dd955f2b064c431f2c630c12 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 24 Jan 2024 16:09:20 -0500 Subject: [PATCH 01/26] Bump UCO to post-1.3.0 develop state 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 9f16831..250f5cc 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 9f168313453bb577141248e3968198bc00e7d39b +Subproject commit 250f5cc9bceaef052b690d65f82d88979e95a584 From ad7eab35d1c1e10c3c8a97b8e6aeef4d9c9b4633 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 30 Apr 2024 14:25:27 -0400 Subject: [PATCH 02/26] Bump UCO to current state of develop No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/573 * https://github.com/ucoProject/UCO/issues/584 * https://github.com/ucoProject/UCO/issues/599 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index 250f5cc..27ca6b0 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 250f5cc9bceaef052b690d65f82d88979e95a584 +Subproject commit 27ca6b0eed4fbd0943c945f9c3bb6181cc8a6b9d From 61241be02d23927c48768dbdcb3eaa680806b39e Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 10 Jun 2024 09:11:28 -0400 Subject: [PATCH 03/26] Bump UCO to current state of develop No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/586 * https://github.com/ucoProject/UCO/issues/590 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index 27ca6b0..fde4cdd 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 27ca6b0eed4fbd0943c945f9c3bb6181cc8a6b9d +Subproject commit fde4cddbd68a65e5e173598a6b4a46c25bb108ce From 2812fb3cd4dc5ffbf079e88e46697960f82e471e Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 17 Jun 2024 10:37:47 -0400 Subject: [PATCH 04/26] Bump UCO to current state of develop No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/586 * https://github.com/ucoProject/UCO/pull/609 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index fde4cdd..c4294c7 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit fde4cddbd68a65e5e173598a6b4a46c25bb108ce +Subproject commit c4294c70e97b99eae9baa9ec05d3f4203d37595e From 2f17d94cfc0124dac9671dae252480aea487e7d7 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Fri, 26 Jul 2024 09:22:27 -0400 Subject: [PATCH 05/26] Bump UCO to current state of develop No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/pull/602 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index c4294c7..9a355e4 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit c4294c70e97b99eae9baa9ec05d3f4203d37595e +Subproject commit 9a355e43c60958a63159ac9733fa1bceed22b895 From 8d5148a8e685e70f1d4afcb8a5efea2793063dcf Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Fri, 30 Aug 2024 13:43:21 -0400 Subject: [PATCH 06/26] Bump UCO to current state of develop No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/549 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index 9a355e4..74e9f5a 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 9a355e43c60958a63159ac9733fa1bceed22b895 +Subproject commit 74e9f5a68c8a42de5aedb1b77533e1919e638c44 From b2024549d89768e1773334c16ec05a1ea2ec8328 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 11 Sep 2024 10:09:02 -0400 Subject: [PATCH 07/26] Remove owl:onDatatype from vocabulary definitions No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/593 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- ontology/vocabulary/vocabulary.ttl | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dependencies/UCO b/dependencies/UCO index 9a355e4..becf55e 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 9a355e43c60958a63159ac9733fa1bceed22b895 +Subproject commit becf55e731f6099c704cf77e06839dff83e78a02 diff --git a/ontology/vocabulary/vocabulary.ttl b/ontology/vocabulary/vocabulary.ttl index 080e956..b470af5 100644 --- a/ontology/vocabulary/vocabulary.ttl +++ b/ontology/vocabulary/vocabulary.ttl @@ -18,7 +18,6 @@ vocab:InvestigationFormVocab rdfs:comment "Defines an open-vocabulary of investigation forms."@en-US ; owl:equivalentClass [ a rdfs:Datatype ; - owl:onDatatype xsd:string ; owl:oneOf ( "case"^^vocab:InvestigationFormVocab "incident"^^vocab:InvestigationFormVocab From 10f36f694552187c40c66d7e834cc3067d9d03af Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 10:13:03 -0400 Subject: [PATCH 08/26] Bump UCO to state of `develop` incorporating Issue 612 No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/612 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index 74e9f5a..178efd0 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 74e9f5a68c8a42de5aedb1b77533e1919e638c44 +Subproject commit 178efd0a021e1c592f455de18c48d2c6259b27e9 From bd3ea32f75a60080437a9d367e60da47f3cddcf5 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 16 Oct 2024 11:12:36 -0400 Subject: [PATCH 09/26] Bump UCO to current state of `develop` No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/593 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index becf55e..fe4c001 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit becf55e731f6099c704cf77e06839dff83e78a02 +Subproject commit fe4c0017609d1dcedf39b1d5f85b2cda98833379 From b4048372d0ba867c8014cac250159f772a7519e6 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 28 Oct 2024 11:44:08 -0400 Subject: [PATCH 10/26] UCO Issue 640: Link core:informalType as parent of type-describing properties Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- ontology/investigation/investigation.ttl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index fe4c001..904db37 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit fe4c0017609d1dcedf39b1d5f85b2cda98833379 +Subproject commit 904db371b775eaf78d40ea16d95ac97d083fb293 diff --git a/ontology/investigation/investigation.ttl b/ontology/investigation/investigation.ttl index fa1b970..532a702 100644 --- a/ontology/investigation/investigation.ttl +++ b/ontology/investigation/investigation.ttl @@ -267,6 +267,7 @@ investigation:authorizationIdentifier investigation:authorizationType a owl:DatatypeProperty ; + rdfs:subPropertyOf uco-core:informalType ; rdfs:label "authorizationType"@en ; rdfs:comment "A label categorizing a type of authorization (e.g. warrant)"@en ; rdfs:range xsd:string ; @@ -288,6 +289,7 @@ investigation:focus investigation:investigationForm a owl:DatatypeProperty ; + rdfs:subPropertyOf uco-core:informalType ; rdfs:label "investigationForm"@en ; rdfs:comment "A label categorizing a type of investigation (case, incident, suspicious-activity, etc.)"@en ; rdfs:range [ From cc5535e2b3f1b4c1476891d6d662fc0068ea707f Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 29 Oct 2024 12:05:58 -0400 Subject: [PATCH 11/26] Bump UCO to current state of develop References: * https://github.com/ucoProject/UCO/pull/638 * https://github.com/ucoProject/UCO/pull/639 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index fe4c001..13d372c 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit fe4c0017609d1dcedf39b1d5f85b2cda98833379 +Subproject commit 13d372c8933160781216b93e7ef7fecbe2d69256 From 820d63de3440696ce3b452b8936cbb734c466263 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 29 Oct 2024 12:06:35 -0400 Subject: [PATCH 12/26] Bump GitHub Action versions References: * https://github.com/ucoProject/UCO/pull/639 Signed-off-by: Alex Nelson --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7160391..f285f82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,8 +26,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '11' From 2eb3991992cd61146642508b5ada81202fbd918c Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 7 Nov 2024 08:57:02 -0500 Subject: [PATCH 13/26] Bump UCO to current state of develop References: * https://github.com/ucoProject/UCO/pull/642 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index 13d372c..e147273 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 13d372c8933160781216b93e7ef7fecbe2d69256 +Subproject commit e1472736b2dc7cb2e20c2072e817eea3c7a4ab02 From f759e475f0ea7b8831034a0e994b3edd7cee0041 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 7 Nov 2024 09:00:29 -0500 Subject: [PATCH 14/26] Update NIST licensing text No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/pull/642 Signed-off-by: Alex Nelson --- .github/workflows/ci.yml | 15 +++++++++------ Makefile | 15 +++++++++------ ontology/Makefile | 15 +++++++++------ ontology/investigation/Makefile | 15 +++++++++------ ontology/master/Makefile | 15 +++++++++------ ontology/vocabulary/Makefile | 15 +++++++++------ tests/Makefile | 15 +++++++++------ tests/examples/Makefile | 15 +++++++++------ tests/examples/test_validation.py | 15 +++++++++------ tests/shapes/Makefile | 15 +++++++++------ tests/test_case_monolithic.py | 15 +++++++++------ 11 files changed, 99 insertions(+), 66 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f285f82..fe16600 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,11 +1,14 @@ +# Portions of this file contributed by NIST are governed by the +# following statement: +# # This software was developed at the National Institute of Standards # and Technology by employees of the Federal Government in the course -# of their official duties. Pursuant to title 17 Section 105 of the -# United States Code this software is not subject to copyright -# protection and is in the public domain. NIST assumes no -# responsibility whatsoever for its use by other parties, and makes -# no guarantees, expressed or implied, about its quality, -# reliability, or any other characteristic. +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. # # We would appreciate acknowledgement if the software is used. diff --git a/Makefile b/Makefile index 15fa466..4db35a6 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,16 @@ #!/usr/bin/make -f +# Portions of this file contributed by NIST are governed by the +# following statement: +# # This software was developed at the National Institute of Standards # and Technology by employees of the Federal Government in the course -# of their official duties. Pursuant to title 17 Section 105 of the -# United States Code this software is not subject to copyright -# protection and is in the public domain. NIST assumes no -# responsibility whatsoever for its use by other parties, and makes -# no guarantees, expressed or implied, about its quality, -# reliability, or any other characteristic. +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. # # We would appreciate acknowledgement if the software is used. diff --git a/ontology/Makefile b/ontology/Makefile index 21ba472..3ec849d 100644 --- a/ontology/Makefile +++ b/ontology/Makefile @@ -1,13 +1,16 @@ #!/usr/bin/make -f +# Portions of this file contributed by NIST are governed by the +# following statement: +# # This software was developed at the National Institute of Standards # and Technology by employees of the Federal Government in the course -# of their official duties. Pursuant to title 17 Section 105 of the -# United States Code this software is not subject to copyright -# protection and is in the public domain. NIST assumes no -# responsibility whatsoever for its use by other parties, and makes -# no guarantees, expressed or implied, about its quality, -# reliability, or any other characteristic. +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. # # We would appreciate acknowledgement if the software is used. diff --git a/ontology/investigation/Makefile b/ontology/investigation/Makefile index 549c381..3314096 100644 --- a/ontology/investigation/Makefile +++ b/ontology/investigation/Makefile @@ -1,13 +1,16 @@ #!/usr/bin/make -f +# Portions of this file contributed by NIST are governed by the +# following statement: +# # This software was developed at the National Institute of Standards # and Technology by employees of the Federal Government in the course -# of their official duties. Pursuant to title 17 Section 105 of the -# United States Code this software is not subject to copyright -# protection and is in the public domain. NIST assumes no -# responsibility whatsoever for its use by other parties, and makes -# no guarantees, expressed or implied, about its quality, -# reliability, or any other characteristic. +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. # # We would appreciate acknowledgement if the software is used. diff --git a/ontology/master/Makefile b/ontology/master/Makefile index f2420e4..d35febb 100644 --- a/ontology/master/Makefile +++ b/ontology/master/Makefile @@ -1,13 +1,16 @@ #!/usr/bin/make -f +# Portions of this file contributed by NIST are governed by the +# following statement: +# # This software was developed at the National Institute of Standards # and Technology by employees of the Federal Government in the course -# of their official duties. Pursuant to title 17 Section 105 of the -# United States Code this software is not subject to copyright -# protection and is in the public domain. NIST assumes no -# responsibility whatsoever for its use by other parties, and makes -# no guarantees, expressed or implied, about its quality, -# reliability, or any other characteristic. +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. # # We would appreciate acknowledgement if the software is used. diff --git a/ontology/vocabulary/Makefile b/ontology/vocabulary/Makefile index 1e8522e..2e741e8 100644 --- a/ontology/vocabulary/Makefile +++ b/ontology/vocabulary/Makefile @@ -1,13 +1,16 @@ #!/usr/bin/make -f +# Portions of this file contributed by NIST are governed by the +# following statement: +# # This software was developed at the National Institute of Standards # and Technology by employees of the Federal Government in the course -# of their official duties. Pursuant to title 17 Section 105 of the -# United States Code this software is not subject to copyright -# protection and is in the public domain. NIST assumes no -# responsibility whatsoever for its use by other parties, and makes -# no guarantees, expressed or implied, about its quality, -# reliability, or any other characteristic. +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. # # We would appreciate acknowledgement if the software is used. diff --git a/tests/Makefile b/tests/Makefile index ab00709..ded42d1 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,13 +1,16 @@ #!/usr/bin/make -f +# Portions of this file contributed by NIST are governed by the +# following statement: +# # This software was developed at the National Institute of Standards # and Technology by employees of the Federal Government in the course -# of their official duties. Pursuant to title 17 Section 105 of the -# United States Code this software is not subject to copyright -# protection and is in the public domain. NIST assumes no -# responsibility whatsoever for its use by other parties, and makes -# no guarantees, expressed or implied, about its quality, -# reliability, or any other characteristic. +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. # # We would appreciate acknowledgement if the software is used. diff --git a/tests/examples/Makefile b/tests/examples/Makefile index b80ad56..f79c2a5 100644 --- a/tests/examples/Makefile +++ b/tests/examples/Makefile @@ -1,13 +1,16 @@ #!/usr/bin/make -f +# Portions of this file contributed by NIST are governed by the +# following statement: +# # This software was developed at the National Institute of Standards # and Technology by employees of the Federal Government in the course -# of their official duties. Pursuant to title 17 Section 105 of the -# United States Code this software is not subject to copyright -# protection and is in the public domain. NIST assumes no -# responsibility whatsoever for its use by other parties, and makes -# no guarantees, expressed or implied, about its quality, -# reliability, or any other characteristic. +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. # # We would appreciate acknowledgement if the software is used. diff --git a/tests/examples/test_validation.py b/tests/examples/test_validation.py index f34c7fb..d873012 100644 --- a/tests/examples/test_validation.py +++ b/tests/examples/test_validation.py @@ -1,13 +1,16 @@ #!/usr/bin/env python3 +# Portions of this file contributed by NIST are governed by the +# following statement: +# # This software was developed at the National Institute of Standards # and Technology by employees of the Federal Government in the course -# of their official duties. Pursuant to title 17 Section 105 of the -# United States Code this software is not subject to copyright -# protection and is in the public domain. NIST assumes no -# responsibility whatsoever for its use by other parties, and makes -# no guarantees, expressed or implied, about its quality, -# reliability, or any other characteristic. +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. # # We would appreciate acknowledgement if the software is used. diff --git a/tests/shapes/Makefile b/tests/shapes/Makefile index 7181de0..03d308d 100644 --- a/tests/shapes/Makefile +++ b/tests/shapes/Makefile @@ -1,13 +1,16 @@ #!/usr/bin/make -f +# Portions of this file contributed by NIST are governed by the +# following statement: +# # This software was developed at the National Institute of Standards # and Technology by employees of the Federal Government in the course -# of their official duties. Pursuant to title 17 Section 105 of the -# United States Code this software is not subject to copyright -# protection and is in the public domain. NIST assumes no -# responsibility whatsoever for its use by other parties, and makes -# no guarantees, expressed or implied, about its quality, -# reliability, or any other characteristic. +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. # # We would appreciate acknowledgement if the software is used. diff --git a/tests/test_case_monolithic.py b/tests/test_case_monolithic.py index 83eb869..2b19382 100644 --- a/tests/test_case_monolithic.py +++ b/tests/test_case_monolithic.py @@ -1,13 +1,16 @@ #!/usr/bin/env python3 +# Portions of this file contributed by NIST are governed by the +# following statement: +# # This software was developed at the National Institute of Standards # and Technology by employees of the Federal Government in the course -# of their official duties. Pursuant to title 17 Section 105 of the -# United States Code this software is not subject to copyright -# protection and is in the public domain. NIST assumes no -# responsibility whatsoever for its use by other parties, and makes -# no guarantees, expressed or implied, about its quality, -# reliability, or any other characteristic. +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. # # We would appreciate acknowledgement if the software is used. From 96d45fb8c557d5940498c9df3bd9f12d24ace4fa Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Fri, 8 Nov 2024 09:30:51 -0500 Subject: [PATCH 15/26] Bump UCO to current state of develop No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index e147273..fb52f96 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit e1472736b2dc7cb2e20c2072e817eea3c7a4ab02 +Subproject commit fb52f9619ae20971530cdad0cc583ca0a8590c69 From a0a62e9d4b33c436bd34db82e797ec1b324e1d2e Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Fri, 22 Nov 2024 14:50:49 -0500 Subject: [PATCH 16/26] Adjust top Makefile dependency ordering in submodule initialization References: * https://github.com/casework/CASE/issues/167 Signed-off-by: Alex Nelson --- Makefile | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 4db35a6..686adf9 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,6 @@ all: \ # 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 @@ -103,14 +102,26 @@ clean: @rm -rf \ venv +# This recipe maintains timestamp order. +# The target file creation is handled by recursive initialization done +# in the recipe for .git_submodule_init.done.log. 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 + test -r $@ + touch -c $@ +# This recipe maintains timestamp order. +# The target file creation is handled by recursive initialization done +# in the recipe for .git_submodule_init.done.log. 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 + test -r $@ + touch -c $@ + +# This recipe maintains timestamp order. +# The target file creation is handled by initialization done in the +# recipe for .git_submodule_init.done.log. +dependencies/UCO/requirements.txt: \ + .git_submodule_init.done.log + test -r $@ + touch -c $@ From b5720af3526219824d5ed07c3ee868856aa1fb88 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Fri, 22 Nov 2024 16:52:17 -0500 Subject: [PATCH 17/26] Bump UCO to current state of develop No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/624 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index fb52f96..cc26145 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit fb52f9619ae20971530cdad0cc583ca0a8590c69 +Subproject commit cc261452e16e82d2b1c8990665f580faa38a63b4 From 256b47457d38541522411c9aef39019eb4ce77ef Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 19 Dec 2024 13:10:35 -0500 Subject: [PATCH 18/26] Bump UCO to current state of develop No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/pull/640 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index 904db37..0405eac 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 904db371b775eaf78d40ea16d95ac97d083fb293 +Subproject commit 0405eac9c93f1fc6f06ef731f784f4b00cbc339c From 4482054bc10e2d7544801a96feb1c9ac15cc519f Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Fri, 21 Feb 2025 09:50:25 -0500 Subject: [PATCH 19/26] Revise vocabulary pattern for `investigation:investigationForm` No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/629 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- ontology/investigation/investigation.ttl | 39 ++++++++---------------- ontology/vocabulary/vocabulary.ttl | 6 ++-- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/dependencies/UCO b/dependencies/UCO index 0405eac..e6decb6 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 0405eac9c93f1fc6f06ef731f784f4b00cbc339c +Subproject commit e6decb6f6db604ea106d52365105663df282f0a7 diff --git a/ontology/investigation/investigation.ttl b/ontology/investigation/investigation.ttl index 532a702..90781cd 100644 --- a/ontology/investigation/investigation.ttl +++ b/ontology/investigation/investigation.ttl @@ -128,45 +128,30 @@ investigation:Investigation sh:nodeKind sh:Literal ; sh:path investigation:investigationStatus ; ] , + [ + sh:datatype xsd:string ; + sh:message "As of CASE 1.4.0, the datatype to use for investigation:investigationForm should be xsd:string. Not using xsd:string will be an error in CASE 2.0.0." ; + sh:path investigation:investigationForm ; + sh:severity sh:Warning ; + ] , [ sh:datatype xsd:string ; sh:nodeKind sh:Literal ; sh:path investigation:focus ; ] , [ - sh:datatype vocabulary:InvestigationFormVocab ; - sh:message "Value is outside the default vocabulary InvestigationFormVocab." ; + sh:in ( + "case" + "incident" + "suspicious-activity" + ) ; + sh:message "Value is not member of the vocabulary InvestigationFormVocab." ; sh:path investigation:investigationForm ; sh:severity sh:Info ; ] , [ sh:maxCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:or ( - [ - sh:datatype vocabulary:InvestigationFormVocab ; - ] - [ - sh:datatype xsd:string ; - ] - ) ; - sh:path investigation:investigationForm ; - ] , - [ - sh:message "Value is not member of the vocabulary InvestigationFormVocab." ; - sh:or ( - [ - sh:datatype vocabulary:InvestigationFormVocab ; - sh:in ( - "case"^^vocabulary:InvestigationFormVocab - "incident"^^vocabulary:InvestigationFormVocab - "suspicious-activity"^^vocabulary:InvestigationFormVocab - ) ; - ] - [ - sh:datatype xsd:string ; - ] - ) ; sh:path investigation:investigationForm ; ] ; diff --git a/ontology/vocabulary/vocabulary.ttl b/ontology/vocabulary/vocabulary.ttl index b470af5..e2a34f2 100644 --- a/ontology/vocabulary/vocabulary.ttl +++ b/ontology/vocabulary/vocabulary.ttl @@ -19,9 +19,9 @@ vocab:InvestigationFormVocab owl:equivalentClass [ a rdfs:Datatype ; owl:oneOf ( - "case"^^vocab:InvestigationFormVocab - "incident"^^vocab:InvestigationFormVocab - "suspicious-activity"^^vocab:InvestigationFormVocab + "case" + "incident" + "suspicious-activity" ) ; ] ; . From aafa90ee04a5dc0427a59847f0ee60efed310561 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 26 Feb 2025 11:22:41 -0500 Subject: [PATCH 20/26] Move sh:in review to named PropertyShape No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/629 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- ontology/investigation/investigation.ttl | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dependencies/UCO b/dependencies/UCO index e6decb6..d524b8e 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit e6decb6f6db604ea106d52365105663df282f0a7 +Subproject commit d524b8eb57549e54eb475f37d2b6ce523815bbbf diff --git a/ontology/investigation/investigation.ttl b/ontology/investigation/investigation.ttl index 90781cd..7c82faf 100644 --- a/ontology/investigation/investigation.ttl +++ b/ontology/investigation/investigation.ttl @@ -105,6 +105,7 @@ investigation:Investigation rdfs:label "Investigation"@en ; rdfs:comment "An investigation is a grouping of characteristics unique to an exploration of the facts involved in a cyber-relevant set of suspicious activity."@en ; sh:property + investigation:Investigation-investigationForm-in-shape , [ sh:class investigation:Authorization ; sh:nodeKind sh:BlankNodeOrIRI ; @@ -139,16 +140,6 @@ investigation:Investigation sh:nodeKind sh:Literal ; sh:path investigation:focus ; ] , - [ - sh:in ( - "case" - "incident" - "suspicious-activity" - ) ; - sh:message "Value is not member of the vocabulary InvestigationFormVocab." ; - sh:path investigation:investigationForm ; - sh:severity sh:Info ; - ] , [ sh:maxCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; @@ -158,6 +149,18 @@ investigation:Investigation sh:targetClass investigation:Investigation ; . +investigation:Investigation-investigationForm-in-shape + a sh:PropertyShape ; + sh:in ( + "case" + "incident" + "suspicious-activity" + ) ; + sh:message "Value is not member of the vocabulary InvestigationFormVocab." ; + sh:path investigation:investigationForm ; + sh:severity sh:Info ; + . + investigation:InvestigativeAction a owl:Class , From 7ecdaf4184e38a059ac8d2d756a271b8f9f32b60 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 17 Mar 2025 14:33:50 -0400 Subject: [PATCH 21/26] Bump UCO to current state of develop No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/629 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index d524b8e..eff5e3b 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit d524b8eb57549e54eb475f37d2b6ce523815bbbf +Subproject commit eff5e3bc3c646d52347c669b3dccffd6e77e7216 From c68aa34e0fc75c9eb7d632fcb7d8ce0a07b2f3cb Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 28 May 2025 17:00:11 -0400 Subject: [PATCH 22/26] Bump UCO to 1.4.0 release 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 eff5e3b..8335d32 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit eff5e3bc3c646d52347c669b3dccffd6e77e7216 +Subproject commit 8335d32d600f717b7b4f43d74cf40efdf07aa340 diff --git a/ontology/investigation/investigation.ttl b/ontology/investigation/investigation.ttl index 7c82faf..2510614 100644 --- a/ontology/investigation/investigation.ttl +++ b/ontology/investigation/investigation.ttl @@ -1,6 +1,6 @@ # imports: https://ontology.caseontology.org/case/vocabulary/1.3.0 -# imports: https://ontology.unifiedcyberontology.org/uco/action/1.3.0 -# imports: https://ontology.unifiedcyberontology.org/uco/role/1.3.0 +# imports: https://ontology.unifiedcyberontology.org/uco/action/1.4.0 +# imports: https://ontology.unifiedcyberontology.org/uco/role/1.4.0 @prefix investigation: . @prefix owl: . @@ -20,8 +20,8 @@ owl:backwardCompatibleWith investigation:1.2.0 ; owl:imports vocabulary:1.3.0 , - uco-action:1.3.0 , - uco-role:1.3.0 + uco-action:1.4.0 , + uco-role:1.4.0 ; owl:priorVersion investigation:1.2.0 ; owl:versionIRI investigation:1.3.0 ; diff --git a/ontology/master/case.ttl b/ontology/master/case.ttl index baad03d..0a7e709 100644 --- a/ontology/master/case.ttl +++ b/ontology/master/case.ttl @@ -1,6 +1,6 @@ # imports: https://ontology.caseontology.org/case/investigation/1.3.0 # imports: https://ontology.caseontology.org/case/vocabulary/1.3.0 -# imports: https://ontology.unifiedcyberontology.org/uco/uco/1.3.0 +# imports: https://ontology.unifiedcyberontology.org/uco/uco/1.4.0 @prefix dct: . @prefix owl: . @@ -20,7 +20,7 @@ owl:imports , , - + ; owl:priorVersion ; owl:versionIRI ; From 2e01743ed3123b2e17eb1474cb4916298dd54c78 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 28 May 2025 17:00:32 -0400 Subject: [PATCH 23/26] 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 07e8525..ed75312 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 49ac868..bdc7859 100644 --- a/ontology/master/catalog-v001.xml +++ b/ontology/master/catalog-v001.xml @@ -2,24 +2,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + From ba2e7a75d514378adbeda1702dfd2ba2778e2dea Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 28 May 2025 17:02:50 -0400 Subject: [PATCH 24/26] 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 2510614..a572ba4 100644 --- a/ontology/investigation/investigation.ttl +++ b/ontology/investigation/investigation.ttl @@ -1,4 +1,4 @@ -# imports: https://ontology.caseontology.org/case/vocabulary/1.3.0 +# imports: https://ontology.caseontology.org/case/vocabulary/1.4.0 # imports: https://ontology.unifiedcyberontology.org/uco/action/1.4.0 # imports: https://ontology.unifiedcyberontology.org/uco/role/1.4.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.2.0 ; + owl:backwardCompatibleWith investigation:1.3.0 ; owl:imports - vocabulary:1.3.0 , + vocabulary:1.4.0 , uco-action:1.4.0 , uco-role:1.4.0 ; - owl:priorVersion investigation:1.2.0 ; - owl:versionIRI investigation:1.3.0 ; + owl:priorVersion investigation:1.3.0 ; + owl:versionIRI investigation:1.4.0 ; . investigation:Attorney diff --git a/ontology/master/case.ttl b/ontology/master/case.ttl index 0a7e709..3fdc368 100644 --- a/ontology/master/case.ttl +++ b/ontology/master/case.ttl @@ -1,5 +1,5 @@ -# imports: https://ontology.caseontology.org/case/investigation/1.3.0 -# imports: https://ontology.caseontology.org/case/vocabulary/1.3.0 +# imports: https://ontology.caseontology.org/case/investigation/1.4.0 +# imports: https://ontology.caseontology.org/case/vocabulary/1.4.0 # imports: https://ontology.unifiedcyberontology.org/uco/uco/1.4.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.3.0" ; + owl:priorVersion ; + owl:versionIRI ; + owl:versionInfo "1.4.0" ; . diff --git a/ontology/vocabulary/vocabulary.ttl b/ontology/vocabulary/vocabulary.ttl index e2a34f2..5affbb4 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.2.0 ; - owl:priorVersion vocab:1.2.0 ; - owl:versionIRI vocab:1.3.0 ; + owl:backwardCompatibleWith vocab:1.3.0 ; + owl:priorVersion vocab:1.3.0 ; + owl:versionIRI vocab:1.4.0 ; . vocab:InvestigationFormVocab From 523dc485714ba53245ea34eddbe30f04f841238d Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 28 May 2025 17:10:48 -0400 Subject: [PATCH 25/26] 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 ed75312..c11624f 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 bdc7859..bc112a2 100644 --- a/ontology/master/catalog-v001.xml +++ b/ontology/master/catalog-v001.xml @@ -20,7 +20,7 @@ - - + + From 1cb7c317a7ac4f9b550cdefe286f0be934d1ff67 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 29 May 2025 08:56:33 -0400 Subject: [PATCH 26/26] Log changes Signed-off-by: Alex Nelson --- ChangeLog | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/ChangeLog b/ChangeLog index 572c76b..053bd62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,48 @@ +2025-03-18 + * (7ecdaf4) UCO Issue 629: Revise vocabulary pattern + +2025-02-13 + * (256b474) UCO Issue 640: Add `core:informalType` and link as parent of type-describing properties + +2024-12-19 + * (a0a62e9) Issue 167: Adjust top Makefile dependency ordering in submodule initialization + +2024-11-23 + * (b5720af) UCO Issue 624: Add cpeid to DeviceFacet + +2024-11-08 + * (96d45fb) UCO Issue 632: Prepare OperatingSystem to become a subclass of Software + * (f759e47) Pull Request 164: Update NIST licensing text + * (2eb3991) UCO Pull Request 642: Update NIST licensing text + +2024-11-07 + * (820d63d) UCO Pull Request 639: Bump GitHub Action versions + * (cc5535e) UCO Pull Request 638: Refresh validation files to reflect validation tool template updates + +2024-10-18 + * (557269c) UCO Issue 593: Remove owl:onDatatype from vocabulary definitions + +2024-10-16 + * (8a353f8) UCO Issue 612: Warn if a `Disk` instance is not also a `StorageMedium` + +2024-09-11 + * (8ba5929) UCO Issue 549: Add `core:objectStatus` + +2024-07-26 + * (b93add7) UCO Issue 602: Warn about key-uniqueness enforcement to `types:Dictionary` + +2024-06-18 + * (0d409cc) UCO Issue 609: Fix typo + +2024-06-10 + * (5cf57b7) UCO Issues 586, 590: Warn of prior disjointedness declarations in `core:` and `types:`; warn if an `AlternateDataStream` instance is not also a `FileSystemObject` + +2024-05-01 + * (50eb05b) UCO Issues 573, 584, 599: Warn if target or source on an `ObservableRelationship` are not `Observable`s; replace errant reference to non-existent concept `owl:Datatype`; remove 1-member minimum on `core:ContextualCompilation` + +2024-01-24 + * OCCASE-495: Release CASE 1.3.0, with release notes at https://caseontology.org/releases/1.3.0/ + 2024-01-24 * (79afa93) UCO Pull Request 579: Update change request template