Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Publish v3.1 schemas version 2022-10-07 #3042

Merged
merged 1 commit into from
Oct 13, 2022
Merged

Publish v3.1 schemas version 2022-10-07 #3042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions schemas/v3.1/schema-base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"$id": "https://spec.openapis.org/oas/3.1/schema-base/2022-02-27",
"$id": "https://spec.openapis.org/oas/3.1/schema-base/2022-10-07",
"$schema": "https://json-schema.org/draft/2020-12/schema",

"description": "The description of OpenAPI v3.1.x documents using the OpenAPI JSON Schema dialect, as defined by https://spec.openapis.org/oas/v3.1.0",

"$ref": "https://spec.openapis.org/oas/3.1/schema/2022-02-27",
"$ref": "https://spec.openapis.org/oas/3.1/schema/2022-10-07",
"properties": {
"jsonSchemaDialect": { "$ref": "#/$defs/dialect" }
},
Expand Down
4 changes: 2 additions & 2 deletions schemas/v3.1/schema-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
$id: 'https://spec.openapis.org/oas/3.1/schema-base/2022-02-27'
$id: 'https://spec.openapis.org/oas/3.1/schema-base/2022-10-07'
$schema: 'https://json-schema.org/draft/2020-12/schema'

description: The description of OpenAPI v3.1.x documents using the OpenAPI JSON Schema dialect, as defined by https://spec.openapis.org/oas/v3.1.0

$ref: 'https://spec.openapis.org/oas/3.1/schema/2022-02-27'
$ref: 'https://spec.openapis.org/oas/3.1/schema/2022-10-07'
properties:
jsonSchemaDialect:
$ref: '#/$defs/dialect'
Expand Down
25 changes: 12 additions & 13 deletions schemas/v3.1/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://spec.openapis.org/oas/3.1/schema/2022-02-27",
"$id": "https://spec.openapis.org/oas/3.1/schema/2022-10-07",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"description": "The description of OpenAPI v3.1.x documents without schema validation, as defined by https://spec.openapis.org/oas/v3.1.0",
"type": "object",
Expand All @@ -22,7 +22,9 @@
"$ref": "#/$defs/server"
},
"default": [
{ "url": "/" }
{
"url": "/"
}
]
},
"paths": {
Expand Down Expand Up @@ -148,18 +150,15 @@
"required": [
"name"
],
"oneOf": [
{
"required": [
"identifier"
]
},
{
"required": [
"url"
]
"dependentSchemas": {
"identifier": {
"not": {
"required": [
"url"
]
}
}
],
},
"$ref": "#/$defs/specification-extensions",
"unevaluatedProperties": false
},
Expand Down
2 changes: 1 addition & 1 deletion schemas/v3.1/schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$id: 'https://spec.openapis.org/oas/3.1/schema/2022-02-27'
$id: 'https://spec.openapis.org/oas/3.1/schema/2022-10-07'
$schema: 'https://json-schema.org/draft/2020-12/schema'

description: The description of OpenAPI v3.1.x documents without schema validation, as defined by https://spec.openapis.org/oas/v3.1.0
Expand Down
2 changes: 1 addition & 1 deletion tests/v3.1/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ before(async () => {
JsonSchema.add(dialect);
JsonSchema.add(vocabulary);
JsonSchema.add(yaml.parse(fs.readFileSync(`${__dirname}/../../schemas/v3.1/schema.yaml`, "utf8"), { prettyErrors: true }));
metaSchema = await JsonSchema.get("https://spec.openapis.org/oas/3.1/schema/2022-02-27");
metaSchema = await JsonSchema.get("https://spec.openapis.org/oas/3.1/schema/2022-10-07");
});

describe("v3.1 Pass", () => {
Expand Down