Skip to content

Commit

Permalink
Merge branch 'develop' into develop-2.0.0
Browse files Browse the repository at this point in the history 
Merge done offline to handle a conflict with the UCO submodule.
Conflict resolved by setting the submodule to the current UCO state
`develop-2.0.0`.

The conflict resolution also handles a build issue where the CASE
catalog files needed the full updates from the CASE `develop` branch
(particularly for version IRI updates).

Signed-off-by: Alex Nelson <[email protected]>
  • Loading branch information
@ajnelson-nist
ajnelson-nist committed Apr 6, 2023
2 parents 4951230 + ab6e38c commit 8c58d65
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 52 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2023-03-28
* (0cb7b85) UCO Issue 449: Enable generating Protégé catalog files

2022-11-22
* ONT-491: Release CASE 1.1.0, with release notes at https://caseontology.org/releases/1.1.0/

Expand Down
2 changes: 1 addition & 1 deletion dependencies/UCO
Submodule UCO updated 33 files
+3 −3 README.md
+3 −3 ontology/co/co.ttl
+3 −3 ontology/owl/owl.ttl
+13 −13 ontology/uco/action/action.ttl
+6 −6 ontology/uco/action/catalog-v001.xml
+5 −3 ontology/uco/analysis/analysis.ttl
+7 −7 ontology/uco/analysis/catalog-v001.xml
+1 −1 ontology/uco/configuration/catalog-v001.xml
+5 −5 ontology/uco/configuration/configuration.ttl
+3 −3 ontology/uco/core/core.ttl
+2 −2 ontology/uco/identity/catalog-v001.xml
+7 −7 ontology/uco/identity/identity.ttl
+1 −1 ontology/uco/location/catalog-v001.xml
+5 −5 ontology/uco/location/location.ttl
+1 −1 ontology/uco/marking/catalog-v001.xml
+5 −5 ontology/uco/marking/marking.ttl
+17 −17 ontology/uco/master/catalog-v001.xml
+38 −38 ontology/uco/master/uco.ttl
+9 −9 ontology/uco/observable/catalog-v001.xml
+18 −18 ontology/uco/observable/observable.ttl
+1 −1 ontology/uco/pattern/catalog-v001.xml
+5 −5 ontology/uco/pattern/pattern.ttl
+1 −1 ontology/uco/role/catalog-v001.xml
+5 −5 ontology/uco/role/role.ttl
+1 −1 ontology/uco/time/catalog-v001.xml
+5 −5 ontology/uco/time/time.ttl
+4 −4 ontology/uco/tool/catalog-v001.xml
+7 −7 ontology/uco/tool/tool.ttl
+3 −3 ontology/uco/types/catalog-v001.xml
+9 −9 ontology/uco/types/types.ttl
+2 −2 ontology/uco/victim/catalog-v001.xml
+5 −5 ontology/uco/victim/victim.ttl
+3 −3 ontology/uco/vocabulary/vocabulary.ttl
18 changes: 9 additions & 9 deletions ontology/investigation/catalog-v001.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/dependencies/collections-ontology/collections.owl" name="http://purl.org/co"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/dependencies/error/docs/current/error.ttl" name="http://purl.org/spar/error"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/role/role.ttl" name="https://ontology.unifiedcyberontology.org/uco/role/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.caseontology.org/case/vocabulary/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/role/role.ttl" name="https://ontology.unifiedcyberontology.org/uco/role/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.caseontology.org/case/vocabulary/1.2.0"/>
<uri id="User Entered Import Resolution" uri="investigation.ttl" name="https://ontology.caseontology.org/case/investigation"/>
</catalog>
18 changes: 9 additions & 9 deletions ontology/investigation/investigation.ttl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# imports: https://ontology.caseontology.org/case/vocabulary/1.1.0
# imports: https://ontology.unifiedcyberontology.org/uco/action/1.1.0
# imports: https://ontology.unifiedcyberontology.org/uco/role/1.1.0
# imports: https://ontology.caseontology.org/case/vocabulary/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/action/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/role/1.2.0

@prefix investigation: <https://ontology.caseontology.org/case/investigation/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
Expand All @@ -17,14 +17,14 @@
a owl:Ontology ;
rdfs:label "investigation"@en ;
rdfs:comment "This ontology defines key concepts, and their associated properties and relationships, for characterizing cyber-investigations in the broadest range of contexts, including security incidents, criminal investigations, civil and regulatory matters, intelligence operations, international disputes, accident inquiries, policy violations, and others." ;
owl:backwardCompatibleWith investigation:1.0.0 ;
owl:backwardCompatibleWith investigation:1.1.0 ;
owl:imports
vocabulary:1.1.0 ,
uco-action:1.1.0 ,
uco-role:1.1.0
vocabulary:1.2.0 ,
uco-action:1.2.0 ,
uco-role:1.2.0
;
owl:priorVersion investigation:1.0.0 ;
owl:versionIRI investigation:1.1.0 ;
owl:priorVersion investigation:1.1.0 ;
owl:versionIRI investigation:1.2.0 ;
.

investigation:Attorney
Expand Down
20 changes: 10 additions & 10 deletions ontology/master/case.ttl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# imports: https://ontology.caseontology.org/case/investigation/1.1.0
# imports: https://ontology.caseontology.org/case/vocabulary/1.1.0
# imports: https://ontology.unifiedcyberontology.org/uco/uco/1.1.0
# imports: https://ontology.caseontology.org/case/investigation/1.2.0
# imports: https://ontology.caseontology.org/case/vocabulary/1.2.0
# imports: https://ontology.unifiedcyberontology.org/uco/uco/1.2.0

