Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
79261b8
Issue: 549
Aug 4, 2023
6160019
Warn if target or source on an ObservableRelationship are not Observa…
ajnelson-nist Dec 21, 2023
250f5cc
Merge pull request #581 from ucoProject/release-1.3.0
kchason Jan 24, 2024
084e2cd
Replace errant reference to non-existent concept owl:Datatype
ajnelson-nist Feb 1, 2024
e6dba28
Warn of prior disjointedness declarations in core: and types:
ajnelson-nist Feb 1, 2024
9460e74
Regenerate Make-managed files
ajnelson-nist Feb 1, 2024
e0346f3
Remove 1-member minimum on core:ContextualCompilation
ajnelson-nist Mar 7, 2024
04a75a6
Merge pull request #600 from ucoProject/Feature-Issue-599
plbt5 Apr 30, 2024
38c21b7
Merge pull request #585 from ucoProject/BugFix-Issue-584
plbt5 Apr 30, 2024
27ca6b0
Merge pull request #574 from ucoProject/Feature-Issue-573
plbt5 Apr 30, 2024
c349b32
Warn about key-uniqueness enforcement to types:Dictionary
ajnelson-nist May 7, 2024
45d98e9
Regenerate Make-managed files
ajnelson-nist May 7, 2024
13f877b
Warn if an AlternateDataStream instance is not also a FileSystemObject
ajnelson-nist May 10, 2024
5a40aa4
Regenerate Make-managed files
ajnelson-nist May 10, 2024
c63a636
Fix syntax
ajnelson-nist Jun 4, 2024
f9d273b
Inline DictionaryEntry nodes
ajnelson-nist Jun 4, 2024
6827596
Add and test Improper and Proper Dictionary subclasses and repeatsKey…
ajnelson-nist Jun 4, 2024
1e6d1af
Regenerate Make-managed files
ajnelson-nist Jun 4, 2024
6d4b850
Remove requirement that a Dictionary must have at least one entry
ajnelson-nist Jun 4, 2024
f2b11ce
Merge pull request #587 from ucoProject/Feature-Issue-586
plbt5 Jun 5, 2024
fde4cdd
Merge pull request #604 from ucoProject/BugFix-Issue-590
plbt5 Jun 5, 2024
79de609
Fix typo
ajnelson-nist Jun 14, 2024
845b819
Regenerate Make-managed files
ajnelson-nist Jun 14, 2024
c4294c7
Merge pull request #609 from ucoProject/Feature-Issue-586
plbt5 Jun 14, 2024
be9419d
Merge branch 'develop' into Feature-Issue-602
ajnelson-nist Jun 27, 2024
06392e9
Merge branch 'Feature-Issue-602' into Feature-Issue-602-NewDictionaries
ajnelson-nist Jun 27, 2024
9a355e4
Merge pull request #607 from ucoProject/Feature-Issue-602-NewDictiona…
plbt5 Jul 26, 2024
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
dd8abaa
Add cpeid to DeviceFacet
ajnelson-nist Aug 2, 2024
0377992
Warn of coming constraints on observable:cpeid
ajnelson-nist Aug 2, 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
aea0c04
Demonstrate revised vocabulary pattern on types:hashMethod
ajnelson-nist Aug 13, 2024
6d385ba
Regenerate Make-managed files
ajnelson-nist Aug 13, 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
62ebeab
Prepare OperatingSystem to become a subclass of Software
ajnelson-nist Sep 13, 2024
40b285a
Regenerate Make-managed files
ajnelson-nist Sep 13, 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
ceaa62e
Merge branch 'develop' into BugFix-Issue-629
ajnelson-nist Oct 17, 2024
54ea222
Revise vocabulary pattern for core:ObjectStatusVocab
ajnelson-nist Oct 17, 2024
12855bf
Regenerate Make-managed files
ajnelson-nist Oct 17, 2024
688d943
Regenerate Make-managed files
ajnelson-nist Oct 25, 2024
7d02783
Bump GitHub Action versions
ajnelson-nist Oct 25, 2024
904db37
Add core:informalType and link as parent of type-describing properties
ajnelson-nist Oct 28, 2024
6a74c77
Merge pull request #638 from ucoProject/regenerate_example_validation…
b0bkaT Oct 29, 2024
13d372c
Merge pull request #639 from ucoProject/bump_github_actions
b0bkaT Oct 29, 2024
da7df82
Update NIST licensing text
ajnelson-nist Oct 29, 2024
e147273
Merge pull request #642 from ucoProject/update_nist_licensing_text
kchason Nov 5, 2024
fb52f96
Merge pull request #633 from ucoProject/Feature-Issue-632
plbt5 Nov 8, 2024
50ce7ee
Revert "Warn of coming constraints on observable:cpeid"
ajnelson-nist Nov 22, 2024
9debc59
Merge branch 'develop' into Feature-Issue-624
ajnelson-nist Nov 22, 2024
cc26145
Merge pull request #625 from ucoProject/Feature-Issue-624
plbt5 Nov 22, 2024
0405eac
Merge pull request #641 from ucoProject/Feature-Issue-640
plbt5 Dec 19, 2024
5e4bd70
Merge branch 'develop' into BugFix-Issue-629
ajnelson-nist Feb 18, 2025
dc6b862
Revert addition of types:hashMethod-objects-in-shape
ajnelson-nist Feb 18, 2025
7037123
Regenerate Make-managed files
ajnelson-nist Feb 18, 2025
d7ea496
Revise test to use new vocabulary pattern
ajnelson-nist Feb 18, 2025
ed274b1
Apply revised vocabulary pattern
ajnelson-nist Feb 18, 2025
e6decb6
Regenerate Make-managed files
ajnelson-nist Feb 18, 2025
5ded259
Move sh:in review to named PropertyShapes
ajnelson-nist Feb 26, 2025
d524b8e
Regenerate Make-managed files
ajnelson-nist Feb 26, 2025
68ffd02
Fix logging syntax
ajnelson-nist Feb 26, 2025
26a1b94
Expand paths to SHACL vocabulary lists
ajnelson-nist Feb 26, 2025
eff5e3b
Merge pull request #630 from ucoProject/BugFix-Issue-629
plbt5 Mar 17, 2025
be55ca3
Fix copy-paste error
ajnelson-nist Mar 31, 2025
779c984
Merge pull request #654 from ucoProject/BugFix-Issue-563-typo
plbt5 May 28, 2025
3b19101
Bump version
ajnelson-nist May 28, 2025
38c9c52
Regenerate Make-managed files
ajnelson-nist May 28, 2025
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
21 changes: 12 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand All @@ -26,13 +29,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Start from clean state
Expand Down
15 changes: 9 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Through this approach not only are domain-focused representations defined consis
The purpose of this repository is to provide a foundation for broader community involvement in defining what to represent and how.

