schema: Fix required properties of Annotation, for #333

openownership · Oct 29, 2021 · 2e99ad6 · 2e99ad6
1 parent 6416da6
commit 2e99ad6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/docs/schema/changelog.rst b/docs/schema/changelog.rst
@@ -12,6 +12,12 @@ ChangeLog
 
     The schema specifies a **structure**, **fields** and **codelists** but does not yet enforce validation constraints on most fields. 
 
+[Unreleased] - 2021-10-21
+
+Changed
+-------
+- Required fields `statementPointerTarget` and `motivation` are moved from inside the `anyOf` statement to the top level, as they apply to all motivation types.
+
 [Unreleased] - 2021-03-30
 =========================
 

diff --git a/schema/components.json b/schema/components.json
@@ -386,11 +386,15 @@
         },
         "url": {
           "title": "URL",
-          "description": "A linked resource that annotates, provides context for or enhances this statement. The content of the resource, or the relationship to the statement, MAY be described in the `description` field.",
+          "description": "A linked resource that annotates, provides context for or enhances this statement. The content of the resource, or the relationship to the statement, MAY be described in the `description` field. This field is REQUIRED if the value of `motivation` is 'linking'.",
           "type": "string",
           "format": "uri"
         }
       },
+      "required": [
+        "statementPointerTarget",
+        "motivation"
+      ],
       "anyOf": [
         {
           "properties": {
@@ -416,11 +420,7 @@
                 "transformation"
               ]
             }
-          },
-          "required": [
-            "statementPointerTarget",
-            "motivation"
-          ]
+          }
         }
       ]
     },