From bab4fd828b3b2435a8d21bba34faae8660f93ea1 Mon Sep 17 00:00:00 2001
From: Giacomo De Colle <117365623+giacomodecolle@users.noreply.github.com>
Date: Sun, 1 Dec 2024 19:23:56 -0500
Subject: [PATCH 1/2] Updating according to last comments on PR

Deleting technique mapping, adding CCO 2.0

From 2a0f479c6883098db87a4d4e3d24b1fbfe1c51b4 Mon Sep 17 00:00:00 2001
From: Giacomo De Colle <117365623+giacomodecolle@users.noreply.github.com>
Date: Sun, 1 Dec 2024 19:25:25 -0500
Subject: [PATCH 2/2] Making changes as per last comments

---
 src/ontology/mappings/d3fend-cco.ttl | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/ontology/mappings/d3fend-cco.ttl b/src/ontology/mappings/d3fend-cco.ttl
index a40445ad..1f6ca2ed 100644
--- a/src/ontology/mappings/d3fend-cco.ttl
+++ b/src/ontology/mappings/d3fend-cco.ttl
@@ -13,7 +13,7 @@
 
 <http://d3fend.mitre.org/ontologies/d3fend-cco.owl#> rdf:type owl:Ontology ;
      owl:imports <../d3fend-protege.ttl#> ;
-     owl:imports <https://raw.githubusercontent.com/CommonCoreOntology/CommonCoreOntologies/refs/tags/v1.6-2024-09-26/src/cco-merged/CommonCoreOntologiesMerged.ttl> .
+     owl:imports <https://raw.githubusercontent.com/CommonCoreOntology/CommonCoreOntologies/refs/tags/v2.0-2024-11-06/src/cco-merged/CommonCoreOntologiesMerged.ttl> .
 
 
 #
@@ -79,15 +79,13 @@ d3f:Person owl:equivalentClass <https://www.commoncoreontologies.org/ont00001262
 #cco ont00001262 is cco Person
 # d3fend seems to only refer to human beings with "person", just as CCO does.
 
-
-d3f:Technique rdfs:subClassOf <https://www.commoncoreontologies.org/ont00000974> .
+d3f:Plan owl:equivalentClass <https://www.commoncoreontologies.org/ont00000974> .
 #cco org/ont00000974 is cco Plan.
 
-
 d3f:InformationContentEntity owl:equivalentClass <https://www.commoncoreontologies.org/ont00000958> .
 #cco org/ont00000958 is cco information content entity
 # this seems to be intended to be equivalent to the CCO class. Notice that many other d3f classes
-# will become subclasses of cco:InformatioContentEntity, and thus of the d3f:InformationContentEntity class
+# will become subclasses of cco:InformationContentEntity, and thus of the d3f:InformationContentEntity class
 # as well. 
 
 d3f:Log rdfs:subClassOf <https://www.commoncoreontologies.org/ont00000958> .