Skip to content

Commit 2a27568

Browse files
authored
Merge pull request #325 from casework/bump_prerelease_pointers
Bump prerelease pointers; log UCO Issue 629
2 parents 92e746a + 29f670b commit 2a27568

33 files changed

+13347
-6967
lines changed

examples/asgard/asgard_validation-develop-2.0.0.ttl

Lines changed: 64 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,75 @@
22
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
33
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
44
@prefix sh: <http://www.w3.org/ns/shacl#> .
5+
@prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
56
@prefix uco-observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
67
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
78
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
89

910
[]
1011
a sh:ValidationReport ;
11-
sh:conforms "true"^^xsd:boolean ;
12-
sh:result [
13-
a sh:ValidationResult ;
14-
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
15-
sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
16-
sh:resultPath uco-observable:accountType ;
17-
sh:resultSeverity sh:Info ;
18-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
19-
sh:sourceShape [
20-
sh:datatype vocabulary:AccountTypeVocab ;
21-
sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
22-
sh:path uco-observable:accountType ;
23-
sh:severity sh:Info ;
24-
] ;
25-
sh:value "Phone" ;
26-
] ;
12+
sh:conforms "false"^^xsd:boolean ;
13+
sh:result
14+
[
15+
a sh:ValidationResult ;
16+
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
17+
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
18+
sh:resultPath uco-observable:accountType ;
19+
sh:resultSeverity sh:Info ;
20+
sh:sourceConstraintComponent sh:InConstraintComponent ;
21+
sh:sourceShape uco-observable:AccountFacet-accountType-in-shape ;
22+
sh:value "Phone" ;
23+
] ,
24+
[
25+
a sh:ValidationResult ;
26+
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
27+
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
28+
sh:resultPath types:hashMethod ;
29+
sh:resultSeverity sh:Warning ;
30+
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
31+
sh:sourceShape [
32+
sh:datatype xsd:string ;
33+
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
34+
sh:path types:hashMethod ;
35+
sh:severity sh:Warning ;
36+
] ;
37+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
38+
] ,
39+
[
40+
a sh:ValidationResult ;
41+
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
42+
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
43+
sh:resultPath types:hashMethod ;
44+
sh:resultSeverity sh:Info ;
45+
sh:sourceConstraintComponent sh:InConstraintComponent ;
46+
sh:sourceShape types:Hash-hashMethod-in-shape ;
47+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
48+
] ,
49+
[
50+
a sh:ValidationResult ;
51+
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
52+
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
53+
sh:resultPath types:hashMethod ;
54+
sh:resultSeverity sh:Warning ;
55+
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
56+
sh:sourceShape [
57+
sh:datatype xsd:string ;
58+
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
59+
sh:path types:hashMethod ;
60+
sh:severity sh:Warning ;
61+
] ;
62+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
63+
] ,
64+
[
65+
a sh:ValidationResult ;
66+
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
67+
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
68+
sh:resultPath types:hashMethod ;
69+
sh:resultSeverity sh:Info ;
70+
sh:sourceConstraintComponent sh:InConstraintComponent ;
71+
sh:sourceShape types:Hash-hashMethod-in-shape ;
72+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
73+
]
74+
;
2775
.
2876

examples/asgard/asgard_validation-develop.ttl

Lines changed: 64 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,75 @@
22
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
33
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
44
@prefix sh: <http://www.w3.org/ns/shacl#> .
5+
@prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
56
@prefix uco-observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
67
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
78
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
89

