Skip to content
This repository was archived by the owner on Nov 2, 2023. It is now read-only.

Commit e0d6819

Browse files
Merge pull request #1 from json-schema-org/master
Synchronize with remote master again
2 parents 3aeb9ff + 8d26687 commit e0d6819

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+3340
-17217
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@
2323
path = _includes/draft-07
2424
url = https://github.com/json-schema-org/json-schema-spec.git
2525
branch = draft-07
26+
[submodule "_includes/draft/2019-09"]
27+
path = _includes/draft/2019-09
28+
url = https://github.com/json-schema-org/json-schema-spec.git

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ sudo: false
44
node_js:
55
- node
66
before_script:
7-
- npm install ajv-cli
7+
- npm install ajv-cli@3.1.0
88
- PATH="./node_modules/.bin/:$PATH"
99
script:
1010
- bundle exec jekyll build
11-
- ajv test -s schema -d "learn/examples/*.json" --valid
11+
- ajv test -s draft-07/schema -d "learn/examples/*.json" --valid --add-used-schema=false

Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,16 +199,16 @@ GEM
199199
rb-inotify (~> 0.9, >= 0.9.7)
200200
ruby_dep (~> 1.2)
201201
mercenary (0.3.6)
202-
mini_portile2 (2.3.0)
202+
mini_portile2 (2.4.0)
203203
minima (2.4.1)
204204
jekyll (~> 3.5)
205205
jekyll-feed (~> 0.9)
206206
jekyll-seo-tag (~> 2.1)
207207
minitest (5.11.3)
208208
multipart-post (2.0.0)
209209
net-dns (0.8.0)
210-
nokogiri (1.8.2)
211-
mini_portile2 (~> 2.3.0)
210+
nokogiri (1.10.5)
211+
mini_portile2 (~> 2.4.0)
212212
octokit (4.8.0)
213213
sawyer (~> 0.8.0, >= 0.5.3)
214214
pathutil (0.16.1)
@@ -221,7 +221,7 @@ GEM
221221
ruby-enum (0.7.2)
222222
i18n
223223
ruby_dep (1.5.0)
224-
rubyzip (1.2.1)
224+
rubyzip (2.0.0)
225225
safe_yaml (1.0.4)
226226
sass (3.5.6)
227227
sass-listen (~> 4.0.0)

_data/validator-libraries-modern.yml

