From 56454b8465449adc99a2f2511c9a810f1b215ef1 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 29 Oct 2024 12:24:57 -0400 Subject: [PATCH 01/11] Bump unstable pointers No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/pull/638 * https://github.com/ucoProject/UCO/pull/639 Signed-off-by: Alex Nelson --- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index 4a6c6304..c84e6ee0 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit 4a6c63047785e5eb0959b050911e7614aeec0e56 +Subproject commit c84e6ee0fde3a6e2c1d304fd71ccc4c312e97ec9 diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index 259135fb..9514eb25 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit 259135fbc36144f39e9c3b2cf924bbd9a0026d09 +Subproject commit 9514eb25fa880035376d78eda6c3a64c584dade3 From 10d1de1dd68ab0af8f3a951f8083e8dc6f91b393 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 5 Nov 2024 15:52:28 -0500 Subject: [PATCH 02/11] Bump unstable pointers No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/pull/642 Signed-off-by: Alex Nelson --- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index c84e6ee0..68a717cb 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit c84e6ee0fde3a6e2c1d304fd71ccc4c312e97ec9 +Subproject commit 68a717cb83b48c6d389f815d0f92e7fe9364d8e9 diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index 9514eb25..d5255e31 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit 9514eb25fa880035376d78eda6c3a64c584dade3 +Subproject commit d5255e31d074ac47b683aa21bc6ceead5e9ba8d2 From 9be1bdcca70218a8f1ed9397e7ccfd0fb41bd42b Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 7 Nov 2024 08:43:48 -0500 Subject: [PATCH 03/11] Bump prerelease pointers No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/pull/638 * https://github.com/ucoProject/UCO/pull/639 Signed-off-by: Alex Nelson --- dependencies/CASE-develop | 2 +- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies/CASE-develop b/dependencies/CASE-develop index 557269c3..06a806a2 160000 --- a/dependencies/CASE-develop +++ b/dependencies/CASE-develop @@ -1 +1 @@ -Subproject commit 557269c375a46585ad03285cda764d2abce035b4 +Subproject commit 06a806a2972effc8b5e79d52e141915183edee84 diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index 68a717cb..55c1442d 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit 68a717cb83b48c6d389f815d0f92e7fe9364d8e9 +Subproject commit 55c1442d0fc7cc146f3802685eabe923f108c9b8 diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index d5255e31..cafbd729 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit d5255e31d074ac47b683aa21bc6ceead5e9ba8d2 +Subproject commit cafbd729e2e159bf692f15a299fda59c81dbebe7 From c35859ef9cc8f45117695eded873fe423361e046 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Fri, 8 Nov 2024 08:03:13 -0500 Subject: [PATCH 04/11] Bump prerelease pointers No effects were observed on Make-managed files. References: * https://github.com/casework/CASE/pull/164 Signed-off-by: Alex Nelson --- dependencies/CASE-develop | 2 +- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies/CASE-develop b/dependencies/CASE-develop index 06a806a2..97006d2f 160000 --- a/dependencies/CASE-develop +++ b/dependencies/CASE-develop @@ -1 +1 @@ -Subproject commit 06a806a2972effc8b5e79d52e141915183edee84 +Subproject commit 97006d2fb12a93ec8adff6c810881dda5ff697ef diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index 55c1442d..5f6a061a 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit 55c1442d0fc7cc146f3802685eabe923f108c9b8 +Subproject commit 5f6a061a074b8871ed8bce9d234cdfba9147eb14 diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index cafbd729..37ec98b8 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit cafbd729e2e159bf692f15a299fda59c81dbebe7 +Subproject commit 37ec98b8cf5df815e78fdc00d5a406c99405722b From ee89abaf92c8849022e65384cfd644fcd82d0b63 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Fri, 8 Nov 2024 08:30:25 -0500 Subject: [PATCH 05/11] Bump unstable pointers No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index 5f6a061a..70868fd6 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit 5f6a061a074b8871ed8bce9d234cdfba9147eb14 +Subproject commit 70868fd6040f485c0054768acab6e58aef6c1646 diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index 37ec98b8..17f70236 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit 37ec98b8cf5df815e78fdc00d5a406c99405722b +Subproject commit 17f70236dfaaa5010b2bdfdc4e98d29aa5d0bef9 From 189e27886d2e4a6f1a62cec7c475c09dadd6ebab Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 12 Nov 2024 09:13:44 -0500 Subject: [PATCH 06/11] Bump prerelease pointers A follow-on patch will regenerate Make-managed files. References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- dependencies/CASE-develop | 2 +- dependencies/CASE-unstable | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies/CASE-develop b/dependencies/CASE-develop index 97006d2f..26bd54e8 160000 --- a/dependencies/CASE-develop +++ b/dependencies/CASE-develop @@ -1 +1 @@ -Subproject commit 97006d2fb12a93ec8adff6c810881dda5ff697ef +Subproject commit 26bd54e8b8776cdad40034380a2d9276110a2e60 diff --git a/dependencies/CASE-unstable b/dependencies/CASE-unstable index 70868fd6..46e1405a 160000 --- a/dependencies/CASE-unstable +++ b/dependencies/CASE-unstable @@ -1 +1 @@ -Subproject commit 70868fd6040f485c0054768acab6e58aef6c1646 +Subproject commit 46e1405a78dc7ae9458611eac7e963dd66b08c5f diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index 17f70236..cf8e85de 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit 17f70236dfaaa5010b2bdfdc4e98d29aa5d0bef9 +Subproject commit cf8e85dea6748cfcdcb8fc52ae3f772c7e666497 From 59de32ae6b6549533845037d08cbee9dcfd34230 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 12 Nov 2024 09:16:20 -0500 Subject: [PATCH 07/11] Regenerate Make-managed files References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- ontology/CASE-develop.ttl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/ontology/CASE-develop.ttl b/ontology/CASE-develop.ttl index 62e68ca5..5ee476de 100644 --- a/ontology/CASE-develop.ttl +++ b/ontology/CASE-develop.ttl @@ -8693,6 +8693,14 @@ observable:OperatingSystem rdfs:subClassOf observable:ObservableObject ; rdfs:label "OperatingSystem"@en ; rdfs:comment "An operating system is the software that manages computer hardware, software resources, and provides common services for computer programs. [based on https://en.wikipedia.org/wiki/Operating_system]"@en ; + rdfs:seeAlso [ + a sh:NodeShape ; + rdfs:comment "This anonymous shape is attached with rdfs:seeAlso in order to associate a warning-severity class constraint, that will only be necessary as an independent shape until UCO 2.0.0."@en ; + sh:class observable:Software ; + sh:message "In UCO 2.0.0, uco-observable:OperatingSystem will be a subclass of uco-observable:Software. In preparation for UCO 2.0.0, the additional type uco-observable:Software should be assigned to this node."@en ; + sh:severity sh:Warning ; + sh:targetClass observable:OperatingSystem ; + ] ; sh:targetClass observable:OperatingSystem ; . @@ -8745,6 +8753,18 @@ observable:OperatingSystemFacet sh:datatype xsd:string ; sh:nodeKind sh:Literal ; sh:path observable:advertisingID ; + ] , + [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:manufacturer will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:manufacturer ; + sh:severity sh:Warning ; + ] , + [ + sh:maxCount "0"^^xsd:integer ; + sh:message "In UCO 2.0.0, uco-observable:version will not be associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:version ; + sh:severity sh:Warning ; ] ; sh:targetClass observable:OperatingSystemFacet ; From 669bbe4aecbfc2a4378a7626e5c4a9cde75b785b Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 12 Nov 2024 09:29:45 -0500 Subject: [PATCH 08/11] Bump unstable-2.0.0 pointer No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/632 * https://github.com/ucoProject/UCO/pull/638 * https://github.com/ucoProject/UCO/pull/639 * https://github.com/ucoProject/UCO/pull/642 Signed-off-by: Alex Nelson --- dependencies/CASE-unstable-2.0.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index cf8e85de..00d8512a 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit cf8e85dea6748cfcdcb8fc52ae3f772c7e666497 +Subproject commit 00d8512ac4d860356110bb54737a28ed100983d5 From 8f66bc94fe7d4dad1a62e89f0c31ec55dd0d936d Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 12 Nov 2024 10:30:35 -0500 Subject: [PATCH 09/11] Bump unstable-2.0.0 pointer No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- dependencies/CASE-unstable-2.0.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index 00d8512a..c120b138 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit 00d8512ac4d860356110bb54737a28ed100983d5 +Subproject commit c120b13820c080f114096256ff73a619608edfee From e3f214c98c7fd7062f534bc9e616aed0e307933c Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 12 Nov 2024 13:09:12 -0500 Subject: [PATCH 10/11] Bump prerelease pointers A follow-on patch will regenerate Make-managed files. References: * https://github.com/ucoProject/UCO/issues/632 * https://github.com/ucoProject/UCO/pull/638 * https://github.com/ucoProject/UCO/pull/639 * https://github.com/ucoProject/UCO/pull/642 Signed-off-by: Alex Nelson --- dependencies/CASE-develop-2.0.0 | 2 +- dependencies/CASE-unstable-2.0.0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/CASE-develop-2.0.0 b/dependencies/CASE-develop-2.0.0 index d07ce421..5709674c 160000 --- a/dependencies/CASE-develop-2.0.0 +++ b/dependencies/CASE-develop-2.0.0 @@ -1 +1 @@ -Subproject commit d07ce4211535a5b7de7b3bc89acd0207b3acf0db +Subproject commit 5709674c24d7d1f495cd3a0be2255c6404ec32c1 diff --git a/dependencies/CASE-unstable-2.0.0 b/dependencies/CASE-unstable-2.0.0 index c120b138..450ef799 160000 --- a/dependencies/CASE-unstable-2.0.0 +++ b/dependencies/CASE-unstable-2.0.0 @@ -1 +1 @@ -Subproject commit c120b13820c080f114096256ff73a619608edfee +Subproject commit 450ef79970287ab87fc8a13e156ac9cfb37cfa27 From b28a8969a5522f9f7a7a4305309ee6ddd15bc8be Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 12 Nov 2024 13:11:55 -0500 Subject: [PATCH 11/11] Regenerate Make-managed files References: * https://github.com/ucoProject/UCO/issues/632 Signed-off-by: Alex Nelson --- ontology/CASE-develop-2.0.0.ttl | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/ontology/CASE-develop-2.0.0.ttl b/ontology/CASE-develop-2.0.0.ttl index 403e54fb..6d898a21 100644 --- a/ontology/CASE-develop-2.0.0.ttl +++ b/ontology/CASE-develop-2.0.0.ttl @@ -8681,7 +8681,7 @@ observable:OperatingSystem owl:Class , sh:NodeShape ; - rdfs:subClassOf observable:ObservableObject ; + rdfs:subClassOf observable:Software ; rdfs:label "OperatingSystem"@en ; rdfs:comment "An operating system is the software that manages computer hardware, software resources, and provides common services for computer programs. [based on https://en.wikipedia.org/wiki/Operating_system]"@en ; sh:targetClass observable:OperatingSystem ; @@ -8696,12 +8696,6 @@ observable:OperatingSystemFacet rdfs:label "OperatingSystemFacet"@en ; rdfs:comment "An operating system facet is a grouping of characteristics unique to the software that manages computer hardware, software resources, and provides common services for computer programs. [based on https://en.wikipedia.org/wiki/Operating_system]"@en ; sh:property - [ - sh:class identity:Identity ; - sh:maxCount "1"^^xsd:integer ; - sh:nodeKind sh:IRI ; - sh:path observable:manufacturer ; - ] , [ sh:class types:Dictionary ; sh:maxCount "1"^^xsd:integer ; @@ -8728,14 +8722,18 @@ observable:OperatingSystemFacet ] , [ sh:datatype xsd:string ; - sh:maxCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:path observable:version ; + sh:path observable:advertisingID ; ] , [ - sh:datatype xsd:string ; - sh:nodeKind sh:Literal ; - sh:path observable:advertisingID ; + sh:maxCount "0"^^xsd:integer ; + sh:message "As of UCO 2.0.0, uco-observable:manufacturer is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:manufacturer ; + ] , + [ + sh:maxCount "0"^^xsd:integer ; + sh:message "As of UCO 2.0.0, uco-observable:version is not associated with uco-observable:OperatingSystemFacet. Please place this on a uco-observable:SoftwareFacet instead."@en ; + sh:path observable:version ; ] ; sh:targetClass observable:OperatingSystemFacet ;