Designate multi-types for Software realignment

A follow-on patch will regenerate Make-managed files. References: * ucoProject/UCO#596 Signed-off-by: Alex Nelson <[email protected]>
casework · May 10, 2024 · 4e3e5dc · 4e3e5dc
1 parent e4c7a25
commit 4e3e5dc
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 7 deletions.
diff --git a/examples/asgard/src/asgard-supplements.json b/examples/asgard/src/asgard-supplements.json
@@ -37,7 +37,10 @@
     },
     {
         "@id": "kb:application1-8538c226-1ba5-473b-8342-96150a4ab4ed",
-        "@type": "uco-observable:Application"
+        "@type": [
+            "uco-observable:Application",
+            "uco-observable:Software"
+        ]
     },
     {
         "@id": "kb:source-host-d77fdc61-b382-4aad-98fd-6dbf8cadd2bf",

diff --git a/examples/crossover_heist/src/crossover_heist-web_browser_history_wow_usb.json b/examples/crossover_heist/src/crossover_heist-web_browser_history_wow_usb.json
@@ -43,7 +43,10 @@
         ]
     },
     {
-        "@type": "uco-observable:Application",
+        "@type": [
+            "uco-observable:Application",
+            "uco-observable:Software"
+        ],
         "@id": "kb:software-5d96df90-d9e1-423c-b8db-c2327812ab38",
         "uco-core:hasFacet": [
             {

diff --git a/examples/crossover_wmd/src/crossover_wmd-users_and_accounts.json b/examples/crossover_wmd/src/crossover_wmd-users_and_accounts.json
@@ -145,7 +145,10 @@
     },
     {
         "@id": "kb:gmail-a1ce9965-ba9c-4fa1-9bfe-58c68ecaadc5",
-        "@type": "uco-observable:Application",
+        "@type": [
+            "uco-observable:Application",
+            "uco-observable:Software"
+        ],
         "uco-core:hasFacet": {
             "@id": "kb:application-facet-3ecd5cd2-d118-4b03-970f-e1196ad0a133",
             "@type": "uco-observable:ApplicationFacet",
@@ -154,7 +157,10 @@
     },
     {
         "@id": "kb:application-whatsapp-e662a9de-02bb-47ad-8666-625a0a5dc2fa",
-        "@type": "uco-observable:Application",
+        "@type": [
+            "uco-observable:Application",
+            "uco-observable:Software"
+        ],
         "uco-core:hasFacet": {
             "@id": "kb:application-facet-74e8a566-4575-4ce2-84d5-4bcea81f9b70",
             "@type": "uco-observable:ApplicationFacet",

diff --git a/examples/crossover_wmd/src/crossover_wmd-whatsapp_application.json b/examples/crossover_wmd/src/crossover_wmd-whatsapp_application.json
@@ -1,7 +1,10 @@
 [
     {
         "@id": "kb:whatsapp-868abc08-8c21-11e9-934e-0c4de9c21b53",
-        "@type": "uco-observable:Application",
+        "@type": [
+            "uco-observable:Application",
+            "uco-observable:Software"
+        ],
         "uco-core:hasFacet": [
             {
                 "@id": "kb:application-facet-f089c7c8-e260-483f-b9dc-e95da12b5906",
@@ -21,7 +24,10 @@
     },
     {
         "@id": "kb:Android-class-6f4f675e-9a02-4ab5-8060-50d3d92832d9",
-        "@type": "uco-observable:OperatingSystem",
+        "@type": [
+            "uco-observable:OperatingSystem",
+            "uco-observable:Software"
+        ],
         "uco-core:description": "The general class of Android operating system instances, treated as an abstract individual."
     }
 ]
diff --git a/examples/owl_trafficking/src/owl_trafficking-supplements.json b/examples/owl_trafficking/src/owl_trafficking-supplements.json
@@ -1,4 +1,19 @@
 [
+    {
+        "@id": "kb:application-facebook-25e8018f-49be-4898-bb1d-731e387e9eb7",
+        "@type": "uco-observable:Software",
+        "rdfs:comment": "TODO: The uco-observable:Software type is redundant after the release of 2.0.0."
+    },
+    {
+        "@id": "kb:message-9999898c-0178-4534-8107-caea0a0f9999",
+        "@type": "uco-observable:Software",
+        "rdfs:comment": "TODO: The uco-observable:Software type is redundant after the release of 2.0.0."
+    },
+    {
+        "@id": "kb:skypeapp-a6b73e78-00da-11eb-a396-acde48001122",
+        "@type": "uco-observable:Software",
+        "rdfs:comment": "TODO: The uco-observable:Software type is redundant after the release of 2.0.0."
+    },
     {
         "@id": "kb:magnet-acquire2005412-83715215-c5fc-4231-99ff-29a3c51cb5f1",
         "@type": "uco-tool:Tool",
@@ -32,7 +47,11 @@
     },
     {
         "@id": "kb:software-5d96df90-d9e1-423c-b8db-c2327812ab38",
-        "@type": "uco-observable:Application"
+        "@type": [
+            "uco-observable:Application",
+            "uco-observable:Software"
+        ],
+        "rdfs:comment": "TODO: The uco-observable:Software type is redundant after the release of 2.0.0."
     },
     {
         "@id": "kb:textapplogcat-1a717ea6-8990-4709-92f0-d748cacb817e",