910
[]
1011
a sh:ValidationReport ;
11-
sh:conforms "true"^^xsd:boolean ;
12-
sh:result [
13-
a sh:ValidationResult ;
14-
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
15-
sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
16-
sh:resultPath uco-observable:accountType ;
17-
sh:resultSeverity sh:Info ;
18-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
19-
sh:sourceShape [
20-
sh:datatype vocabulary:AccountTypeVocab ;
21-
sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
22-
sh:path uco-observable:accountType ;
23-
sh:severity sh:Info ;
24-
] ;
25-
sh:value "Phone" ;
26-
] ;
12+
sh:conforms "false"^^xsd:boolean ;
13+
sh:result
14+
[
15+
a sh:ValidationResult ;
16+
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
17+
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
18+
sh:resultPath uco-observable:accountType ;
19+
sh:resultSeverity sh:Info ;
20+
sh:sourceConstraintComponent sh:InConstraintComponent ;
21+
sh:sourceShape uco-observable:AccountFacet-accountType-in-shape ;
22+
sh:value "Phone" ;
23+
] ,
24+
[
25+
a sh:ValidationResult ;
26+
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
27+
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
28+
sh:resultPath types:hashMethod ;
29+
sh:resultSeverity sh:Warning ;
30+
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
31+
sh:sourceShape [
32+
sh:datatype xsd:string ;
33+
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
34+
sh:path types:hashMethod ;
35+
sh:severity sh:Warning ;
36+
] ;
37+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
38+
] ,
39+
[
40+
a sh:ValidationResult ;
41+
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
42+
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
43+
sh:resultPath types:hashMethod ;
44+
sh:resultSeverity sh:Info ;
45+
sh:sourceConstraintComponent sh:InConstraintComponent ;
46+
sh:sourceShape types:Hash-hashMethod-in-shape ;
47+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
48+
] ,
49+
[
50+
a sh:ValidationResult ;
51+
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
52+
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
53+
sh:resultPath types:hashMethod ;
54+
sh:resultSeverity sh:Warning ;
55+
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
56+
sh:sourceShape [
57+
sh:datatype xsd:string ;
58+
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
59+
sh:path types:hashMethod ;
60+
sh:severity sh:Warning ;
61+
] ;
62+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
63+
] ,
64+
[
65+
a sh:ValidationResult ;
66+
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
67+
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
68+
sh:resultPath types:hashMethod ;
69+
sh:resultSeverity sh:Info ;
70+
sh:sourceConstraintComponent sh:InConstraintComponent ;
71+
sh:sourceShape types:Hash-hashMethod-in-shape ;
72+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
73+
]
74+
;
2775
.
2876

examples/asgard/asgard_validation-unstable-2.0.0.ttl

Lines changed: 66 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,77 @@
22
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
33
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
44
@prefix sh: <http://www.w3.org/ns/shacl#> .
5+
@prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
56
@prefix uco-observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
67
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
78
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
89

910
[]
1011
a sh:ValidationReport ;
11-
sh:conforms "true"^^xsd:boolean ;
12-
sh:result [
13-
a sh:ValidationResult ;
14-
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
15-
sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
16-
sh:resultPath uco-observable:accountType ;
17-
sh:resultSeverity sh:Info ;
18-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
19-
sh:sourceShape [
20-
sh:datatype vocabulary:AccountTypeVocab ;
21-
sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
22-
sh:path uco-observable:accountType ;
23-
sh:severity sh:Info ;
24-
] ;
25-
sh:value "Phone" ;
26-
] ;
12+
sh:conforms "false"^^xsd:boolean ;
13+
sh:result
14+
[
15+
a sh:ValidationResult ;
16+
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
17+
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
18+
sh:resultPath uco-observable:accountType ;
19+
sh:resultSeverity sh:Info ;
20+
sh:sourceConstraintComponent sh:InConstraintComponent ;
21+
sh:sourceShape uco-observable:AccountFacet-accountType-in-shape ;
22+
sh:value "Phone" ;
23+
] ,
24+
[
25+
a sh:ValidationResult ;
26+
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
27+
sh:resultMessage "Value is not Literal with datatype xsd:string" ;
28+
sh:resultPath types:hashMethod ;
29+
sh:resultSeverity sh:Violation ;
30+
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
31+
sh:sourceShape [
32+
sh:datatype xsd:string ;
33+
sh:maxCount "1"^^xsd:integer ;
34+
sh:minCount "1"^^xsd:integer ;
35+
sh:nodeKind sh:Literal ;
36+
sh:path types:hashMethod ;
37+
] ;
38+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
39+
] ,
40+
[
41+
a sh:ValidationResult ;
42+
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
43+
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
44+
sh:resultPath types:hashMethod ;
45+
sh:resultSeverity sh:Info ;
46+
sh:sourceConstraintComponent sh:InConstraintComponent ;
47+
sh:sourceShape types:Hash-hashMethod-in-shape ;
48+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
49+
] ,
50+
[
51+
a sh:ValidationResult ;
52+
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
53+
sh:resultMessage "Value is not Literal with datatype xsd:string" ;
54+
sh:resultPath types:hashMethod ;
55+
sh:resultSeverity sh:Violation ;
56+
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
57+
sh:sourceShape [
58+
sh:datatype xsd:string ;
59+
sh:maxCount "1"^^xsd:integer ;
60+
sh:minCount "1"^^xsd:integer ;
61+
sh:nodeKind sh:Literal ;
62+
sh:path types:hashMethod ;
63+
] ;
64+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
65+
] ,
66+
[
67+
a sh:ValidationResult ;
68+
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
69+
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
70+
sh:resultPath types:hashMethod ;
71+
sh:resultSeverity sh:Info ;
72+
sh:sourceConstraintComponent sh:InConstraintComponent ;
73+
sh:sourceShape types:Hash-hashMethod-in-shape ;
74+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
75+
]
76+
;
2777
.
2878

