Skip to content

Commit

Permalink
Merge pull request #582 from ucoProject/develop
Browse files Browse the repository at this point in the history
Release 1.3.0: Catch `develop-2.0.0` up to `develop`
  • Loading branch information
plbt5 authored Jan 31, 2024
2 parents 491c70d + 250f5cc commit d909363
Show file tree
Hide file tree
Showing 33 changed files with 202 additions and 200 deletions.
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/change-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,6 @@ Some requirements are narrow enough they could be considered "Self-documenting."
> Requirement 1 also fully describes the solution, implemented in [PR X](https://github.com/ucoProject/UCO/pull/X).
If there is an accompanying pull request, please do link it under the "Development" box on the right of the Issues page.
If example snippets of instance data are provided, please note if you provide permission for the examples to be transcribed to one of the tested example repositories (such as CASE-Examples). This is a significant aid in confirming examples represent the semantics that the submitter intended. "I am fine with my examples being transcribed and credited" should be sufficient.
-->
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.1.0 ;
owl:backwardCompatibleWith uco-co:1.2.0 ;
owl:imports <http://purl.org/co> ;
owl:priorVersion uco-co:1.1.0 ;
owl:versionIRI uco-co:1.2.0 ;
owl:priorVersion uco-co:1.2.0 ;
owl:versionIRI uco-co:1.3.0 ;
.

co:ListItem
Expand Down
6 changes: 3 additions & 3 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.1.0 ;
owl:priorVersion uco-owl:1.1.0 ;
owl:versionIRI uco-owl:1.2.0 ;
owl:backwardCompatibleWith uco-owl:1.2.0 ;
owl:priorVersion uco-owl:1.2.0 ;
owl:versionIRI uco-owl:1.3.0 ;
.

uco-owl:Axiom-shape
Expand Down
26 changes: 13 additions & 13 deletions ontology/uco/action/action.ttl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/location/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/pattern/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/types/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/vocabulary/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.3.0
# imports: https://ontology.unifiedcyberontology.org/uco/location/1.3.0
# imports: https://ontology.unifiedcyberontology.org/uco/pattern/1.3.0
# imports: https://ontology.unifiedcyberontology.org/uco/types/1.3.0
# imports: https://ontology.unifiedcyberontology.org/uco/vocabulary/1.3.0

@prefix action: <https://ontology.unifiedcyberontology.org/uco/action/> .
@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
Expand All @@ -20,16 +20,16 @@
a owl:Ontology ;
rdfs:label "uco-action"@en ;
rdfs:comment "This ontology defines classes and properties for characterizing actions."@en-US ;
owl:backwardCompatibleWith action:1.1.0 ;
owl:backwardCompatibleWith action:1.2.0 ;
owl:imports
core:1.2.0 ,
location:1.2.0 ,
pattern:1.2.0 ,
types:1.2.0 ,
vocabulary:1.2.0
core:1.3.0 ,
location:1.3.0 ,
pattern:1.3.0 ,
types:1.3.0 ,
vocabulary:1.3.0
;
owl:priorVersion action:1.1.0 ;
owl:versionIRI action:1.2.0 ;
owl:priorVersion action:1.2.0 ;
owl:versionIRI action:1.3.0 ;
.

action:Action
Expand Down
12 changes: 6 additions & 6 deletions ontology/uco/action/catalog-v001.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
<uri id="User Entered Import Resolution" uri="../../../dependencies/collections-ontology/collections.owl" name="http://purl.org/co"/>
<uri id="User Entered Import Resolution" uri="../../../dependencies/error/docs/current/error.ttl" name="http://purl.org/spar/error"/>
<uri id="User Entered Import Resolution" uri="../../co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.3.0"/>
<uri id="User Entered Import Resolution" uri="action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action"/>
</catalog>
10 changes: 5 additions & 5 deletions ontology/uco/analysis/analysis.ttl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# imports: https://ontology.unifiedcyberontology.org/uco/action/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/action/1.3.0

@prefix action: <https://ontology.unifiedcyberontology.org/uco/action/> .
@prefix analysis: <https://ontology.unifiedcyberontology.org/uco/analysis/> .
Expand All @@ -14,10 +14,10 @@
rdfs:label "uco-analysis"@en ;
rdfs:comment "This ontology defines classes and properties for characterizing analytic actions and results."@en-US ;
rdfs:seeAlso <https://github.com/ucoProject/UCO/issues/400> ;
owl:backwardCompatibleWith analysis:1.1.0 ;
owl:imports action:1.2.0 ;
owl:priorVersion analysis:1.1.0 ;
owl:versionIRI analysis:1.2.0 ;
owl:backwardCompatibleWith analysis:1.2.0 ;
owl:imports action:1.3.0 ;
owl:priorVersion analysis:1.2.0 ;
owl:versionIRI analysis:1.3.0 ;
.

analysis:Analysis
Expand Down
14 changes: 7 additions & 7 deletions ontology/uco/analysis/catalog-v001.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
<uri id="User Entered Import Resolution" uri="../../../dependencies/collections-ontology/collections.owl" name="http://purl.org/co"/>
<uri id="User Entered Import Resolution" uri="../../../dependencies/error/docs/current/error.ttl" name="http://purl.org/spar/error"/>
<uri id="User Entered Import Resolution" uri="../../co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.3.0"/>
<uri id="User Entered Import Resolution" uri="analysis.ttl" name="https://ontology.unifiedcyberontology.org/uco/analysis"/>
</catalog>
2 changes: 1 addition & 1 deletion ontology/uco/configuration/catalog-v001.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
<uri id="User Entered Import Resolution" uri="configuration.ttl" name="https://ontology.unifiedcyberontology.org/uco/configuration"/>
</catalog>
10 changes: 5 additions & 5 deletions ontology/uco/configuration/configuration.ttl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.3.0

@prefix configuration: <https://ontology.unifiedcyberontology.org/uco/configuration/> .
@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
Expand All @@ -13,10 +13,10 @@
rdfs:label "uco-configuration"@en ;
rdfs:comment "This ontology defines classes and properties for characterizing configurations."@en-US ;
rdfs:seeAlso <https://github.com/ucoProject/UCO/issues/432> ;
owl:backwardCompatibleWith configuration:1.1.0 ;
owl:imports core:1.2.0 ;
owl:priorVersion configuration:1.1.0 ;
owl:versionIRI configuration:1.2.0 ;
owl:backwardCompatibleWith configuration:1.2.0 ;
owl:imports core:1.3.0 ;
owl:priorVersion configuration:1.2.0 ;
owl:versionIRI configuration:1.3.0 ;
.

configuration:Configuration
Expand Down
6 changes: 3 additions & 3 deletions ontology/uco/core/core.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
a owl:Ontology ;
rdfs:label "uco-core"@en ;
rdfs:comment "This ontology defines classes and properties that are shared across the various UCO ontologies. At a high-level, the UCO core ontology provides base classes, relationship-oriented classes, content-aggregation classes, and shared classes."@en ;
owl:backwardCompatibleWith core:1.1.0 ;
owl:priorVersion core:1.1.0 ;
owl:versionIRI core:1.2.0 ;
owl:backwardCompatibleWith core:1.2.0 ;
owl:priorVersion core:1.2.0 ;
owl:versionIRI core:1.3.0 ;
.

action:Action
Expand Down
4 changes: 2 additions & 2 deletions ontology/uco/identity/catalog-v001.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.3.0"/>
<uri id="User Entered Import Resolution" uri="identity.ttl" name="https://ontology.unifiedcyberontology.org/uco/identity"/>
</catalog>
14 changes: 7 additions & 7 deletions ontology/uco/identity/identity.ttl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/location/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.3.0
# imports: https://ontology.unifiedcyberontology.org/uco/location/1.3.0

@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@prefix identity: <https://ontology.unifiedcyberontology.org/uco/identity/> .
Expand All @@ -13,13 +13,13 @@
<https://ontology.unifiedcyberontology.org/uco/identity>
a owl:Ontology ;
rdfs:label "uco-identity"@en ;
owl:backwardCompatibleWith identity:1.1.0 ;
owl:backwardCompatibleWith identity:1.2.0 ;
owl:imports
core:1.2.0 ,
location:1.2.0
core:1.3.0 ,
location:1.3.0
;
owl:priorVersion identity:1.1.0 ;
owl:versionIRI identity:1.2.0 ;
owl:priorVersion identity:1.2.0 ;
owl:versionIRI identity:1.3.0 ;
.

identity:AddressFacet
Expand Down
2 changes: 1 addition & 1 deletion ontology/uco/location/catalog-v001.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
<uri id="User Entered Import Resolution" uri="location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location"/>
</catalog>
10 changes: 5 additions & 5 deletions ontology/uco/location/location.ttl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.3.0

@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@prefix location: <https://ontology.unifiedcyberontology.org/uco/location/> .
Expand All @@ -11,10 +11,10 @@
<https://ontology.unifiedcyberontology.org/uco/location>
a owl:Ontology ;
rdfs:label "uco-location"@en ;
owl:backwardCompatibleWith location:1.1.0 ;
owl:imports core:1.2.0 ;
owl:priorVersion location:1.1.0 ;
owl:versionIRI location:1.2.0 ;
owl:backwardCompatibleWith location:1.2.0 ;
owl:imports core:1.3.0 ;
owl:priorVersion location:1.2.0 ;
owl:versionIRI location:1.3.0 ;
.

location:GPSCoordinatesFacet
Expand Down
2 changes: 1 addition & 1 deletion ontology/uco/marking/catalog-v001.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
<uri id="User Entered Import Resolution" uri="marking.ttl" name="https://ontology.unifiedcyberontology.org/uco/marking"/>
</catalog>
10 changes: 5 additions & 5 deletions ontology/uco/marking/marking.ttl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.3.0

@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@prefix marking: <https://ontology.unifiedcyberontology.org/uco/marking/> .
Expand All @@ -12,10 +12,10 @@
a owl:Ontology ;
rdfs:label "uco-marking"@en ;
rdfs:comment "Data markings represent restrictions, permissions, and other guidance for how data can be used and shared."@en ;
owl:backwardCompatibleWith marking:1.1.0 ;
owl:imports core:1.2.0 ;
owl:priorVersion marking:1.1.0 ;
owl:versionIRI marking:1.2.0 ;
owl:backwardCompatibleWith marking:1.2.0 ;
owl:imports core:1.3.0 ;
owl:priorVersion marking:1.2.0 ;
owl:versionIRI marking:1.3.0 ;
.

marking:GranularMarking
Expand Down
Loading

0 comments on commit d909363

Please sign in to comment.