Skip to content

Commit ee236ee

Browse files
authored
Merge pull request #4367 from ralfhandl/3.2-version-in-schema
3.2: bump spec version in schema files
2 parents c4dfef1 + d1a2f0a commit ee236ee

23 files changed

+63
-63
lines changed

src/schemas/validation/dialect.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
$id: https://spec.openapis.org/oas/3.1/dialect/WORK-IN-PROGRESS
1+
$id: https://spec.openapis.org/oas/3.2/dialect/WORK-IN-PROGRESS
22
$schema: https://json-schema.org/draft/2020-12/schema
33

4-
title: OpenAPI 3.1 Schema Object Dialect
5-
description: A JSON Schema dialect describing schemas found in OpenAPI v3.1 Descriptions
4+
title: OpenAPI 3.2 Schema Object Dialect
5+
description: A JSON Schema dialect describing schemas found in OpenAPI v3.2.x Descriptions
66

77
$dynamicAnchor: meta
88

@@ -14,8 +14,8 @@ $vocabulary:
1414
https://json-schema.org/draft/2020-12/vocab/meta-data: true
1515
https://json-schema.org/draft/2020-12/vocab/unevaluated: true
1616
https://json-schema.org/draft/2020-12/vocab/validation: true
17-
https://spec.openapis.org/oas/3.1/vocab/base: false
17+
https://spec.openapis.org/oas/3.2/vocab/base: false
1818

1919
allOf:
2020
- $ref: https://json-schema.org/draft/2020-12/schema
21-
- $ref: https://spec.openapis.org/oas/3.1/meta/WORK-IN-PROGRESS
21+
- $ref: https://spec.openapis.org/oas/3.2/meta/WORK-IN-PROGRESS

src/schemas/validation/meta.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
$id: https://spec.openapis.org/oas/3.1/meta/WORK-IN-PROGRESS
1+
$id: https://spec.openapis.org/oas/3.2/meta/WORK-IN-PROGRESS
22
$schema: https://json-schema.org/draft/2020-12/schema
33

44
title: OAS Base Vocabulary
5-
description: A JSON Schema Vocabulary used in the OpenAPI Schema Dialect
5+
description: A JSON Schema Vocabulary used in the OpenAPI JSON Schema Dialect
66

77
$dynamicAnchor: meta
88

99
$vocabulary:
10-
https://spec.openapis.org/oas/3.1/vocab/base: true
10+
https://spec.openapis.org/oas/3.2/vocab/base: true
1111

1212
type:
1313
- object
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
$id: 'https://spec.openapis.org/oas/3.1/schema-base/WORK-IN-PROGRESS'
1+
$id: 'https://spec.openapis.org/oas/3.2/schema-base/WORK-IN-PROGRESS'
22
$schema: 'https://json-schema.org/draft/2020-12/schema'
33

4-
description: The description of OpenAPI v3.1.x Documents using the OpenAPI JSON Schema dialect
4+
description: The description of OpenAPI v3.2.x Documents using the OpenAPI JSON Schema dialect
55

6-
$ref: 'https://spec.openapis.org/oas/3.1/schema/WORK-IN-PROGRESS'
6+
$ref: 'https://spec.openapis.org/oas/3.2/schema/WORK-IN-PROGRESS'
77
properties:
88
jsonSchemaDialect:
99
$ref: '#/$defs/dialect'
1010

1111
$defs:
1212
dialect:
13-
const: 'https://spec.openapis.org/oas/3.1/dialect/WORK-IN-PROGRESS'
13+
const: 'https://spec.openapis.org/oas/3.2/dialect/WORK-IN-PROGRESS'
1414

1515
schema:
1616
$dynamicAnchor: meta
17-
$ref: 'https://spec.openapis.org/oas/3.1/dialect/WORK-IN-PROGRESS'
17+
$ref: 'https://spec.openapis.org/oas/3.2/dialect/WORK-IN-PROGRESS'
1818
properties:
1919
$schema:
2020
$ref: '#/$defs/dialect'

