Regenerate Make-managed files

References: * ucoProject/UCO#632 Signed-off-by: Alex Nelson <[email protected]>
casework · Oct 16, 2024 · 3799583 · 3799583
1 parent 73d429d
commit 3799583
Show file tree

Hide file tree

Showing 12 changed files with 320 additions and 300 deletions.
diff --git a/examples/asgard/asgard.json b/examples/asgard/asgard.json
@@ -101,6 +101,12 @@
                 },
                 {
                     "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f"
+                },
+                {
+                    "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3"
+                },
+                {
+                    "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4"
                 }
             ]
         },
@@ -112,6 +118,12 @@
             "uco-core:object": [
                 {
                     "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f"
+                },
+                {
+                    "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3"
+                },
+                {
+                    "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4"
                 }
             ]
         },
@@ -159,15 +171,6 @@
                     "drafting:uniqueID": "B3858A69A29375E6C706226B3633A3A11EB2A774",
                     "drafting:ownerName": "Loki iPhone"
                 },
-                {
-                    "@id": "kb:operating-system-facet-262f1b31-e23d-4324-84cb-5d55528caf63",
-                    "@type": "uco-observable:OperatingSystemFacet",
-                    "uco-core:name": "iOS",
-                    "uco-observable:manufacturer": {
-                        "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4"
-                    },
-                    "uco-observable:version": "10.3"
-                },
                 {
                     "@id": "kb:wifi-address-facet-27d5903b-0037-4a98-acad-4f5003461899",
                     "@type": "uco-observable:WifiAddressFacet",
@@ -180,6 +183,34 @@
                 }
             ]
         },
+        {
+            "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3",
+            "@type": [
+                "uco-observable:OperatingSystem",
+                "uco-observable:Software"
+            ],
+            "uco-core:name": "iOS",
+            "uco-core:hasFacet": {
+                "@id": "kb:software-facet-fbedb8fd-0b1c-4470-a8dd-14612514bd56",
+                "@type": "uco-observable:SoftwareFacet",
+                "uco-observable:manufacturer": {
+                    "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4"
+                },
+                "uco-observable:version": "10.3"
+            }
+        },
+        {
+            "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4",
+            "@type": "uco-observable:ObservableRelationship",
+            "uco-core:kindOfRelationship": "Has_Operating_System",
+            "uco-core:isDirectional": true,
+            "uco-core:source": {
+                "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f"
+            },
+            "uco-core:target": {
+                "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3"
+            }
+        },
         {
             "@id": "kb:mobileaccount-74b4e46a-bee3-48f7-a5db-a6178d92aa90",
             "@type": "uco-observable:MobileAccount",

diff --git a/examples/asgard/asgard_validation-unstable-2.0.0.ttl b/examples/asgard/asgard_validation-unstable-2.0.0.ttl
@@ -8,49 +8,21 @@
 
 []
 	a sh:ValidationReport ;
-	sh:conforms "false"^^xsd:boolean ;
-	sh:result
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
-			sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
-			sh:resultPath uco-observable:accountType ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
-			sh:sourceShape [
-				sh:datatype vocabulary:AccountTypeVocab ;
-				sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
-				sh:path uco-observable:accountType ;
-				sh:severity sh:Info ;
-			] ;
-			sh:value "Phone" ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/operating-system-facet-262f1b31-e23d-4324-84cb-5d55528caf63> ;
-			sh:resultMessage "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:resultPath uco-observable:manufacturer ;
-			sh:resultSeverity sh:Violation ;
-			sh:sourceConstraintComponent sh:MaxCountConstraintComponent ;
-			sh:sourceShape [
-				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 uco-observable:manufacturer ;
-			] ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/operating-system-facet-262f1b31-e23d-4324-84cb-5d55528caf63> ;
-			sh:resultMessage "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:resultPath uco-observable:version ;
-			sh:resultSeverity sh:Violation ;
-			sh:sourceConstraintComponent sh:MaxCountConstraintComponent ;
-			sh:sourceShape [
-				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 uco-observable:version ;
-			] ;
-		]
-		;
+	sh:conforms "true"^^xsd:boolean ;
+	sh:result [
+		a sh:ValidationResult ;
+		sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
+		sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
+		sh:resultPath uco-observable:accountType ;
+		sh:resultSeverity sh:Info ;
+		sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
+		sh:sourceShape [
+			sh:datatype vocabulary:AccountTypeVocab ;
+			sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
+			sh:path uco-observable:accountType ;
+			sh:severity sh:Info ;
+		] ;
+		sh:value "Phone" ;
+	] ;
 	.
 