@prefix dct: <http://purl.org/dc/terms/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
Expand All @@ -16,14 +16,14 @@
rdfs:label "case-master"@en ;
rdfs:comment "The Cyber-investigation Analysis Standard Expression (CASE) ontology is a community-developed standard that defines concepts used in a broad range of cyber-investigation domains, including digital forensic science, incident response, counter-terrorism, criminal justice, forensic intelligence, and situational awareness. CASE includes all aspects of the digital forensic process, from evidence-gathering and chain of custody, to generating a final report. The goal is to increase sharing and interoperability of cyber-investigation information among organizations and between forensic analytic tools. CASE aligns with and extends the Unified Cyber Ontology (UCO). The preferred namespace abbreviation for this ontology is: case-master."@en ;
dct:title "Cyber-investigation Analysis Standard Expression (CASE)"@en ;
owl:backwardCompatibleWith <https://ontology.caseontology.org/case/case/1.0.0> ;
owl:backwardCompatibleWith <https://ontology.caseontology.org/case/case/1.1.0> ;
owl:imports
<https://ontology.caseontology.org/case/investigation/1.1.0> ,
<https://ontology.caseontology.org/case/vocabulary/1.1.0> ,
<https://ontology.unifiedcyberontology.org/uco/uco/1.1.0>
<https://ontology.caseontology.org/case/investigation/1.2.0> ,
<https://ontology.caseontology.org/case/vocabulary/1.2.0> ,
<https://ontology.unifiedcyberontology.org/uco/uco/1.2.0>
;
owl:priorVersion <https://ontology.caseontology.org/case/case/1.0.0> ;
owl:versionIRI <https://ontology.caseontology.org/case/case/1.1.0> ;
owl:versionInfo "1.1.0" ;
owl:priorVersion <https://ontology.caseontology.org/case/case/1.1.0> ;
owl:versionIRI <https://ontology.caseontology.org/case/case/1.2.0> ;
owl:versionInfo "1.2.0" ;
.

40 changes: 20 additions & 20 deletions ontology/master/catalog-v001.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/dependencies/collections-ontology/collections.owl" name="http://purl.org/co"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/dependencies/error/docs/current/error.ttl" name="http://purl.org/spar/error"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/owl/owl.ttl" name="https://ontology.unifiedcyberontology.org/owl/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/analysis/analysis.ttl" name="https://ontology.unifiedcyberontology.org/uco/analysis/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/configuration/configuration.ttl" name="https://ontology.unifiedcyberontology.org/uco/configuration/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/identity/identity.ttl" name="https://ontology.unifiedcyberontology.org/uco/identity/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/marking/marking.ttl" name="https://ontology.unifiedcyberontology.org/uco/marking/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/master/uco.ttl" name="https://ontology.unifiedcyberontology.org/uco/uco/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/observable/observable.ttl" name="https://ontology.unifiedcyberontology.org/uco/observable/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/role/role.ttl" name="https://ontology.unifiedcyberontology.org/uco/role/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/time/time.ttl" name="https://ontology.unifiedcyberontology.org/uco/time/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/tool/tool.ttl" name="https://ontology.unifiedcyberontology.org/uco/tool/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/victim/victim.ttl" name="https://ontology.unifiedcyberontology.org/uco/victim/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../investigation/investigation.ttl" name="https://ontology.caseontology.org/case/investigation/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.caseontology.org/case/vocabulary/1.1.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/owl/owl.ttl" name="https://ontology.unifiedcyberontology.org/owl/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/analysis/analysis.ttl" name="https://ontology.unifiedcyberontology.org/uco/analysis/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/configuration/configuration.ttl" name="https://ontology.unifiedcyberontology.org/uco/configuration/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/identity/identity.ttl" name="https://ontology.unifiedcyberontology.org/uco/identity/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/marking/marking.ttl" name="https://ontology.unifiedcyberontology.org/uco/marking/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/master/uco.ttl" name="https://ontology.unifiedcyberontology.org/uco/uco/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/observable/observable.ttl" name="https://ontology.unifiedcyberontology.org/uco/observable/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/role/role.ttl" name="https://ontology.unifiedcyberontology.org/uco/role/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/time/time.ttl" name="https://ontology.unifiedcyberontology.org/uco/time/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/tool/tool.ttl" name="https://ontology.unifiedcyberontology.org/uco/tool/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/victim/victim.ttl" name="https://ontology.unifiedcyberontology.org/uco/victim/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../investigation/investigation.ttl" name="https://ontology.caseontology.org/case/investigation/1.2.0"/>
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.caseontology.org/case/vocabulary/1.2.0"/>
<uri id="User Entered Import Resolution" uri="case.ttl" name="https://ontology.caseontology.org/case/case"/>
</catalog>
6 changes: 3 additions & 3 deletions ontology/vocabulary/vocabulary.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<https://ontology.caseontology.org/case/vocabulary>
a owl:Ontology ;
rdfs:label "vocabularies"@en ;
owl:backwardCompatibleWith vocab:1.0.0 ;
owl:priorVersion vocab:1.0.0 ;
owl:versionIRI vocab:1.1.0 ;
owl:backwardCompatibleWith vocab:1.1.0 ;
owl:priorVersion vocab:1.1.0 ;
owl:versionIRI vocab:1.2.0 ;
.

vocab:InvestigationFormVocab
Expand Down

0 comments on commit 8c58d65

Please sign in to comment.