Skip to content

Commit 4524dc8

Browse files
ajnelson-nistajnelson-nist
committed
Merge branch 'master' into existence_intervals_shapes_review
2 parents ecaad1e + 29b0073 commit 4524dc8

File tree

122 files changed

+45806
-46069
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+45806
-46069
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
runs-on: ubuntu-latest
2424

2525
steps:
26-
- uses: actions/checkout@v3
27-
- uses: actions/setup-java@v3
26+
- uses: actions/checkout@v5
27+
- uses: actions/setup-java@v5
2828
with:
2929
distribution: 'temurin'
3030
java-version: '11'
3131
- name: Set up Python ${{ matrix.python-version }}
32-
uses: actions/setup-python@v2
32+
uses: actions/setup-python@v5
3333
with:
3434
python-version: ${{ matrix.python-version }}
3535
- name: Pre-commit Checks

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.6.0
3+
rev: v6.0.0
44
hooks:
55
- id: check-json
66
- id: pretty-format-json
@@ -10,17 +10,17 @@ repos:
1010
- --no-ensure-ascii
1111
- --no-sort-keys
1212
- repo: https://github.com/psf/black
13-
rev: 24.4.2
13+
rev: 25.11.0
1414
hooks:
1515
- id: black
1616
- repo: https://github.com/pycqa/flake8
17-
rev: 7.1.0
17+
rev: 7.3.0
1818
hooks:
1919
- id: flake8
2020
args:
2121
- --extend-ignore=E203,E501
2222
- repo: https://github.com/pycqa/isort
23-
rev: 5.13.2
23+
rev: 7.0.0
2424
hooks:
2525
- id: isort
2626
name: isort (python)

‎dependencies/CASE-develop‎

‎dependencies/CASE-develop-2.0.0‎

‎dependencies/CASE-unstable‎

‎dependencies/CASE-unstable-2.0.0‎

‎examples/illustrations/Oresteia/Oresteia-prov.ttl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ kb:euripides-3696c710-161f-47af-9ae8-61b178611773
723723

724724
kb:investigative-action-30079255-a489-4dc2-ab5a-b9633a1cce95
725725
a
726-
time:ProperInterval ,
726+
time:Interval ,
727727
prov:Activity
728728
;
729729
time:hasBeginning kb:Start-9e0e52fc-16d6-5536-ab0c-d9728e2f35b8 ;
@@ -746,7 +746,7 @@ kb:investigative-action-30079255-a489-4dc2-ab5a-b9633a1cce95
746746

747747
kb:investigative-action-49e0d70c-f1bc-40a4-8866-45ddb8ad4e89
748748
a
749-
time:ProperInterval ,
749+
time:Interval ,
750750
prov:Activity
751751
;
752752
time:hasBeginning kb:Start-a2131571-c0fa-5fd0-97d6-777208d72098 ;
@@ -785,7 +785,7 @@ kb:investigative-action-49e0d70c-f1bc-40a4-8866-45ddb8ad4e89
785785

786786
kb:investigative-action-714255fe-ce2d-43e5-b0da-0910cc0e3997
787787
a
788-
time:ProperInterval ,
788+
time:Interval ,
789789
prov:Activity
790790
;
791791
time:hasBeginning kb:Start-e4a6a525-e2d0-5cea-a868-cf883f517ea5 ;
@@ -820,7 +820,7 @@ kb:investigative-action-714255fe-ce2d-43e5-b0da-0910cc0e3997
820820

821821
kb:investigative-action-7786ff3a-d40b-45a9-b65c-94ad10597b62
822822
a
823-
time:ProperInterval ,
823+
time:Interval ,
824824
prov:Activity
825825
;
826826
time:hasBeginning kb:Start-b80b4d9a-9047-557c-b253-de62930afbc0 ;
@@ -851,7 +851,7 @@ kb:investigative-action-7786ff3a-d40b-45a9-b65c-94ad10597b62
851851

852852
kb:investigative-action-b8fd94b9-ceae-4c2f-aa38-8cfaa98804fe
853853
a
854-
time:ProperInterval ,
854+
time:Interval ,
855855
prov:Activity ,
856856
prov:Agent
857857
;