src/schemas/validation/schema.yaml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
$id: 'https://spec.openapis.org/oas/3.1/schema/WORK-IN-PROGRESS'
1+
$id: 'https://spec.openapis.org/oas/3.2/schema/WORK-IN-PROGRESS'
22
$schema: 'https://json-schema.org/draft/2020-12/schema'
33

4-
description: The description of OpenAPI v3.1.x Documents without Schema Object validation
4+
description: The description of OpenAPI v3.2.x Documents without Schema Object validation
55

66
type: object
77
properties:
88
openapi:
99
type: string
10-
pattern: '^3\.1\.\d+(-.+)?$'
10+
pattern: '^3\.2\.\d+(-.+)?$'
1111
info:
1212
$ref: '#/$defs/info'
1313
jsonSchemaDialect:
1414
type: string
1515
format: uri
16-
default: 'https://spec.openapis.org/oas/3.1/dialect/WORK-IN-PROGRESS'
16+
default: 'https://spec.openapis.org/oas/3.2/dialect/WORK-IN-PROGRESS'
1717
servers:
1818
type: array
1919
items:
@@ -53,7 +53,7 @@ unevaluatedProperties: false
5353

5454
$defs:
5555
info:
56-
$comment: https://spec.openapis.org/oas/v3.1#info-object
56+
$comment: https://spec.openapis.org/oas/v3.2#info-object
5757
type: object
5858
properties:
5959
title:
@@ -78,7 +78,7 @@ $defs:
7878
unevaluatedProperties: false
7979

8080
contact:
81-
$comment: https://spec.openapis.org/oas/v3.1#contact-object
81+
$comment: https://spec.openapis.org/oas/v3.2#contact-object
8282
type: object
8383
properties:
8484
name:
@@ -93,7 +93,7 @@ $defs:
9393
unevaluatedProperties: false
9494

9595
license:
96-
$comment: https://spec.openapis.org/oas/v3.1#license-object
96+
$comment: https://spec.openapis.org/oas/v3.2#license-object
9797
type: object
9898
properties:
9999
name:
@@ -114,7 +114,7 @@ $defs:
114114
unevaluatedProperties: false
115115

116116
server:
117-
$comment: https://spec.openapis.org/oas/v3.1#server-object
117+
$comment: https://spec.openapis.org/oas/v3.2#server-object
118118
type: object
119119
properties:
120120
url:
@@ -131,7 +131,7 @@ $defs:
131131
unevaluatedProperties: false
132132

133133
server-variable:
134-
$comment: https://spec.openapis.org/oas/v3.1#server-variable-object
134+
$comment: https://spec.openapis.org/oas/v3.2#server-variable-object
135135
type: object
136136
properties:
137137
enum:
@@ -149,7 +149,7 @@ $defs:
149149
unevaluatedProperties: false
150150

151151
components:
152-
$comment: https://spec.openapis.org/oas/v3.1#components-object
152+
$comment: https://spec.openapis.org/oas/v3.2#components-object
153153
type: object
154154
properties:
155155
schemas:
@@ -201,7 +201,7 @@ $defs:
201201
unevaluatedProperties: false
202202

203203
paths:
204-
$comment: https://spec.openapis.org/oas/v3.1#paths-object
204+
$comment: https://spec.openapis.org/oas/v3.2#paths-object
205205
type: object
206206
patternProperties:
207207
'^/':
@@ -210,7 +210,7 @@ $defs:
210210
unevaluatedProperties: false
211211

212212
path-item:
213-
$comment: https://spec.openapis.org/oas/v3.1#path-item-object
213+
$comment: https://spec.openapis.org/oas/v3.2#path-item-object
214214
type: object
215215
properties:
216216
$ref:
@@ -248,7 +248,7 @@ $defs:
248248
unevaluatedProperties: false
249249