diff --git a/examples/asgard/asgard_validation-unstable.ttl b/examples/asgard/asgard_validation-unstable.ttl
@@ -8,51 +8,21 @@
 
 []
 	a sh:ValidationReport ;
-	sh:conforms "false"^^xsd:boolean ;
-	sh:result
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
-			sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
-			sh:resultPath uco-observable:accountType ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
-			sh:sourceShape [
-				sh:datatype vocabulary:AccountTypeVocab ;
-				sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
-				sh:path uco-observable:accountType ;
-				sh:severity sh:Info ;
-			] ;
-			sh:value "Phone" ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/operating-system-facet-262f1b31-e23d-4324-84cb-5d55528caf63> ;
-			sh:resultMessage "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:resultPath uco-observable:manufacturer ;
-			sh:resultSeverity sh:Warning ;
-			sh:sourceConstraintComponent sh:MaxCountConstraintComponent ;
-			sh:sourceShape [
-				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 uco-observable:manufacturer ;
-				sh:severity sh:Warning ;
-			] ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/operating-system-facet-262f1b31-e23d-4324-84cb-5d55528caf63> ;
-			sh:resultMessage "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:resultPath uco-observable:version ;
-			sh:resultSeverity sh:Warning ;
-			sh:sourceConstraintComponent sh:MaxCountConstraintComponent ;
-			sh:sourceShape [
-				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 uco-observable:version ;
-				sh:severity sh:Warning ;
-			] ;
-		]
-		;
+	sh:conforms "true"^^xsd:boolean ;
+	sh:result [
+		a sh:ValidationResult ;
+		sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
+		sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
+		sh:resultPath uco-observable:accountType ;
+		sh:resultSeverity sh:Info ;
+		sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
+		sh:sourceShape [
+			sh:datatype vocabulary:AccountTypeVocab ;
+			sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
+			sh:path uco-observable:accountType ;
+			sh:severity sh:Info ;
+		] ;
+		sh:value "Phone" ;
+	] ;
 	.
 
diff --git a/examples/asgard/index.html b/examples/asgard/index.html
@@ -141,6 +141,12 @@ <h6>Examples of an InvestigativeAction &amp; ProvenanceRecord Objects</h6>
             },
             {
                 "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f"
+            },
+            {
+                "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3"
+            },
+            {
+                "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4"
             }
         ]
     },
@@ -152,6 +158,12 @@ <h6>Examples of an InvestigativeAction &amp; ProvenanceRecord Objects</h6>
         "uco-core:object": [
             {
                 "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f"
+            },
+            {
+                "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3"
+            },
+            {
+                "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4"
             }
         ]
     },
@@ -199,15 +211,6 @@ <h6>Examples of an InvestigativeAction &amp; ProvenanceRecord Objects</h6>
                 "drafting:uniqueID": "B3858A69A29375E6C706226B3633A3A11EB2A774",
                 "drafting:ownerName": "Loki iPhone"
             },
-            {
-                "@id": "kb:operating-system-facet-262f1b31-e23d-4324-84cb-5d55528caf63",
-                "@type": "uco-observable:OperatingSystemFacet",
-                "uco-core:name": "iOS",
-                "uco-observable:manufacturer": {
-                    "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4"
-                },
-                "uco-observable:version": "10.3"
-            },
             {
                 "@id": "kb:wifi-address-facet-27d5903b-0037-4a98-acad-4f5003461899",
                 "@type": "uco-observable:WifiAddressFacet",
@@ -220,6 +223,34 @@ <h6>Examples of an InvestigativeAction &amp; ProvenanceRecord Objects</h6>
             }
         ]
     },