‎examples/illustrations/Oresteia/Oresteia.json‎

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"uco-role": "https://ontology.unifiedcyberontology.org/uco/role/",
1717
"uco-tool": "https://ontology.unifiedcyberontology.org/uco/tool/",
1818
"uco-types": "https://ontology.unifiedcyberontology.org/uco/types/",
19-
"uco-vocabulary": "https://ontology.unifiedcyberontology.org/uco/vocabulary/",
2019
"xsd": "http://www.w3.org/2001/XMLSchema#"
2120
},
2221
"@id": "kb:bundle-3b13e958a-d975-41aa-b1bb-029d2b6707cd",
@@ -227,6 +226,12 @@
227226
{
228227
"@id": "kb:clytemnestra-device-3a61cb3a-422d-4953-af70-25a860456e50"
229228
},
229+
{
230+
"@id": "kb:relationship-3707f6c4-b90a-4c70-9482-bb208d332e85"
231+
},
232+
{
233+
"@id": "kb:operating-system-9eea07c7-c348-4fa3-aef6-67f2fe651204"
234+
},
230235
{
231236
"@id": "kb:clytemnestra-mobileaccount-363dd368-94bd-4dbb-af1d-f53d0085791e"
232237
},
@@ -794,15 +799,6 @@
794799
"drafting:ownerName": "Clytemnestras iPhone",
795800
"drafting:uniqueID": "B3858A69A29375E6C706226B3633A3A11EB2A774"
796801
},
797-
{
798-
"@id": "kb:operating-system-facet-ad90e7e5-c692-4c59-87c6-d36c463ff1b0",
799-
"@type": "uco-observable:OperatingSystemFacet",
800-
"uco-core:name": "iOS",
801-
"uco-observable:manufacturer": {
802-
"@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4"
803-
},
804-
"uco-observable:version": "10.3"
805-
},
806802
{
807803
"@id": "kb:wifi-address-facet-00ec20e0-4af9-45c0-9246-7a87e8c47f3d",
808804
"@type": "uco-observable:WifiAddressFacet",
@@ -815,6 +811,34 @@
815811
}
816812
]
817813
},
814+
{
815+
"@id": "kb:operating-system-9eea07c7-c348-4fa3-aef6-67f2fe651204",
816+
"@type": [
817+
"uco-observable:OperatingSystem",
818+
"uco-observable:Software"
819+
],
820+
"uco-core:hasFacet": {
821+
"@id": "kb:software-facet-906f160c-bbc0-48a5-bb0c-7338ebabf1e9",
822+
"@type": "uco-observable:SoftwareFacet",
823+
"uco-observable:manufacturer": {
824+
"@id": "kb:organization-0645704f-fc66-4d90-810a-dc0fb8a95fa4"
825+
},
826+
"uco-observable:version": "10.3"
827+
},
828+
"uco-core:name": "iOS"
829+
},
830+
{
831+
"@id": "kb:relationship-3707f6c4-b90a-4c70-9482-bb208d332e85",
832+
"@type": "uco-observable:ObservableRelationship",
833+
"uco-core:isDirectional": true,
834+
"uco-core:kindOfRelationship": "Has_Operating_System",
835+
"uco-core:source": {
836+
"@id": "kb:clytemnestra-device-3a61cb3a-422d-4953-af70-25a860456e50"
837+
},
838+
"uco-core:target": {
839+
"@id": "kb:operating-system-9eea07c7-c348-4fa3-aef6-67f2fe651204"
840+
}
841+
},
818842
{
819843
"@id": "kb:clytemnestra-mobileaccount-363dd368-94bd-4dbb-af1d-f53d0085791e",
820844
"@type": "uco-observable:MobileAccount",
@@ -1044,10 +1068,7 @@
10441068
{
10451069
"@id": "kb:hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d",
10461070
"@type": "uco-types:Hash",
1047-
"uco-types:hashMethod": {
1048-
"@type": "uco-vocabulary:HashNameVocab",
1049-
"@value": "SHA256"
1050-
},
1071+
"uco-types:hashMethod": "SHA256",
10511072
"uco-types:hashValue": {
10521073
"@type": "xsd:hexBinary",
10531074
"@value": "7ea081166336119da78ee4bbdbd06840b94efe28988a2bdb0bcf2387a481e283"
@@ -1111,10 +1132,7 @@
11111132
{
11121133
"@id": "kb:hash-c6cc7dd6-1bf9-5454-9653-37caff09411d",
11131134
"@type": "uco-types:Hash",
1114-
"uco-types:hashMethod": {
1115-
"@type": "uco-vocabulary:HashNameVocab",
1116-
"@value": "SHA256"
1117-
},
1135+
"uco-types:hashMethod": "SHA256",
11181136
"uco-types:hashValue": {
11191137
"@type": "xsd:hexBinary",
11201138
"@value": "a13225720074371d56a4f4d5117fbb4953c5b1d316b31f21edcb7ed8fdf66c6e"
@@ -1179,10 +1197,7 @@
11791197
{
11801198
"@id": "kb:hash-1a6175e1-cef7-5ee3-8703-22f5f7a43603",
11811199
"@type": "uco-types:Hash",
1182-
"uco-types:hashMethod": {
1183-
"@type": "uco-vocabulary:HashNameVocab",
1184-
"@value": "SHA256"
1185-
},
1200+
"uco-types:hashMethod": "SHA256",
11861201
"uco-types:hashValue": {
11871202
"@type": "xsd:hexBinary",
11881203
"@value": "0611ea093d19b1c73a5285ff43741dd77f2a8d983c1c71044eb072e44f5dcb0a"

‎examples/illustrations/Oresteia/Oresteia_validation-develop-2.0.0.ttl‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
44
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
55
@prefix sh: <http://www.w3.org/ns/shacl#> .
6-
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
76
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
87

98
[]
@@ -13,31 +12,21 @@
1312
[
1413
a sh:ValidationResult ;
1514
sh:focusNode <http://example.org/kb/account-facet-265c4daa-b473-43d3-a186-77ff2da9ac70> ;
16-
sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
15+
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
1716
sh:resultPath observable:accountType ;
1817
sh:resultSeverity sh:Info ;
19-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
20-
sh:sourceShape [
21-
sh:datatype vocabulary:AccountTypeVocab ;
22-
sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
23-
sh:path observable:accountType ;
24-
sh:severity sh:Info ;
25-
] ;
18+
sh:sourceConstraintComponent sh:InConstraintComponent ;
19+
sh:sourceShape observable:AccountFacet-accountType-in-shape ;
2620
sh:value "Phone" ;
2721
] ,
2822
[
2923
a sh:ValidationResult ;
3024
sh:focusNode <http://example.org/kb/account-facet-5f3e4a6d-4cf1-41fa-a948-759a08db3ab7> ;
31-
sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
25+
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
3226
sh:resultPath observable:accountType ;
3327
sh:resultSeverity sh:Info ;
34-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
35-
sh:sourceShape [
36-
sh:datatype vocabulary:AccountTypeVocab ;
37-
sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
38-
sh:path observable:accountType ;
39-
sh:severity sh:Info ;
40-
] ;
28+
sh:sourceConstraintComponent sh:InConstraintComponent ;
29+
sh:sourceShape observable:AccountFacet-accountType-in-shape ;
4130
sh:value "Phone" ;
4231
]
4332
;

‎examples/illustrations/Oresteia/Oresteia_validation-develop.ttl‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
44
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
55
@prefix sh: <http://www.w3.org/ns/shacl#> .
6-
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
76
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
87

98
[]
@@ -13,31 +12,21 @@
1312
[
1413
a sh:ValidationResult ;
1514
sh:focusNode <http://example.org/kb/account-facet-265c4daa-b473-43d3-a186-77ff2da9ac70> ;
16-
sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
15+
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
1716
sh:resultPath observable:accountType ;
1817
sh:resultSeverity sh:Info ;
19-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
20-
sh:sourceShape [
21-
sh:datatype vocabulary:AccountTypeVocab ;
22-
sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
23-
sh:path observable:accountType ;
24-
sh:severity sh:Info ;
25-
] ;
18+
sh:sourceConstraintComponent sh:InConstraintComponent ;
19+
sh:sourceShape observable:AccountFacet-accountType-in-shape ;
2620
sh:value "Phone" ;
2721
] ,
2822
[
2923
a sh:ValidationResult ;
3024
sh:focusNode <http://example.org/kb/account-facet-5f3e4a6d-4cf1-41fa-a948-759a08db3ab7> ;
31-
sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
25+
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
3226
sh:resultPath observable:accountType ;
3327
sh:resultSeverity sh:Info ;
34-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
35-
sh:sourceShape [
36-
sh:datatype vocabulary:AccountTypeVocab ;
37-
sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
38-
sh:path observable:accountType ;
39-
sh:severity sh:Info ;
40-
] ;
28+
sh:sourceConstraintComponent sh:InConstraintComponent ;
29+
sh:sourceShape observable:AccountFacet-accountType-in-shape ;
4130
sh:value "Phone" ;
4231
]
4332
;

0 commit comments

Comments
 (0)