Merge branch 'main' into bug/Metric-inDimension-fix

Author: jbrown-xentity

jsonschema/definitions/Attribution.json

@@ -15,17 +15,7 @@
             "$id": "http://www.w3.org/ns/dcat#hadRole",
             "title": "role",
             "description": "The function of an entity or agent with respect to another entity or resource.",
-            "oneOf": [
-                {
-                    "$ref": "#/definitions/Role",
-                    "description": "inline description of Role"
-                },
-                {
-                    "type": "string",
-                    "description": "reference iri of Role",
-                    "format": "iri"
-                }
-            ]
+            "type": "string"
         },
         "agent": {
             "$id": "http://www.w3.org/ns/prov#agent",

jsonschema/definitions/Checksum.json

@@ -15,17 +15,7 @@
             "$id": "http://spdx.org/rdf/terms#algorithm",
             "title": "algorithm",
             "description": "The algorithm used to produce the subject Checksum.",
-            "oneOf": [
-                {
-                    "$ref": "#/definitions/ChecksumAlgorithm",
-                    "description": "inline description of ChecksumAlgorithm"
-                },
-                {
-                    "type": "string",
-                    "description": "reference iri of ChecksumAlgorithm",
-                    "format": "iri"
-                }
-            ]
+            "type": "string"
         },
         "checksumValue": {
             "$id": "http://spdx.org/rdf/terms#checksumValue",

jsonschema/definitions/Dataset.json

@@ -752,10 +752,7 @@
                     "type": "null"
                 },
                 {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
+                    "type": "string"
                 }
             ]
         },
@@ -1025,6 +1022,15 @@
                 {
                     "type": "null"
                 },
+                {
+                    "$ref": "#/definitions/Location",
+                    "description": "inline description of Location"
+                },
+                {
+                    "type": "string",
+                    "description": "reference iri of Location",
+                    "format": "iri"
+                },
                 {
                     "type": "array",
                     "items": {

jsonschema/definitions/Metric.json

@@ -15,24 +15,27 @@
             "$id": "http://www.w3.org/ns/dqv#expectedDataType",
             "title": "expected datatype",
             "description": "Represents the expected data type for the metric's observed value (e.g., xsd:boolean, xsd:double etc...)",
-            "oneOf": [
-                {
-                    "$ref": "#/definitions/anySimpleType",
-                    "description": "inline description of anySimpleType"
-                },
-                {
-                    "type": "string",
-                    "description": "reference iri of anySimpleType",
-                    "format": "iri"
-                }
-            ]
+            "type": "string"
         },
         "inDimension": {
             "$id": "http://www.w3.org/ns/dqv#inDimension",
             "title": "in dimension",
             "description": "Represents the dimensions a quality metric, certificate and annotation allow a measurement of.",
             "type": "string",
             "format": "iri"
+        },
+        "definition": {
+            "$id": "https://www.w3.org/ns/dqv#definition",
+            "title": "definition",
+            "description": "Definition of the metric.",
+            "oneOf": [
+                {
+                    "type": "null"
+                },
+                {
+                    "type": "string"
+                }
+            ]
         }
     },
     "required": [

jsonschema/definitions/Relationship.json

@@ -15,17 +15,7 @@
             "$id": "http://www.w3.org/ns/dcat#hadRole",
             "title": "role",
             "description": "The function of an entity or agent with respect to another entity or resource.",
-            "oneOf": [
-                {
-                    "$ref": "#/definitions/Role",
-                    "description": "inline description of Role"
-                },
-                {
-                    "type": "string",
-                    "description": "reference iri of Role",
-                    "format": "iri"
-                }
-            ]
+            "type": "string"
         },
         "relation": {
             "$id": "http://purl.org/dc/terms/relation",