250250
operation:
251-
$comment: https://spec.openapis.org/oas/v3.1#operation-object
251+
$comment: https://spec.openapis.org/oas/v3.2#operation-object
252252
type: object
253253
properties:
254254
tags:
@@ -290,7 +290,7 @@ $defs:
290290
unevaluatedProperties: false
291291

292292
external-documentation:
293-
$comment: https://spec.openapis.org/oas/v3.1#external-documentation-object
293+
$comment: https://spec.openapis.org/oas/v3.2#external-documentation-object
294294
type: object
295295
properties:
296296
description:
@@ -304,7 +304,7 @@ $defs:
304304
unevaluatedProperties: false
305305

306306
parameter:
307-
$comment: https://spec.openapis.org/oas/v3.1#parameter-object
307+
$comment: https://spec.openapis.org/oas/v3.2#parameter-object
308308
type: object
309309
properties:
310310
name:
@@ -444,7 +444,7 @@ $defs:
444444
$ref: '#/$defs/parameter'
445445

446446
request-body:
447-
$comment: https://spec.openapis.org/oas/v3.1#request-body-object
447+
$comment: https://spec.openapis.org/oas/v3.2#request-body-object
448448
type: object
449449
properties:
450450
description:
@@ -470,15 +470,15 @@ $defs:
470470
$ref: '#/$defs/request-body'
471471

472472
content:
473-
$comment: https://spec.openapis.org/oas/v3.1#fixed-fields-10
473+
$comment: https://spec.openapis.org/oas/v3.2#fixed-fields-10
474474
type: object
475475
additionalProperties:
476476
$ref: '#/$defs/media-type'
477477
propertyNames:
478478
format: media-range
479479

480480
media-type:
481-
$comment: https://spec.openapis.org/oas/v3.1#media-type-object
481+
$comment: https://spec.openapis.org/oas/v3.2#media-type-object
482482
type: object
483483
properties:
484484
schema:
@@ -493,7 +493,7 @@ $defs:
493493
unevaluatedProperties: false
494494

495495
encoding:
496-
$comment: https://spec.openapis.org/oas/v3.1#encoding-object
496+
$comment: https://spec.openapis.org/oas/v3.2#encoding-object
497497
type: object
498498
properties:
499499
contentType:
@@ -521,7 +521,7 @@ $defs:
521521
unevaluatedProperties: false
522522

523523
responses:
524-
$comment: https://spec.openapis.org/oas/v3.1#responses-object
524+
$comment: https://spec.openapis.org/oas/v3.2#responses-object
525525
type: object
526526
properties:
527527
default:
@@ -540,7 +540,7 @@ $defs:
540540
required: [default]
541541

542542
response:
543-
$comment: https://spec.openapis.org/oas/v3.1#response-object
543+
$comment: https://spec.openapis.org/oas/v3.2#response-object
544544
type: object
545545
properties:
546546
description:
@@ -571,7 +571,7 @@ $defs:
571571
$ref: '#/$defs/response'
572572

573573
callbacks:
574-
$comment: https://spec.openapis.org/oas/v3.1#callback-object
574+
$comment: https://spec.openapis.org/oas/v3.2#callback-object
575575
type: object
576576
$ref: '#/$defs/specification-extensions'
577577
additionalProperties:
@@ -588,7 +588,7 @@ $defs:
588588
$ref: '#/$defs/callbacks'
589589

590590
example:
591-
$comment: https://spec.openapis.org/oas/v3.1#example-object
591+
$comment: https://spec.openapis.org/oas/v3.2#example-object
592592
type: object
593593
properties:
594594
summary:
@@ -617,7 +617,7 @@ $defs:
617617
$ref: '#/$defs/example'
618618

619619
link:
620-
$comment: https://spec.openapis.org/oas/v3.1#link-object
620+
$comment: https://spec.openapis.org/oas/v3.2#link-object
621621
type: object
622622
properties:
623623
operationRef:
@@ -651,7 +651,7 @@ $defs:
651651
$ref: '#/$defs/link'
652652

