update make all order and upgrade CCO with working link

d3fend · Sep 27, 2024 · 3eecadd · 3eecadd
1 parent 610cf2e
commit 3eecadd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -393,7 +393,7 @@ dist: distdir
 	$(END)
 
 #all: build build/d3fend.csv extensions dist test  ## build all, check for unallowed content, and test load files
-all: build extensions dist test  ## build all, check for unallowed content, and test load files
+all: build extensions test dist ## build all, check for unallowed content, and test load files
 	$(END)
 
 print-new-techniques: build/d3fend.csv ## compare local build against current public version

diff --git 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.github.com/CommonCoreOntology/CommonCoreOntologies/master/cco-merged/MergedAllCoreOntology-v1.5-2024-02-14.ttl> .
+     owl:imports <https://raw.github.com/CommonCoreOntology/CommonCoreOntologies/refs/tags/v1.6-2024-09-26/src/cco-merged/CommonCoreOntologiesMerged.ttl> .
 
 
 #