Lines changed: 72 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,59 +3,75 @@
33
implementations:
44
- name: Json.NET Schema
55
url: https://www.newtonsoft.com/jsonschema
6+
date-draft:
67
draft: [7, 6, 4, 3]
78
license: "AGPL-3.0-only"
89
- name: Manatee.Json
910
url: https://github.com/gregsdennis/Manatee.Json
11+
date-draft: [2019-09]
1012
draft: [7, 6, 4]
1113
license: MIT
1214
- name: C
1315
implementations:
1416
- name: WJElement
1517
url: https://github.com/netmail-open/wjelement
18+
date-draft:
1619
draft: [4, 3]
1720
license: LGPL-3.0
1821
notes: "Draft-06+ progress: issue [17](https://github.com/netmail-open/wjelement/issues/17#issuecomment-390899432)"
1922
- name: C++
2023
implementations:
2124
- name: f5-json-schema
2225
url: https://github.com/KayEss/json-schema
26+
date-draft:
2327
draft: [7]
2428
license: Boost Software License 1.0
2529
- name: JSON schema validator for JSON for Modern C++
2630
url: https://github.com/pboettch/json-schema-validator
31+
date-draft:
2732
draft: [7]
2833
license: MIT
2934
- name: Clojure
3035
implementations:
36+
- name: jinx
37+
url: https://github.com/juxt/jinx
38+
date-draft:
39+
draft: [7]
40+
license: MIT
3141
- name: json-schema
3242
url: https://github.com/luposlip/json-schema
43+
date-draft:
3344
draft: [7]
34-
license: Eclipse Public License 2.0
45+
license: Apache License, Version 2.0
3546
- name: Elixir
3647
implementations:
3748
- name: Elixir JSON Schema validator
3849
url: https://github.com/jonasschmidt/ex_json_schema
50+
date-draft:
3951
draft: [4]
4052
notes: "Draft-06+ progress: issue [24](https://github.com/jonasschmidt/ex_json_schema/issues/24); branch [multi-draft-support](https://github.com/jonasschmidt/ex_json_schema/tree/multi-draft-support)"
4153
license: MIT
4254
- name: JsonXema
4355
url: https://github.com/hrzndhrn/json_xema
56+
date-draft:
4457
draft: [7, 6, 4]
4558
license: MIT
4659
- name: Go
4760
implementations:
4861
- name: gojsonschema
4962
url: https://github.com/xeipuuv/gojsonschema
63+
date-draft:
5064
draft: [7, 6, 4]
5165
license: "Apache 2.0"
5266
- name: santhosh-tekuri/jsonschema
5367
url: https://github.com/santhosh-tekuri/jsonschema
5468
notes:
69+
date-draft:
5570
draft: [7, 6, 4]
5671
license: BSD-3-Clause
5772
- name: qri-io/jsonschema
5873
url: https://github.com/qri-io/jsonschema
74+
date-draft:
5975
draft: [7]
6076
license: MIT
6177
notes: includes custom validator support, rich error returns
@@ -64,85 +80,138 @@
6480
- name: everit-org/json-schema
6581
url: https://github.com/everit-org/json-schema
6682
notes:
83+
date-draft:
6784
draft: [7, 6, 4]
6885
license: Apache License 2.0
6986
- name: Justify
7087
url: https://github.com/leadpony/justify
7188
notes:
72-
draft: [7]
89+
date-draft:
90+
draft: [7, 6, 4]
91+
license: Apache License 2.0
92+
- name: networknt/json-schema-validator
93+
url: https://github.com/networknt/json-schema-validator
94+
notes: Support OpenAPI 3.0 with Jackson parser
95+
date-draft:
96+
draft: [7, 6, 4]
7397
license: Apache License 2.0
7498
- name: Kotlin
7599
implementations:
76100
- name: Medeia-validator
77101
url: https://github.com/worldturner/medeia-validator
78102
notes: streaming validator for Kotlin and Java clients; works with Jackson and Gson
103+
date-draft:
79104
draft: [7, 6, 4]
80105
license: Apache License 2.0
81106
- name: JavaScript
82107
implementations:
83108
- name: ajv
84109
url: https://github.com/epoberezkin/ajv
85110
notes: "for Node.js and browsers - supports [custom keywords](https://github.com/epoberezkin/ajv-keywords) and [$data reference](https://github.com/json-schema-org/json-schema-spec/issues/51)"
111+
date-draft:
86112
draft: [7, 6, 4]
87113
license: MIT
88114
- name: djv
89115
url: https://github.com/korzio/djv
90116
notes: "for Node.js and browsers"
117+
date-draft:
91118
draft: [6, 4]
92119
license: MIT
93120
- name: vue-vuelidate-jsonschema
94121
url: https://github.com/mokkabonna/vue-vuelidate-jsonschema
122+
date-draft:
95123
draft: [6]
96124
license: MIT
125+
- name: Perl
126+
implementations:
127+
- name: JSON::Validator
128+
url: https://github.com/mojolicious/json-validator
129+
notes:
130+
date-draft:
131+
draft: [7, 6, 4]
132+
license: "The Artistic License 2.0 (GPL Compatible)"
97133
- name: PHP
98134
implementations:
99135
- name: Opis Json Schema
100136
url: https://github.com/opis/json-schema
101137
notes:
138+
date-draft:
102139
draft: [7, 6]
103140
license: "Apache License 2.0"
104141
- name: Swaggest Json Schema
105142
url: https://github.com/swaggest/php-json-schema
106143
notes:
144+
date-draft:
107145
draft: [7, 6, 4]
108146
license: "MIT"
109147
- name: Python
110148
implementations:
111149
- name: jsonschema
112150
url: https://github.com/Julian/jsonschema
113151
notes:
152+
date-draft:
114153
draft: [7, 6, 4, 3]
115154
license: "MIT"
155+
- name: fastjsonschema
156+
url: https://github.com/horejsek/python-fastjsonschema
157+
notes: Great performance thanks to code generation.
158+
date-draft:
159+
draft: [7, 6, 4]
160+
license: BSD-3-Clause
116161
- name: Ruby
117162
implementations:
118163
- name: JSONSchemer
119164
url: https://github.com/davishmcclurg/json_schemer
120165
notes:
166+
date-draft:
121167
draft: [7, 6, 4]
122168
license: MIT
123169
- name: Objective-C
124170
implementations:
125171
- name: DSJSONSchemaValidation
126172
url: https://github.com/dashevo/JSONSchemaValidation
127173
notes:
174+
date-draft:
175+
draft: [7, 6, 4]
176+
license: MIT
177+
- name: Lua/LuaJIT
178+
implementations:
179+
- name: lua-resty-jsonschema
180+
url: https://github.com/iresty/lua-resty-jsonschema
181+
notes:
182+
date-draft:
128183
draft: [7, 6, 4]
129184
license: MIT
130185
- name: Web (Online)
131186
implementations:
132187
- name: JSON Schema Validator
133188
url: https://www.jsonschemavalidator.net/
189+
date-draft:
134190
draft: [7, 6, 4, 3]
135191
- name: JSON Schema Lint
136192
url: http://jsonschemalint.com/
137-
draft: [6, 4, 3, 2, 1]
193+
date-draft:
194+
draft: [7, 6, 4, 3, 2, 1]
195+
- name: ExtendsClass's JSON Schema Validator
196+
url: https://extendsclass.com/json-schema-validator.html
197+
date-draft:
198+
draft: [7]
138199
- name: Command Line
139200
implementations:
140201
- name: ajv-cli
141202
license: MIT
142203
url: 'https://www.npmjs.com/package/ajv-cli'
204+
date-draft:
143205
draft: [7, 6, 4]
144206
- name: Polyglottal JSON Schema Validator
145207
license: MIT
146208
url: 'https://www.npmjs.com/package/pajv'
209+
date-draft:
147210
draft: [6, 4]
148211
notes: can be used with YAML and many other formats besides JSON
212+
- name: yajsv
213+
license: MIT
214+
url: 'https://github.com/neilpa/yajsv'
215+
date-draft:
216+
draft: [7, 6, 4]
217+
notes: wraps [xeipuuv/gojsonschema](https://github.com/xeipuuv/gojsonschema)

_data/validator-libraries-obsolete.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,6 @@
7373
url: https://github.com/java-json-tools/json-schema-validator
7474
draft: [4]
7575
license: LGPLv3
76-
- name: json-schema-validator
77-
url: https://github.com/networknt/json-schema-validator
78-
notes:
79-
draft: [4]
80-
license: Apache License 2.0
8176
- name: JavaScript
8277
implementations:
8378
- name: jsonschema

_includes/draft-07

Submodule draft-07 updated 1 file

_includes/draft/2019-09

Submodule 2019-09 added at b47f567

_includes/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h2 class="footer-heading">{{ site.title | escape }}</h2>
1212
{% include icon-github.html username=site.github_username %}
1313
</li>
1414
{% endif %}
15-
<li>Discussion: <a href="https://join.slack.com/t/json-schema/shared_invite/enQtMjk1NDcyNDI2NTAwLTcyYmYwMjdmMmUxNzZjYzIxNGU2YjdkNzdlOGZiNjIwNDI2M2Y3NmRkYjA4YmMwODMwYjgyOTFlNWZjZjAyNjg">Slack</a> | <a href="https://groups.google.com/forum/#!forum/json-schema">Google Groups</a></li>
15+
<li>Discussion: <a href="https://join.slack.com/t/json-schema/shared_invite/enQtNjc5NTk0MzkzODg5LTVlZGIxNmVhMGY2MWFlYTdiNDQ5NWFiZGUwOThhNmYxZDE0YzA5YjRiOTA5MGY4ZTZlZGZhZDFmYTY4NWM2N2Y">Slack</a> | <a href="https://groups.google.com/forum/#!forum/json-schema">Google Groups</a></li>
1616
<li>Site edits: <a href="https://github.com/json-schema-org/json-schema-org.github.io">GitHub repo for site</a></li>
1717
</ul>
1818
</div>

_includes/header.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
<a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
2626
{%- endif -%}
2727
{% endfor -%}
28-
<a class="page-link" href="https://join.slack.com/t/json-schema/shared_invite/enQtMjk1NDcyNDI2NTAwLTcyYmYwMjdmMmUxNzZjYzIxNGU2YjdkNzdlOGZiNjIwNDI2M2Y3NmRkYjA4YmMwODMwYjgyOTFlNWZjZjAyNjg">
29-
Discussion
30-
</a>
28+
<a class="page-link" href="https://join.slack.com/t/json-schema/shared_invite/enQtNjc5NTk0MzkzODg5LTVlZGIxNmVhMGY2MWFlYTdiNDQ5NWFiZGUwOThhNmYxZDE0YzA5YjRiOTA5MGY4ZTZlZGZhZDFmYTY4NWM2N2Y">Join our Slack</a>
3129
</div>
3230
</nav>
3331
{%- endif -%}

_layouts/redirect.html

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!DOCTYPE html>
2+
<html lang="en-US">
3+
<meta charset="utf-8">
4+
<title>Redirecting&hellip;</title>
5+
<link rel="canonical" href="{{ page.redirect.to }}">
6+
<meta http-equiv="refresh" content="0; url={{ page.redirect.to }}">
7+
<meta name="robots" content="noindex">
8+
<h1>Redirecting&hellip;</h1>
9+
<p>
10+
Several redirections on json-schema.org are special cases:
11+
</p>
12+
<ul>
13+
<li>The unversioned meta-schema URIs should no longer be used.</li>
14+
<li>The vocabularies are represented by their specification text.</li>
15+
<li>The "latest" specification URIs are for convenice of browser
16+
bookmarking only.</li>
17+
</ul>
18+
<a href="{{ page.redirect.to }}">Click here if you are not redirected.</a>
19+
<script>location="{{ page.redirect.to }}"</script>
20+
</html>

draft-06/json-schema-release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ keyword | change | consequence
2525
`"$id"` | replaces `"id"` | behavior is identical, `$` prefix matches the other two core keywords
2626
`"$ref"` | only allowed where a schema is expected | it is now possible to describe instance properties named `"$ref"`
2727
`"exclusiveMinimum"` and `"exclusiveMaximum"` | changed from a boolean to a number to be consistent with the principle of keyword independence | wherever one of these would be true before, change the value to the corresponding `"minimum"` or `"maximum"` value and remove the `"minimum"`/`"maximum"` keyword
28+
`"type"` | definition of `"integer"` | in draft-04, `"integer"` is listed as a primitive type and defined as "a JSON number without a fraction or exponent part"; in draft-06, `"integer"` is not considered a primitive type and is only defined in the section for keyword `"type"` as "any number with a zero fractional part"; `1.0` is thus not a valid `"integer"` type in draft-04 and earlier, but is a valid `"integer"` type in draft-06 and later; note that both drafts say that integers SHOULD be encoded in JSON without fractional parts
2829

2930
#### Additions and backwards-compatible changes
3031

draft/2019-09/hyper-schema

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../_includes/draft/2019-09/hyper-schema.json

0 commit comments

Comments
 (0)