examples/asgard/asgard_validation-unstable.ttl

Lines changed: 64 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,75 @@
22
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
33
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
44
@prefix sh: <http://www.w3.org/ns/shacl#> .
5+
@prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
56
@prefix uco-observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
67
@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
78
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
89

910
[]
1011
a sh:ValidationReport ;
11-
sh:conforms "true"^^xsd:boolean ;
12-
sh:result [
13-
a sh:ValidationResult ;
14-
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
15-
sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
16-
sh:resultPath uco-observable:accountType ;
17-
sh:resultSeverity sh:Info ;
18-
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
19-
sh:sourceShape [
20-
sh:datatype vocabulary:AccountTypeVocab ;
21-
sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
22-
sh:path uco-observable:accountType ;
23-
sh:severity sh:Info ;
24-
] ;
25-
sh:value "Phone" ;
26-
] ;
12+
sh:conforms "false"^^xsd:boolean ;
13+
sh:result
14+
[
15+
a sh:ValidationResult ;
16+
sh:focusNode <http://example.org/kb/account-facet-31df5a8a-fb9f-4fa6-85f9-cea13f4b9f03> ;
17+
sh:resultMessage "Value is not member of the vocabulary AccountTypeVocab." ;
18+
sh:resultPath uco-observable:accountType ;
19+
sh:resultSeverity sh:Info ;
20+
sh:sourceConstraintComponent sh:InConstraintComponent ;
21+
sh:sourceShape uco-observable:AccountFacet-accountType-in-shape ;
22+
sh:value "Phone" ;
23+
] ,
24+
[
25+
a sh:ValidationResult ;
26+
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
27+
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
28+
sh:resultPath types:hashMethod ;
29+
sh:resultSeverity sh:Warning ;
30+
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
31+
sh:sourceShape [
32+
sh:datatype xsd:string ;
33+
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
34+
sh:path types:hashMethod ;
35+
sh:severity sh:Warning ;
36+
] ;
37+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
38+
] ,
39+
[
40+
a sh:ValidationResult ;
41+
sh:focusNode <http://example.org/kb/hash-bfa02feb-6184-5ca5-9ba3-272bf4367c5d> ;
42+
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
43+
sh:resultPath types:hashMethod ;
44+
sh:resultSeverity sh:Info ;
45+
sh:sourceConstraintComponent sh:InConstraintComponent ;
46+
sh:sourceShape types:Hash-hashMethod-in-shape ;
47+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
48+
] ,
49+
[
50+
a sh:ValidationResult ;
51+
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
52+
sh:resultMessage "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
53+
sh:resultPath types:hashMethod ;
54+
sh:resultSeverity sh:Warning ;
55+
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
56+
sh:sourceShape [
57+
sh:datatype xsd:string ;
58+
sh:message "As of UCO 1.4.0, the datatype to use for types:hashMethod should be xsd:string. Not using xsd:string will be an error in UCO 2.0.0." ;
59+
sh:path types:hashMethod ;
60+
sh:severity sh:Warning ;
61+
] ;
62+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
63+
] ,
64+
[
65+
a sh:ValidationResult ;
66+
sh:focusNode <http://example.org/kb/hash-c6cc7dd6-1bf9-5454-9653-37caff09411d> ;
67+
sh:resultMessage "Value is not member of the vocabulary HashNameVocab." ;
68+
sh:resultPath types:hashMethod ;
69+
sh:resultSeverity sh:Info ;
70+
sh:sourceConstraintComponent sh:InConstraintComponent ;
71+
sh:sourceShape types:Hash-hashMethod-in-shape ;
72+
sh:value "SHA256"^^vocabulary:HashNameVocab ;
73+
]
74+
;
2775
.
2876

0 commit comments

Comments
 (0)