653653
header:
654-
$comment: https://spec.openapis.org/oas/v3.1#header-object
654+
$comment: https://spec.openapis.org/oas/v3.2#header-object
655655
type: object
656656
properties:
657657
description:
@@ -697,7 +697,7 @@ $defs:
697697
$ref: '#/$defs/header'
698698

699699
tag:
700-
$comment: https://spec.openapis.org/oas/v3.1#tag-object
700+
$comment: https://spec.openapis.org/oas/v3.2#tag-object
701701
type: object
702702
properties:
703703
name:
@@ -718,7 +718,7 @@ $defs:
718718
unevaluatedProperties: false
719719

720720
reference:
721-
$comment: https://spec.openapis.org/oas/v3.1#reference-object
721+
$comment: https://spec.openapis.org/oas/v3.2#reference-object
722722
type: object
723723
properties:
724724
$ref:
@@ -730,14 +730,14 @@ $defs:
730730
type: string
731731

732732
schema:
733-
$comment: https://spec.openapis.org/oas/v3.1#schema-object
733+
$comment: https://spec.openapis.org/oas/v3.2#schema-object
734734
$dynamicAnchor: meta
735735
type:
736736
- object
737737
- boolean
738738

739739
security-scheme:
740-
$comment: https://spec.openapis.org/oas/v3.1#security-scheme-object
740+
$comment: https://spec.openapis.org/oas/v3.2#security-scheme-object
741741
type: object
742742
properties:
743743
type:
@@ -967,15 +967,15 @@ $defs:
967967
unevaluatedProperties: false
968968

969969
security-requirement:
970-
$comment: https://spec.openapis.org/oas/v3.1#security-requirement-object
970+
$comment: https://spec.openapis.org/oas/v3.2#security-requirement-object
971971
type: object
972972
additionalProperties:
973973
type: array
974974
items:
975975
type: string
976976

977977
specification-extensions:
978-
$comment: https://spec.openapis.org/oas/v3.1#specification-extensions
978+
$comment: https://spec.openapis.org/oas/v3.2#specification-extensions
979979
patternProperties:
980980
'^x-': true
981981

tests/schema/fail/invalid_schema_types.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
openapi: 3.1.1
1+
openapi: 3.2.0
22

33
# this example shows invalid types for the schemaObject
44

tests/schema/fail/no_containers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
openapi: 3.1.0
1+
openapi: 3.2.0
22

33
# this example should fail as there are no paths, components or webhooks containers (at least one of which must be present)
44

tests/schema/fail/server_enum_empty.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
openapi: 3.1.0
1+
openapi: 3.2.0
22

33
# this example should fail as the server variable enum is empty, and so does not contain the default value
44

tests/schema/fail/servers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
openapi: 3.1.0
1+
openapi: 3.2.0
22

33
# this example should fail, as servers must be an array, not an object
44

tests/schema/fail/unknown_container.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
openapi: 3.1.0
1+
openapi: 3.2.0
22

33
# this example should fail as overlays is not a valid top-level object/keyword
44

tests/schema/pass/comp_pathitems.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
openapi: 3.1.0
1+
openapi: 3.2.0
22
info:
33
title: API
44
version: 1.0.0

tests/schema/pass/info_summary.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
openapi: 3.1.0
1+
openapi: 3.2.0
22
info:
33
title: API
44
summary: My lovely API

tests/schema/pass/license_identifier.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
openapi: 3.1.0
1+
openapi: 3.2.0
22
info:
33
title: API
44
summary: My lovely API

tests/schema/pass/mega.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
openapi: 3.1.0
1+
openapi: 3.2.0
22
info:
33
summary: My API's summary
44
title: My API

tests/schema/pass/minimal_comp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
openapi: 3.1.0
1+
openapi: 3.2.0
22
info:
33
title: API
44
version: 1.0.0

tests/schema/pass/minimal_hooks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
openapi: 3.1.0
1+
openapi: 3.2.0
22
info:
33
title: API
44
version: 1.0.0

0 commit comments

Comments
 (0)