+    {
+        "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3",
+        "@type": [
+            "uco-observable:OperatingSystem",
+            "uco-observable:Software"
+        ],
+        "uco-core:name": "iOS",
+        "uco-core:hasFacet": {
+            "@id": "kb:software-facet-fbedb8fd-0b1c-4470-a8dd-14612514bd56",
+            "@type": "uco-observable:SoftwareFacet",
+            "uco-observable:manufacturer": {
+                "@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4"
+            },
+            "uco-observable:version": "10.3"
+        }
+    },
+    {
+        "@id": "kb:relationship-b6951277-419f-4226-b0d3-76c4d6ae33b4",
+        "@type": "uco-observable:ObservableRelationship",
+        "uco-core:kindOfRelationship": "Has_Operating_System",
+        "uco-core:isDirectional": true,
+        "uco-core:source": {
+            "@id": "kb:device-9420af3b-4d3a-4239-88fc-d33feec8dc4f"
+        },
+        "uco-core:target": {
+            "@id": "kb:operating-system-1b7f841a-8df7-454f-9b7d-1a2ace0573e3"
+        }
+    },
     {
         "@id": "kb:mobileaccount-74b4e46a-bee3-48f7-a5db-a6178d92aa90",
         "@type": "uco-observable:MobileAccount",

diff --git a/examples/crossover_wmd/crossover_wmd.json b/examples/crossover_wmd/crossover_wmd.json
@@ -80,16 +80,6 @@
                     ],
                     "uco-observable:IMEI": "356420075722843"
                 },
-                {
-                    "@id": "kb:operating-system-facet-b55d7244-720f-4fb8-a4d3-2a26d407a353",
-                    "@type": "uco-observable:OperatingSystemFacet",
-                    "uco-core:name": "Android",
-                    "uco-observable:manufacturer": {
-                        "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec"
-                    },
-                    "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259",
-                    "uco-observable:version": "6.0.1"
-                },
                 {
                     "@id": "kb:wifi-address-facet-047a5278-1e8a-4e38-b2f6-1b77894624b8",
                     "@type": "uco-observable:WifiAddressFacet",
@@ -102,6 +92,41 @@
                 }
             ]
         },
+        {
+            "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d",
+            "@type": [
+                "uco-observable:OperatingSystem",
+                "uco-observable:Software"
+            ],
+            "uco-core:name": "Android",
+            "uco-core:hasFacet": [
+                {
+                    "@id": "kb:operating-system-facet-b55d7244-720f-4fb8-a4d3-2a26d407a353",
+                    "@type": "uco-observable:OperatingSystemFacet",
+                    "uco-observable:advertisingID": "48500120-c9c5-402e-a6bc-04e2f92ae259"
+                },
+                {
+                    "@id": "kb:software-facet-da02e9c9-b35b-42e7-bbc8-013b15e17803",
+                    "@type": "uco-observable:SoftwareFacet",
+                    "uco-observable:manufacturer": {
+                        "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec"
+                    },
+                    "uco-observable:version": "6.0.1"
+                }
+            ]
+        },
+        {
+            "@id": "kb:relationship-aca6d788-12e4-45d1-8f00-06a63579309d",
+            "@type": "uco-observable:ObservableRelationship",
+            "uco-core:isDirectional": true,
+            "uco-core:kindOfRelationship": "Has_Operating_System",
+            "uco-core:source": {
+                "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4"
+            },
+            "uco-core:target": {
+                "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d"
+            }
+        },
         {
             "@id": "kb:organization-fb6c05a0-b6be-4a10-ba62-0e7b1da4c0ec",
             "@type": "uco-identity:Organization",
@@ -193,9 +218,17 @@
         {
             "@id": "kb:provenancerecord-9326149a-31c5-4d20-ada3-b97743d3e563",
             "@type": "case-investigation:ProvenanceRecord",
-            "uco-core:object": {
-                "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4"
-            }
+            "uco-core:object": [
+                {
+                    "@id": "kb:mobiledevice-803df237-bc7e-4e24-a5cb-8157063014b4"
+                },
+                {
+                    "@id": "kb:operating-system-cbba474a-d58c-4715-a7fa-5854d811021d"
+                },
+                {
+                    "@id": "kb:relationship-aca6d788-12e4-45d1-8f00-06a63579309d"
+                }
+            ]
         },
         {
             "@id": "kb:file-f7cad990-6687-4849-89dc-55795675f3f5",