Skip to content

Commit 748aea0

Browse files
plbt5plbt5
authored
Merge pull request #661 from ucoProject/develop
Release 1.4.0: Catch `develop-2.0.0` up to `develop`
2 parents cd2fa8d + 633074a commit 748aea0

33 files changed

Lines changed: 203 additions & 203 deletions

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Through this approach not only are domain-focused representations defined consis
1313
The purpose of this repository is to provide a foundation for broader community involvement in defining what to represent and how.
1414

1515
### Current Release
16-
The current release of UCO is 1.2.0.
16+
The current release of UCO is 1.4.0.
1717

1818
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.
1919

20-
More detail of improvements is documented in the [UCO 1.2.0 release notes](https://unifiedcyberontology.org/releases/1.2.0/).
20+
More detail of improvements is documented in the [UCO 1.4.0 release notes](https://unifiedcyberontology.org/releases/1.4.0/).

‎ontology/co/co.ttl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
a owl:Ontology ;
1313
rdfs:label "uco-co"@en ;
1414
rdfs:comment "This ontology defines SHACL shapes to supplement the OWL 2 DL definitions in the Collections Ontology."@en ;
15-
owl:backwardCompatibleWith uco-co:1.2.0 ;
15+
owl:backwardCompatibleWith uco-co:1.3.0 ;
1616
owl:imports <http://purl.org/co> ;
17-
owl:priorVersion uco-co:1.2.0 ;
18-
owl:versionIRI uco-co:1.3.0 ;
17+
owl:priorVersion uco-co:1.3.0 ;
18+
owl:versionIRI uco-co:1.4.0 ;
1919
.
2020

2121
co:ListItem

‎ontology/owl/owl.ttl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
rdfs:label "uco-owl"@en ;
1111
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 ;
1212
rdfs:seeAlso <https://www.w3.org/TR/2012/REC-owl2-mapping-to-rdf-20121211/#Mapping_from_RDF_Graphs_to_the_Structural_Specification> ;
13-
owl:backwardCompatibleWith uco-owl:1.2.0 ;
14-
owl:priorVersion uco-owl:1.2.0 ;
15-
owl:versionIRI uco-owl:1.3.0 ;
13+
owl:backwardCompatibleWith uco-owl:1.3.0 ;
14+
owl:priorVersion uco-owl:1.3.0 ;
15+
owl:versionIRI uco-owl:1.4.0 ;
1616
.
1717

1818
uco-owl:Axiom-shape

‎ontology/uco/action/action.ttl‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.3.0
2-
# imports: https://ontology.unifiedcyberontology.org/uco/location/1.3.0
3-
# imports: https://ontology.unifiedcyberontology.org/uco/pattern/1.3.0
4-
# imports: https://ontology.unifiedcyberontology.org/uco/types/1.3.0
5-
# imports: https://ontology.unifiedcyberontology.org/uco/vocabulary/1.3.0
1+
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.4.0
2+
# imports: https://ontology.unifiedcyberontology.org/uco/location/1.4.0
3+
# imports: https://ontology.unifiedcyberontology.org/uco/pattern/1.4.0
4+
# imports: https://ontology.unifiedcyberontology.org/uco/types/1.4.0
5+
# imports: https://ontology.unifiedcyberontology.org/uco/vocabulary/1.4.0
66

77
@prefix action: <https://ontology.unifiedcyberontology.org/uco/action/> .
88
@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@@ -20,16 +20,16 @@
2020
a owl:Ontology ;
2121
rdfs:label "uco-action"@en ;
2222
rdfs:comment "This ontology defines classes and properties for characterizing actions."@en-US ;
23-
owl:backwardCompatibleWith action:1.2.0 ;
23+
owl:backwardCompatibleWith action:1.3.0 ;
2424
owl:imports
25-
core:1.3.0 ,
26-
location:1.3.0 ,
27-
pattern:1.3.0 ,
28-
types:1.3.0 ,
29-
vocabulary:1.3.0
25+
core:1.4.0 ,
26+
location:1.4.0 ,
27+
pattern:1.4.0 ,
28+
types:1.4.0 ,
29+
vocabulary:1.4.0
3030
;
31-
owl:priorVersion action:1.2.0 ;
32-
owl:versionIRI action:1.3.0 ;
31+
owl:priorVersion action:1.3.0 ;
32+
owl:versionIRI action:1.4.0 ;
3333
.
3434

3535
action:Action

‎ontology/uco/action/catalog-v001.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
33
<uri id="User Entered Import Resolution" uri="../../../dependencies/collections-ontology/collections.owl" name="http://purl.org/co"/>
44
<uri id="User Entered Import Resolution" uri="../../../dependencies/error/docs/current/error.ttl" name="http://purl.org/spar/error"/>
5-
<uri id="User Entered Import Resolution" uri="../../co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.3.0"/>
6-
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
7-
<uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.3.0"/>
8-
<uri id="User Entered Import Resolution" uri="../pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.3.0"/>
9-
<uri id="User Entered Import Resolution" uri="../types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.3.0"/>
10-
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.3.0"/>
5+
<uri id="User Entered Import Resolution" uri="../../co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.4.0"/>
6+
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.4.0"/>
7+
<uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.4.0"/>
8+
<uri id="User Entered Import Resolution" uri="../pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.4.0"/>
9+
<uri id="User Entered Import Resolution" uri="../types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.4.0"/>
10+
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.4.0"/>
1111
<uri id="User Entered Import Resolution" uri="action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action"/>
1212
</catalog>

‎ontology/uco/analysis/analysis.ttl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# imports: https://ontology.unifiedcyberontology.org/uco/action/1.3.0
1+
# imports: https://ontology.unifiedcyberontology.org/uco/action/1.4.0
22

33
@prefix action: <https://ontology.unifiedcyberontology.org/uco/action/> .
44
@prefix analysis: <https://ontology.unifiedcyberontology.org/uco/analysis/> .
@@ -14,10 +14,10 @@
1414
rdfs:label "uco-analysis"@en ;
1515
rdfs:comment "This ontology defines classes and properties for characterizing analytic actions and results."@en-US ;
1616
rdfs:seeAlso <https://github.com/ucoProject/UCO/issues/400> ;
17-
owl:backwardCompatibleWith analysis:1.2.0 ;
18-
owl:imports action:1.3.0 ;
19-
owl:priorVersion analysis:1.2.0 ;
20-
owl:versionIRI analysis:1.3.0 ;
17+
owl:backwardCompatibleWith analysis:1.3.0 ;
18+
owl:imports action:1.4.0 ;
19+
owl:priorVersion analysis:1.3.0 ;
20+
owl:versionIRI analysis:1.4.0 ;
2121
.
2222

2323
analysis:Analysis

‎ontology/uco/analysis/catalog-v001.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
33
<uri id="User Entered Import Resolution" uri="../../../dependencies/collections-ontology/collections.owl" name="http://purl.org/co"/>
44
<uri id="User Entered Import Resolution" uri="../../../dependencies/error/docs/current/error.ttl" name="http://purl.org/spar/error"/>
5-
<uri id="User Entered Import Resolution" uri="../../co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.3.0"/>
6-
<uri id="User Entered Import Resolution" uri="../action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.3.0"/>
7-
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
8-
<uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.3.0"/>
9-
<uri id="User Entered Import Resolution" uri="../pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.3.0"/>
10-
<uri id="User Entered Import Resolution" uri="../types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.3.0"/>
11-
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.3.0"/>
5+
<uri id="User Entered Import Resolution" uri="../../co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.4.0"/>
6+
<uri id="User Entered Import Resolution" uri="../action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.4.0"/>
7+
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.4.0"/>
8+
<uri id="User Entered Import Resolution" uri="../location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.4.0"/>
9+
<uri id="User Entered Import Resolution" uri="../pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.4.0"/>
10+
<uri id="User Entered Import Resolution" uri="../types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.4.0"/>
11+
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.4.0"/>
1212
<uri id="User Entered Import Resolution" uri="analysis.ttl" name="https://ontology.unifiedcyberontology.org/uco/analysis"/>
1313
</catalog>

‎ontology/uco/configuration/catalog-v001.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
3-
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
3+
<uri id="User Entered Import Resolution" uri="../core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.4.0"/>
44
<uri id="User Entered Import Resolution" uri="configuration.ttl" name="https://ontology.unifiedcyberontology.org/uco/configuration"/>
55
</catalog>

‎ontology/uco/configuration/configuration.ttl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.3.0
1+
# imports: https://ontology.unifiedcyberontology.org/uco/core/1.4.0
22

33
@prefix configuration: <https://ontology.unifiedcyberontology.org/uco/configuration/> .
44
@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@@ -13,10 +13,10 @@
1313
rdfs:label "uco-configuration"@en ;
1414
rdfs:comment "This ontology defines classes and properties for characterizing configurations."@en-US ;
1515
rdfs:seeAlso <https://github.com/ucoProject/UCO/issues/432> ;
16-
owl:backwardCompatibleWith configuration:1.2.0 ;
17-
owl:imports core:1.3.0 ;
18-
owl:priorVersion configuration:1.2.0 ;
19-
owl:versionIRI configuration:1.3.0 ;
16+
owl:backwardCompatibleWith configuration:1.3.0 ;
17+
owl:imports core:1.4.0 ;
18+
owl:priorVersion configuration:1.3.0 ;
19+
owl:versionIRI configuration:1.4.0 ;
2020
.
2121

2222
configuration:Configuration

‎ontology/uco/core/core.ttl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
a owl:Ontology ;
1212
rdfs:label "uco-core"@en ;
1313
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 ;
14-
owl:backwardCompatibleWith core:1.2.0 ;
15-
owl:priorVersion core:1.2.0 ;
16-
owl:versionIRI core:1.3.0 ;
14+
owl:backwardCompatibleWith core:1.3.0 ;
15+
owl:priorVersion core:1.3.0 ;
16+
owl:versionIRI core:1.4.0 ;
1717
.
1818

1919
action:Action
2020
a owl:Class ;
21-
rdfs:isDefinedBy <https://ontology.unifiedcyberontology.org/uco/types> ;
21+
rdfs:isDefinedBy <https://ontology.unifiedcyberontology.org/uco/action> ;
2222
.
2323

2424
core:Annotation

0 commit comments

Comments
 (0)