Merge pull request #3405 from skryukov/revert-discriminator-json-schema

Revert enforce existence of composite applicator keyword adjacent to "discriminator" #3137

Author: earth2marsh

schemas/v3.1/meta/base.schema.json

@@ -18,15 +18,6 @@
         "externalDocs": { "$ref": "#/$defs/external-docs" },
         "xml": { "$ref": "#/$defs/xml" }
     },
-    "dependentSchemas": {
-      "discriminator": {
-        "anyOf": [
-          { "required": [ "oneOf" ] },
-          { "required": [ "anyOf" ] },
-          { "required": [ "allOf" ] }
-        ]
-      }
-    },
 
     "$defs": {
         "extensible": {

schemas/v3.1/meta/base.schema.yaml

@@ -20,12 +20,6 @@ properties:
     $ref: '#/$defs/external-docs'
   xml:
     $ref: '#/$defs/xml'
-dependentSchemas:
-  discriminator:
-    anyOf:
-    - required: [oneOf]
-    - required: [anyOf]
-    - required: [allOf]
 
 $defs:
   discriminator: