Migrated ninjs-*.json to draft-07

src/schema-validation.jsonc

@@ -187,8 +187,6 @@
     "nest-cli.json",
     "netlify.json",
     "nightwatch.json",
-    "ninjs-1.4.json",
-    "ninjs-2.0.json",
     "now.json",
     "npmpackagejsonlintrc.json",
     "nswag.json",

src/schemas/json/ninjs-1.0.json

@@ -1,8 +1,8 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://www.iptc.org/std/ninjs/ninjs-schema_1.0.json#",
   "additionalProperties": false,
   "description": "A news item as JSON object -- copyright 2013 IPTC - International Press Telecommunications Council - www.iptc.org - This document is published under the Creative Commons Attribution 3.0 license, see  http://creativecommons.org/licenses/by/3.0/  $$comment: as of 2013-11-07, edited by MS for the IPTC ninjs-dev group ",
-  "id": "http://www.iptc.org/std/ninjs/ninjs-schema_1.0.json#",
   "patternProperties": {
     "^description_[a-zA-Z0-9_]+": {
       "description": "A free-form textual description of the content of the item. (The string appended to description_ in the property name should reflect the format of the text)",

src/schemas/json/ninjs-1.1.json

@@ -1,8 +1,8 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://www.iptc.org/std/ninjs/ninjs-schema_1.1.json#",
   "additionalProperties": false,
   "description": "A news item as JSON object -- copyright 2014 IPTC - International Press Telecommunications Council - www.iptc.org - This document is published under the Creative Commons Attribution 3.0 license, see  http://creativecommons.org/licenses/by/3.0/  $$comment: as of 2014-03-13 ",
-  "id": "http://www.iptc.org/std/ninjs/ninjs-schema_1.1.json#",
   "patternProperties": {
     "^description_[a-zA-Z0-9_]+": {
       "description": "A free-form textual description of the content of the item. (The string appended to description_ in the property name should reflect the format of the text)",

src/schemas/json/ninjs-1.2.json

@@ -1,8 +1,8 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://www.iptc.org/std/ninjs/ninjs-schema_1.2.json#",
   "additionalProperties": false,
   "description": "A news item as JSON object -- copyright 2019 IPTC - International Press Telecommunications Council - www.iptc.org - This document is published under the Creative Commons Attribution 4.0 license, see  http://creativecommons.org/licenses/by/4.0/  $$comment: as of 2019-10-16 ",
-  "id": "http://www.iptc.org/std/ninjs/ninjs-schema_1.2.json#",
   "patternProperties": {
     "^description_[a-zA-Z0-9_]+": {
       "title": "Description",

src/schemas/json/ninjs-1.3.json

@@ -1,8 +1,8 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://www.iptc.org/std/ninjs/ninjs-schema_1.3.json#",
   "additionalProperties": false,
   "description": "A news item as JSON object -- copyright 2020 IPTC - International Press Telecommunications Council - www.iptc.org - This document is published under the Creative Commons Attribution 4.0 license, see  http://creativecommons.org/licenses/by/4.0/",
-  "id": "http://www.iptc.org/std/ninjs/ninjs-schema_1.3.json#",
   "patternProperties": {
     "^description_[a-zA-Z0-9_]+": {
       "title": "Description",

src/schemas/json/ninjs-1.4.json

@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "http://www.iptc.org/std/ninjs/ninjs-schema_1.4.json#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://www.iptc.org/std/ninjs/ninjs-schema_1.4.json#",
   "type": "object",
   "title": "IPTC ninjs - News in JSON - version 1.4 (approved, 18 May 2022)",
   "description": "A news item as JSON object -- copyright 2022 IPTC - International Press Telecommunications Council - www.iptc.org - This document is published under the Creative Commons Attribution 4.0 license, see  http://creativecommons.org/licenses/by/4.0/",
@@ -584,25 +584,28 @@
           "title": "Language id",
           "description": "Identifier for the Rights Expression language used. nar:@langid",
           "format": "uri"
-        },
-        "linkedrights": {
-          "title": "Linked rights",
-          "description": "A link from the current Item to Web resource with rights related information. nar:link",
-          "type": "string",
-          "format": "uri"
-        },
-        "encodedrights": {
-          "title": "Encoded Rights",
-          "additionalProperties": false,
-          "type": "string",
-          "description": "Contains a rights expression as defined by a Rights Expression Language. nar:rightsExpressionXML or nar:rightsExpressionData"
         }
       },
       "oneOf": [
         {
+          "properties": {
+            "linkedrights": {
+              "title": "Linked rights",
+              "description": "A link from the current Item to Web resource with rights related information. nar:link",
+              "type": "string",
+              "format": "uri"
+            }
+          },
           "required": ["linkedrights"]
         },
         {
+          "properties": {
+            "encodedrights": {
+              "title": "Encoded Rights",
+              "type": "string",
+              "description": "Contains a rights expression as defined by a Rights Expression Language. nar:rightsExpressionXML or nar:rightsExpressionData"
+            }
+          },
           "required": ["encodedrights"]
         }
       ]

src/schemas/json/ninjs-2.0.json

@@ -280,37 +280,33 @@
     "places": {
       "title": "Places",
       "description": "An array of named locations. nar:subject",
-      "additionalProperties": false,
       "type": "array",
       "items": {
         "type": "object",
-        "anyOf": [
-          {
-            "properties": {
-              "name": {
-                "title": "Name",
-                "description": "The name of the place",
-                "type": "string"
-              },
-              "rel": {
-                "title": "Relationship",
-                "description": "The relationship of the content of the news object to the place",
-                "type": "string"
-              },
-              "uri": {
-                "title": "URI",
-                "description": "The identifier for the place as a complete uri",
-                "type": "string",
-                "format": "uri"
-              },
-              "literal": {
-                "title": "Literal",
-                "description": "The code for the place as a literal",
-                "type": "string"
-              }
-            }
+        "additionalProperties": true,
+        "properties": {
+          "name": {
+            "title": "Name",
+            "description": "The name of the place",
+            "type": "string"
+          },
+          "rel": {
+            "title": "Relationship",
+            "description": "The relationship of the content of the news object to the place",
+            "type": "string"
+          },
+          "uri": {
+            "title": "URI",
+            "description": "The identifier for the place as a complete uri",
+            "type": "string",
+            "format": "uri"
+          },
+          "literal": {
+            "title": "Literal",
+            "description": "The code for the place as a literal",
+            "type": "string"
           }
-        ]
+        }
       }
     },
     "subjects": {
@@ -466,7 +462,6 @@
       "title": "Renditions",
       "description": "An array of objects with different renditions of the news object. nar:remoteContent",
       "type": "array",
-      "additionalProperties": false,
       "items": {
         "description": "A specific rendition of the content of the news object. (Description changed in version 1.2 according to issue #17.)",
         "type": "object",
@@ -526,7 +521,6 @@
       "title": "Associations",
       "description": "An array of objects with content of news objects which are associated with this news object.",
       "type": "array",
-      "additionalProperties": false,
       "items": {
         "description": "One associated object where each object can use all properties in ninjs.",
         "type": "object",
@@ -656,25 +650,28 @@
           "title": "Language id",
           "description": "Identifier for the Rights Expression language used. nar:@langid",
           "format": "uri"
-        },
-        "linkedrights": {
-          "title": "Linked rights",
-          "description": "A link from the current Item to Web resource with rights related information. nar:link",
-          "type": "string",
-          "format": "uri"
-        },
-        "encodedrights": {
-          "title": "Encoded Rights",
-          "additionalProperties": false,
-          "type": "string",
-          "description": "Contains a rights expression as defined by a Rights Expression Language. nar:rightsExpressionXML or nar:rightsExpressionData"
         }
       },
       "oneOf": [
         {
+          "properties": {
+            "linkedrights": {
+              "title": "Linked rights",
+              "description": "A link from the current Item to Web resource with rights related information. nar:link",
+              "type": "string",
+              "format": "uri"
+            }
+          },
           "required": ["linkedrights"]
         },
         {
+          "properties": {
+            "encodedrights": {
+              "title": "Encoded Rights",
+              "type": "string",
+              "description": "Contains a rights expression as defined by a Rights Expression Language. nar:rightsExpressionXML or nar:rightsExpressionData"
+            }
+          },
           "required": ["encodedrights"]
         }
       ]