diff --git a/package-lock.json b/package-lock.json index f61bc35e..276c0a77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@asyncapi/specs", - "version": "6.0.0-next-major-spec.8", + "version": "6.0.0-next-major-spec.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@asyncapi/specs", - "version": "6.0.0-next-major-spec.8", + "version": "6.0.0-next-major-spec.9", "license": "Apache-2.0", "dependencies": { "@types/json-schema": "^7.0.11" diff --git a/package.json b/package.json index da57017d..e4527433 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@asyncapi/specs", - "version": "6.0.0-next-major-spec.8", + "version": "6.0.0-next-major-spec.9", "description": "AsyncAPI schema versions", "main": "index.js", "types": "index.d.ts", diff --git a/schemas/3.0.0-without-$id.json b/schemas/3.0.0-without-$id.json index a2654ac5..cc25a968 100644 --- a/schemas/3.0.0-without-$id.json +++ b/schemas/3.0.0-without-$id.json @@ -3271,7 +3271,7 @@ "properties": { "bindingVersion": { "enum": [ - "0.1.0" + "0.2.0" ] } }, @@ -3286,7 +3286,7 @@ } }, "then": { - "$ref": "#/definitions/bindings-googlepubsub-0.1.0-message" + "$ref": "#/definitions/bindings-googlepubsub-0.2.0-message" } }, { @@ -3296,12 +3296,12 @@ ], "properties": { "bindingVersion": { - "const": "0.1.0" + "const": "0.2.0" } } }, "then": { - "$ref": "#/definitions/bindings-googlepubsub-0.1.0-message" + "$ref": "#/definitions/bindings-googlepubsub-0.2.0-message" } } ] @@ -3419,7 +3419,14 @@ }, "properties": { "key": { - "$ref": "#/definitions/schema", + "oneOf": [ + { + "$ref": "#/definitions/Reference" + }, + { + "$ref": "#/definitions/schema" + } + ], "description": "The message key." }, "schemaIdLocation": { @@ -3695,7 +3702,7 @@ } ] }, - "bindings-googlepubsub-0.1.0-message": { + "bindings-googlepubsub-0.2.0-message": { "title": "Cloud Pub/Sub Channel Schema", "description": "This object contains information about the message representation for Google Cloud Pub/Sub.", "type": "object", @@ -3709,7 +3716,7 @@ "bindingVersion": { "type": "string", "enum": [ - "0.1.0" + "0.2.0" ], "description": "The version of this binding." }, @@ -3725,28 +3732,22 @@ "properties": { "name": { "type": "string" - }, - "type": { - "type": "string" } }, "required": [ - "name", - "type" + "name" ] } }, "examples": [ { "schema": { - "name": "projects/your-project-id/schemas/your-avro-schema-id", - "type": "avro" + "name": "projects/your-project-id/schemas/your-avro-schema-id" } }, { "schema": { - "name": "projects/your-project-id/schemas/your-protobuf-schema-id", - "type": "protobuf" + "name": "projects/your-project-id/schemas/your-protobuf-schema-id" } } ] @@ -4120,7 +4121,7 @@ "properties": { "bindingVersion": { "enum": [ - "0.1.0" + "0.2.0" ] } }, @@ -4135,7 +4136,7 @@ } }, "then": { - "$ref": "#/definitions/bindings-googlepubsub-0.1.0-channel" + "$ref": "#/definitions/bindings-googlepubsub-0.2.0-channel" } }, { @@ -4145,12 +4146,12 @@ ], "properties": { "bindingVersion": { - "const": "0.1.0" + "const": "0.2.0" } } }, "then": { - "$ref": "#/definitions/bindings-googlepubsub-0.1.0-channel" + "$ref": "#/definitions/bindings-googlepubsub-0.2.0-channel" } } ] @@ -4679,7 +4680,7 @@ } ] }, - "bindings-googlepubsub-0.1.0-channel": { + "bindings-googlepubsub-0.2.0-channel": { "title": "Cloud Pub/Sub Channel Schema", "description": "This object contains information about the channel representation for Google Cloud Pub/Sub.", "type": "object", @@ -4693,7 +4694,7 @@ "bindingVersion": { "type": "string", "enum": [ - "0.1.0" + "0.2.0" ], "description": "The version of this binding." }, @@ -4736,14 +4737,10 @@ "encoding", "name" ] - }, - "topic": { - "type": "string" } }, "required": [ - "schemaSettings", - "topic" + "schemaSettings" ], "examples": [ { diff --git a/schemas/3.0.0.json b/schemas/3.0.0.json index 1c28feb0..3dfba870 100644 --- a/schemas/3.0.0.json +++ b/schemas/3.0.0.json @@ -3324,7 +3324,7 @@ "properties": { "bindingVersion": { "enum": [ - "0.1.0" + "0.2.0" ] } }, @@ -3339,7 +3339,7 @@ } }, "then": { - "$ref": "http://asyncapi.com/bindings/googlepubsub/0.1.0/message.json" + "$ref": "http://asyncapi.com/bindings/googlepubsub/0.2.0/message.json" } }, { @@ -3349,12 +3349,12 @@ ], "properties": { "bindingVersion": { - "const": "0.1.0" + "const": "0.2.0" } } }, "then": { - "$ref": "http://asyncapi.com/bindings/googlepubsub/0.1.0/message.json" + "$ref": "http://asyncapi.com/bindings/googlepubsub/0.2.0/message.json" } } ] @@ -3476,7 +3476,14 @@ }, "properties": { "key": { - "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json", + "oneOf": [ + { + "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json" + }, + { + "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json" + } + ], "description": "The message key." }, "schemaIdLocation": { @@ -3756,8 +3763,8 @@ } ] }, - "http://asyncapi.com/bindings/googlepubsub/0.1.0/message.json": { - "$id": "http://asyncapi.com/bindings/googlepubsub/0.1.0/message.json", + "http://asyncapi.com/bindings/googlepubsub/0.2.0/message.json": { + "$id": "http://asyncapi.com/bindings/googlepubsub/0.2.0/message.json", "title": "Cloud Pub/Sub Channel Schema", "description": "This object contains information about the message representation for Google Cloud Pub/Sub.", "type": "object", @@ -3771,7 +3778,7 @@ "bindingVersion": { "type": "string", "enum": [ - "0.1.0" + "0.2.0" ], "description": "The version of this binding." }, @@ -3787,28 +3794,22 @@ "properties": { "name": { "type": "string" - }, - "type": { - "type": "string" } }, "required": [ - "name", - "type" + "name" ] } }, "examples": [ { "schema": { - "name": "projects/your-project-id/schemas/your-avro-schema-id", - "type": "avro" + "name": "projects/your-project-id/schemas/your-avro-schema-id" } }, { "schema": { - "name": "projects/your-project-id/schemas/your-protobuf-schema-id", - "type": "protobuf" + "name": "projects/your-project-id/schemas/your-protobuf-schema-id" } } ] @@ -4186,7 +4187,7 @@ "properties": { "bindingVersion": { "enum": [ - "0.1.0" + "0.2.0" ] } }, @@ -4201,7 +4202,7 @@ } }, "then": { - "$ref": "http://asyncapi.com/bindings/googlepubsub/0.1.0/channel.json" + "$ref": "http://asyncapi.com/bindings/googlepubsub/0.2.0/channel.json" } }, { @@ -4211,12 +4212,12 @@ ], "properties": { "bindingVersion": { - "const": "0.1.0" + "const": "0.2.0" } } }, "then": { - "$ref": "http://asyncapi.com/bindings/googlepubsub/0.1.0/channel.json" + "$ref": "http://asyncapi.com/bindings/googlepubsub/0.2.0/channel.json" } } ] @@ -4751,8 +4752,8 @@ } ] }, - "http://asyncapi.com/bindings/googlepubsub/0.1.0/channel.json": { - "$id": "http://asyncapi.com/bindings/googlepubsub/0.1.0/channel.json", + "http://asyncapi.com/bindings/googlepubsub/0.2.0/channel.json": { + "$id": "http://asyncapi.com/bindings/googlepubsub/0.2.0/channel.json", "title": "Cloud Pub/Sub Channel Schema", "description": "This object contains information about the channel representation for Google Cloud Pub/Sub.", "type": "object", @@ -4766,7 +4767,7 @@ "bindingVersion": { "type": "string", "enum": [ - "0.1.0" + "0.2.0" ], "description": "The version of this binding." }, @@ -4809,14 +4810,10 @@ "encoding", "name" ] - }, - "topic": { - "type": "string" } }, "required": [ - "schemaSettings", - "topic" + "schemaSettings" ], "examples": [ {