If in doubt, prefer core properties in jsonld context

Signed-off-by: Holger Frydrych <holger.frydrych@tngtech.com>

Author: fholger

src/spdx_tools/spdx3/validation/json_ld/shacl_validation.py

@@ -3,9 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 from typing import Optional
 
-import owlrl
 from pyshacl import validate
-from rdflib import Graph, RDF
+from rdflib import Graph
 
 
 def validate_against_shacl_from_file(

src/spdx_tools/spdx3/writer/json_ld/context.json

@@ -274,7 +274,7 @@
         "@type": "xsd:anyURI"
     },
     "locator": {
-        "@id": "security:locator",
+        "@id": "core:locator",
         "@type": "xsd:anyURI"
     },
     "namespace": {
@@ -351,7 +351,7 @@
         "@type": "xsd:string"
     },
     "suppliedBy": {
-        "@id": "security:suppliedBy",
+        "@id": "core:suppliedBy",
         "@type": "@id"
     },
     "to": {

src/spdx_tools/spdx3/writer/json_ld/owl_to_context.py

@@ -62,6 +62,11 @@ def convert_spdx_owl_to_jsonld_context(spdx_owl: str = "SPDX_OWL.json"):
         elif node_type in ["owl:DatatypeProperty", "owl:ObjectProperty"]:
             name = node["@id"].split(":")[-1]
             type_id = node["rdfs:range"]["@id"]
+
+            if name in context_dict and context_dict[name]["@id"].startswith('core'):
+                # if in doubt, prioritize core properties
+                continue
+
             if name in PROPERTIES_WITH_ENUM_RANGE:
                 if name == "profile":
                     # FIXME: since the allowed values for the profile enum collide with