### Current Release
The current release of UCO is 1.2.0.
The current release of UCO is 1.4.0.

UCO 1.2.0 incorporates required refinements and updates, building on the stable 1.0.0 release. Following [SemVer](https://semver.org/spec/v2.0.0.html), additive improvements will continue to be accepted, but backwards-incompatible changes will be scheduled only for the 2.0.0 release, which will come after at least 6 months to possibly 12 months.

More detail of improvements is documented in the [UCO 1.2.0 release notes](https://unifiedcyberontology.org/releases/1.2.0/).
More detail of improvements is documented in the [UCO 1.4.0 release notes](https://unifiedcyberontology.org/releases/1.4.0/).
15 changes: 9 additions & 6 deletions lib/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
15 changes: 9 additions & 6 deletions ontology/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
15 changes: 9 additions & 6 deletions ontology/co/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
6 changes: 3 additions & 3 deletions ontology/co/co.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
a owl:Ontology ;
rdfs:label "uco-co"@en ;
rdfs:comment "This ontology defines SHACL shapes to supplement the OWL 2 DL definitions in the Collections Ontology."@en ;
owl:backwardCompatibleWith uco-co:1.2.0 ;
owl:backwardCompatibleWith uco-co:1.3.0 ;
owl:imports <http://purl.org/co> ;
owl:priorVersion uco-co:1.2.0 ;
owl:versionIRI uco-co:1.3.0 ;
owl:priorVersion uco-co:1.3.0 ;
owl:versionIRI uco-co:1.4.0 ;
.

co:ListItem
Expand Down
15 changes: 9 additions & 6 deletions ontology/owl/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
10 changes: 5 additions & 5 deletions ontology/owl/owl.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
rdfs:label "uco-owl"@en ;
rdfs:comment "This ontology defines SHACL shapes to perform conformance testing of OWL 2 DL. Some of these shapes follow rules specified from the canonical, subtractive parsing process of Section 3 of the OWL 2 mapping to RDF. From the last line of that document's Section 3, 'At the end of this process, the graph G MUST be empty,' anything not strictly matching patterns specified in that section cause the input graph to be non-conformant with OWL 2 DL."@en ;
rdfs:seeAlso <https://www.w3.org/TR/2012/REC-owl2-mapping-to-rdf-20121211/#Mapping_from_RDF_Graphs_to_the_Structural_Specification> ;
owl:backwardCompatibleWith uco-owl:1.2.0 ;
owl:priorVersion uco-owl:1.2.0 ;
owl:versionIRI uco-owl:1.3.0 ;
owl:backwardCompatibleWith uco-owl:1.3.0 ;
owl:priorVersion uco-owl:1.3.0 ;
owl:versionIRI uco-owl:1.4.0 ;
.

uco-owl:Axiom-shape
Expand Down Expand Up @@ -149,12 +149,12 @@ uco-owl:Disjointedness-C-DT-shape
sh:sparql [
a sh:SPARQLConstraint ;
rdfs:seeAlso <https://www.w3.org/TR/2012/REC-owl2-syntax-20121211/#Typing_Constraints_of_OWL_2_DL> ;
sh:message "An IRI may not be a member of both an owl:Class and owl:Datatype."@en ;
sh:message "An IRI may not be a member of both an owl:Class and rdfs:Datatype."@en ;
sh:select """
PREFIX owl: <http://www.w3.org/2002/07/owl#>
SELECT $this
WHERE {
$this a owl:Datatype ;
$this a rdfs:Datatype ;
}
""" ;
] ;
Expand Down
15 changes: 9 additions & 6 deletions ontology/uco/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/usr/bin/make -f

# Portions of this file contributed by NIST are governed by the
# following statement:
#
# This software was developed at the National Institute of Standards
# and Technology by employees of the Federal Government in the course
# of their official duties. Pursuant to title 17 Section 105 of the
# United States Code this software is not subject to copyright
# protection and is in the public domain. NIST assumes no
# responsibility whatsoever for its use by other parties, and makes
# no guarantees, expressed or implied, about its quality,
# reliability, or any other characteristic.
# of their official duties. Pursuant to Title 17 Section 105 of the
# United States Code, this software is not subject to copyright
# protection within the United States. NIST assumes no responsibility
# whatsoever for its use by other parties, and makes no guarantees,
# expressed or implied, about its quality, reliability, or any other
# characteristic.
#
# We would appreciate acknowledgement if the software is used.

Expand Down
Loading
Loading