Skip to content

Commit

Permalink
Merge branch 'develop' into release-1.3.0-into-develop-2.0.0
Browse files Browse the repository at this point in the history
This merge also resolves a merge-conflict with the UCO submodule,
simultaneously updating it to point to UCO's develop-2.0.0 branch that
has caught up with UCO's `develop` immediately after the 1.3.0 release.
  • Loading branch information
ajnelson-nist committed Feb 1, 2024
2 parents 30b14d5 + 4aaadea commit a41a28b
Show file tree
Hide file tree
Showing 8 changed files with 72 additions and 52 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.
-->
18 changes: 18 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
2024-01-24
* (79afa93) UCO Pull Request 579: Update change request template

2024-01-22
* (caf5bd3) UCO Issue 571: Reduce UCO OWL RDF List review scope to OWL Sequences

2023-12-05
* (279d2b7) UCO Issue 563: Designate action:Action and core:Event disjoint

2023-11-16
* (24ea57f) UCO Issue 541: Add Event

2023-10-20
* (8c8fa59) UCO Issue 536: Declare and warn of observable:File and :URL disjointedness

2023-03-29
* ONT-494: Release CASE 1.2.0, with release notes at https://caseontology.org/releases/1.2.0/

2023-03-28
* (0cb7b85) UCO Issue 449: Enable generating Protégé catalog files

Expand Down
2 changes: 1 addition & 1 deletion dependencies/UCO
18 changes: 9 additions & 9 deletions ontology/investigation/catalog-v001.xml
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.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="../../dependencies/UCO/ontology/co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/role/role.ttl" name="https://ontology.unifiedcyberontology.org/uco/role/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.caseontology.org/case/vocabulary/1.3.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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 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
# imports: https://ontology.caseontology.org/case/vocabulary/1.3.0
# imports: https://ontology.unifiedcyberontology.org/uco/action/1.3.0
# imports: https://ontology.unifiedcyberontology.org/uco/role/1.3.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.1.0 ;
owl:backwardCompatibleWith investigation:1.2.0 ;
owl:imports
vocabulary:1.2.0 ,
uco-action:1.2.0 ,
uco-role:1.2.0
vocabulary:1.3.0 ,
uco-action:1.3.0 ,
uco-role:1.3.0
;
owl:priorVersion investigation:1.1.0 ;
owl:versionIRI investigation:1.2.0 ;
owl:priorVersion investigation:1.2.0 ;
owl:versionIRI investigation:1.3.0 ;
.

investigation:Attorney
Expand Down
20 changes: 10 additions & 10 deletions ontology/master/case.ttl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 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
# imports: https://ontology.caseontology.org/case/investigation/1.3.0
# imports: https://ontology.caseontology.org/case/vocabulary/1.3.0
# imports: https://ontology.unifiedcyberontology.org/uco/uco/1.3.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.1.0> ;
owl:backwardCompatibleWith <https://ontology.caseontology.org/case/case/1.2.0> ;
owl:imports
<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>
<https://ontology.caseontology.org/case/investigation/1.3.0> ,
<https://ontology.caseontology.org/case/vocabulary/1.3.0> ,
<https://ontology.unifiedcyberontology.org/uco/uco/1.3.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" ;
owl:priorVersion <https://ontology.caseontology.org/case/case/1.2.0> ;
owl:versionIRI <https://ontology.caseontology.org/case/case/1.3.0> ;
owl:versionInfo "1.3.0" ;
.

40 changes: 20 additions & 20 deletions ontology/master/catalog-v001.xml
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.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="../../dependencies/UCO/ontology/co/co.ttl" name="https://ontology.unifiedcyberontology.org/co/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/owl/owl.ttl" name="https://ontology.unifiedcyberontology.org/owl/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/action/action.ttl" name="https://ontology.unifiedcyberontology.org/uco/action/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/analysis/analysis.ttl" name="https://ontology.unifiedcyberontology.org/uco/analysis/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/configuration/configuration.ttl" name="https://ontology.unifiedcyberontology.org/uco/configuration/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/core/core.ttl" name="https://ontology.unifiedcyberontology.org/uco/core/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/identity/identity.ttl" name="https://ontology.unifiedcyberontology.org/uco/identity/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/location/location.ttl" name="https://ontology.unifiedcyberontology.org/uco/location/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/marking/marking.ttl" name="https://ontology.unifiedcyberontology.org/uco/marking/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/master/uco.ttl" name="https://ontology.unifiedcyberontology.org/uco/uco/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/observable/observable.ttl" name="https://ontology.unifiedcyberontology.org/uco/observable/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/pattern/pattern.ttl" name="https://ontology.unifiedcyberontology.org/uco/pattern/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/role/role.ttl" name="https://ontology.unifiedcyberontology.org/uco/role/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/time/time.ttl" name="https://ontology.unifiedcyberontology.org/uco/time/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/tool/tool.ttl" name="https://ontology.unifiedcyberontology.org/uco/tool/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/types/types.ttl" name="https://ontology.unifiedcyberontology.org/uco/types/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/victim/victim.ttl" name="https://ontology.unifiedcyberontology.org/uco/victim/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../../dependencies/UCO/ontology/uco/vocabulary/vocabulary.ttl" name="https://ontology.unifiedcyberontology.org/uco/vocabulary/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../investigation/investigation.ttl" name="https://ontology.caseontology.org/case/investigation/1.3.0"/>
<uri id="User Entered Import Resolution" uri="../vocabulary/vocabulary.ttl" name="https://ontology.caseontology.org/case/vocabulary/1.3.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
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.1.0 ;
owl:priorVersion vocab:1.1.0 ;
owl:versionIRI vocab:1.2.0 ;
owl:backwardCompatibleWith vocab:1.2.0 ;
owl:priorVersion vocab:1.2.0 ;
owl:versionIRI vocab:1.3.0 ;
.

vocab:InvestigationFormVocab
Expand Down

0 comments on commit a41a28b

Please sign in to comment.