Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issues 549, 593, 612: Catch develop-2.0.0 up to develop #635

Merged
merged 26 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
79261b8
Issue: 549
Aug 4, 2023
03a3d3c
Warn if a Disk instance is not also a Device
ajnelson-nist Jul 26, 2024
a271750
Warn if a Disk instance is not also a StorageMedium
ajnelson-nist Jul 29, 2024
c9c921d
Add missed prefix
ajnelson-nist Aug 9, 2024
37f7b86
Make objectStatus optional
ajnelson-nist Aug 9, 2024
a6f84ce
Normalize
ajnelson-nist Aug 9, 2024
1db08e8
Merge branch 'develop' into Feature-Issue-549
ajnelson-nist Aug 9, 2024
70a1975
Move ObjectStatusVocab into core namesapce
ajnelson-nist Aug 9, 2024
becf55e
Remove owl:onDatatype from vocabulary definitions
ajnelson-nist Aug 9, 2024
a7c7814
Close objectStatus
ajnelson-nist Aug 9, 2024
f7a0f30
Add tests
ajnelson-nist Aug 13, 2024
8e09ce5
Regenerate Make-managed files
ajnelson-nist Aug 13, 2024
9c826de
Fix typo
ajnelson-nist Aug 13, 2024
e9e9e0f
Require core:objectStatus only be used on UcoObjects
ajnelson-nist Aug 13, 2024
ccf355e
Regenerate Make-managed files
ajnelson-nist Aug 13, 2024
f54ac1b
Change type of core:objectStatus
ajnelson-nist Aug 13, 2024
253d3aa
Align label style for core:objectStatus
ajnelson-nist Aug 13, 2024
3a7b8cc
Delegate membership error message to SHACL base templating
ajnelson-nist Aug 13, 2024
aa5a536
Regenerate Make-managed files
ajnelson-nist Aug 13, 2024
14e32c2
Adjust Make-managed file
ajnelson-nist Aug 28, 2024
74e9f5a
Merge pull request #631 from ucoProject/Feature-Issue-549
plbt5 Aug 30, 2024
178efd0
Merge pull request #620 from ucoProject/Feature-Issue-612
plbt5 Sep 11, 2024
df02302
Merge branch 'develop' into Feature-Issue-593
ajnelson-nist Oct 4, 2024
3f0f713
Remove owl:onDatatype from new vocabulary definition
ajnelson-nist Oct 4, 2024
fe4c001
Merge pull request #628 from ucoProject/Feature-Issue-593
plbt5 Oct 16, 2024
04e4678
Merge branch 'develop-2.0.0' into Features-Issues-549-593-612-2.0.0
ajnelson-nist Oct 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions ontology/uco/core/core.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,19 @@ core:ModusOperandi
sh:targetClass core:ModusOperandi ;
.

core:ObjectStatusVocab
a rdfs:Datatype ;
rdfs:label "Object Status Vocabulary"@en-US ;
owl:equivalentClass [
a rdfs:Datatype ;
owl:oneOf (
"Draft"^^core:ObjectStatusVocab
"Final"^^core:ObjectStatusVocab
"Deprecated"^^core:ObjectStatusVocab
) ;
] ;
.

core:Relationship
a
owl:Class ,
Expand Down Expand Up @@ -450,6 +463,17 @@ core:UcoObject
sh:datatype xsd:string ;
sh:nodeKind sh:Literal ;
sh:path core:tag ;
] ,
[
sh:datatype core:ObjectStatusVocab ;
sh:in (
"Draft"^^core:ObjectStatusVocab
"Final"^^core:ObjectStatusVocab
"Deprecated"^^core:ObjectStatusVocab
) ;
sh:maxCount "1"^^xsd:integer ;
sh:nodeKind sh:Literal ;
sh:path core:objectStatus ;
]
;
sh:targetClass core:UcoObject ;
Expand Down Expand Up @@ -696,6 +720,19 @@ core:objectMarking
rdfs:range core:MarkingDefinitionAbstraction ;
.

core:objectStatus
a owl:AnnotationProperty ;
rdfs:label "objectStatus"@en ;
rdfs:comment "The current state of formality and acceptance for a UCO object."@en-US ;
rdfs:range core:ObjectStatusVocab ;
.

core:objectStatus-subjects-shape
a sh:NodeShape ;
sh:class core:UcoObject ;
sh:targetSubjectsOf core:objectStatus ;
.

core:referenceURL
a owl:DatatypeProperty ;
rdfs:label "referenceURL"@en ;
Expand Down
8 changes: 8 additions & 0 deletions ontology/uco/observable/observable.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -2430,6 +2430,14 @@ observable:Disk
rdfs:subClassOf observable:ObservableObject ;
rdfs:label "Disk"@en ;
rdfs:comment "A disk is a storage mechanism where data is recorded by various electronic, magnetic, optical, or mechanical changes to a surface layer of one or more rotating disks."@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:StorageMedium ;
sh:message "In UCO 2.0.0, uco-observable:Disk will be a subclass of uco-observable:StorageMedium. In preparation for UCO 2.0.0, the additional type uco-observable:StorageMedium should be assigned to this node."@en ;
sh:severity sh:Warning ;
sh:targetClass observable:Disk ;
] ;
sh:targetClass observable:Disk ;
.

Expand Down
Loading
Loading