schema.json in adiwg-json_schemas-0.5.0

- old
+ new

@@ -3,17 +3,22 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "schema for ADIwg JSON metadata",
   "type": "object",
   "required": ["version", "contact", "metadata"],
   "properties": {
-    "verion": {
-      "name": {
-        "type": "string"
-      },
-      "version": {
-        "type": "string",
-        "pattern": "[0-9]\\.[0-9]\\.[0-9]"
+    "version": {
+      "type": "object",
+      "required": ["name", "version"],
+      "additionalProperties": false,
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "version": {
+          "type": "string",
+          "pattern": "[0-9]\\.[0-9]\\.[0-9]"
+        }
       }
     },
     "contact": {
       "$ref": "schema/contact.json"
     },
@@ -29,14 +34,10 @@
     "uri": {
       "type": "string",
       "pattern": "((?<=\\()[A-Za-z][A-Za-z0-9\\+\\.\\-]*:([A-Za-z0-9\\.\\-_~:/\\?#\\[\\]@!\\$&'\\(\\)\\*\\+,;=]|%[A-Fa-f0-9]{2})+(?=\\)))|([A-Za-z][A-Za-z0-9\\+\\.\\-]*:([A-Za-z0-9\\.\\-_~:/\\?#\\[\\]@!\\$&'\\(\\)\\*\\+,;=]|%[A-Fa-f0-9]{2})+)"
     },
     "date": {
-      "oneOf": [
-        {
-          "type": "string",
-          "pattern": "^(\\d{4}(-\\d{2})?(-\\d{2})?$)|(^\\d{4}-\\d{2}-\\d{2}(T\\d{2})?(\\:\\d{2}(\\:\\d{2}(\\.\\d+)?)?|Z)?(Z|(-|\\+)\\d{2}(:\\d{2})?)?$)"
-        }
-      ]
+      "type": "string",
+      "pattern": "^(\\d{4}(-\\d{2})?(-\\d{2})?$)|(^\\d{4}-\\d{2}-\\d{2}(T\\d{2})?(\\:\\d{2}(\\:\\d{2}(\\.\\d+)?)?|Z)?(Z|(-|\\+)\\d{2}(:\\d{2})?)?$)"
     }
   }
-}
\ No newline at end of file
+}