Skip to content

Commit 72e180a

Browse files
pwall567pwall567
committed
Merge remote-tracking branch 'origin/add-json-kotlin-schema' into add-json-kotlin-schema
2 parents 47d460a + 3abec4f commit 72e180a

Some content is hidden

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

52 files changed

+5098
-259
lines changed

‎.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@
2626
[submodule "_includes/draft/2019-09"]
2727
path = _includes/draft/2019-09
2828
url = https://github.com/json-schema-org/json-schema-spec.git
29+
[submodule "_includes/draft/2020-12"]
30+
path = _includes/draft/2020-12
31+
url = https://github.com/json-schema-org/json-schema-spec.git
32+
branch = 2020-12

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Thank you for your interest in contributing to JSON Schema! Your participation is appreciated!
22

3-
If your question/request/change concerns the [JSON Schema Website](json-schema.org) you are in the right place. If your question/request/change concerns the JSON Schema specification drafts or meta-schemas, please go to [the JSON Schema specification repository](https://github.com/json-schema-org/json-schema-spec).
3+
If your question/request/change concerns the [JSON Schema Website](https://json-schema.org/) you are in the right place. If your question/request/change concerns the JSON Schema specification drafts or meta-schemas, please go to [the JSON Schema specification repository](https://github.com/json-schema-org/json-schema-spec).

‎Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,4 +247,4 @@ DEPENDENCIES
247247
github-pages
248248

249249
BUNDLED WITH
250-
1.16.1
250+
2.2.7

‎README.md

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,36 @@ For the current status of issues and pull requests, please see the following bad
1212
[![Available](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Status:%20Available.svg?color=brightgreen)](https://github.com/json-schema-org/json-schema-org.github.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22Status%3A+Available%22) [![In Progress](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Status:%20In%20Progress.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Status:%20In%20Progress) [![Review Needed](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Status:%20Review%20Needed.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Status%3A%20Review%20Needed)
1313

1414
[![Critical](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Critical.svg?color=critical
15-
)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Critical) [![High](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20High.svg?color=important)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20High) [![Medium](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Medium.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Medium) [![Low](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Low.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Low)
15+
)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Critical) [![High](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20High.svg?color=important)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20High) [![Medium](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Medium.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Medium) [![Low](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Low.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Low)
1616

1717
Labels are assigned based on [Sensible Github Labels](https://github.com/Relequestual/sensible-github-labels).
1818

19+
## Compile and run locally
20+
21+
This site runs via github pages, with automatically building PR previews via netlify.
22+
If you wish to compile and run this site locally, you will need to have ruby installed.
23+
24+
If you're not familiar with ruby, consider using `rvm` (https://rvm.io/).
25+
Once you have Ruby installed, follow these instructions while in the project directory
26+
27+
> Instructions
28+
>
29+
> 1. Install the jekyll and bundler gems.
30+
>
31+
> `gem install jekyll bundler`
32+
>
33+
> 2. Create a new Jekyll site at ./myblog.
34+
>
35+
> ...
36+
>
37+
> 3. Build the site and make it available on a local server.
38+
>
39+
> `bundle exec jekyll serve`
40+
>
41+
> 4. Browse to http://localhost:4000
42+
43+
Adapted from https://jekyllrb.com/docs/
44+
1945
## License
2046

21-
The source material in this repository is licensed under the AFL or BSD license.
47+
The source material in this repository is licensed under the AFL or BSD license.

‎_data/validator-libraries-modern.yml

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,9 @@
88
license: "AGPL-3.0-only"
99
- name: JsonSchema.Net
1010
url: https://github.com/gregsdennis/json-everything
11-
date-draft: [2019-09]
11+
date-draft: [2020-12, 2019-09]
1212
draft: [7, 6]
1313
license: MIT
14-
- name: Manatee.Json
15-
url: https://github.com/gregsdennis/Manatee.Json
16-
date-draft: [2019-09]
17-
draft: [7, 6, 4]
18-
license: MIT
1914
- name: C
2015
implementations:
2116
- name: WJElement
@@ -101,6 +96,13 @@
10196
date-draft: [2019-09]
10297
draft: [7, 6]
10398
license: GNU Affero General Public License v3.0
99+
- name: Vert.x Json Schema
100+
url: https://github.com/eclipse-vertx/vertx-json-schema
101+
notes: Validator for Eclipse Vert.x project JSON types.
102+
date-draft: [2019-09]
103+
draft: [7]
104+
license: Apache License, Version 2.0
105+
notes: includes custom keywords support, custom dialect support, asynchronous validation
104106
- name: everit-org/json-schema
105107
url: https://github.com/everit-org/json-schema
106108
notes:
@@ -119,6 +121,12 @@
119121
date-draft:
120122
draft: [7, 6, 4]
121123
license: Apache License 2.0
124+
- name: jsonschemafriend
125+
url: https://github.com/jimblackler/jsonschemafriend
126+
notes:
127+
date-draft: [2019-09]
128+
draft: [7, 6, 4, 3]
129+
license: Apache License 2.0
122130
- name: Kotlin
123131
implementations:
124132
- name: Medeia-validator
@@ -136,9 +144,9 @@
136144
- name: JavaScript
137145
implementations:
138146
- name: ajv
139-
url: https://github.com/epoberezkin/ajv
140-
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)"
141-
date-draft:
147+
url: https://github.com/ajv-validator/ajv
148+
notes: "for Node.js and browsers - supports [user-defined keywords](https://github.com/ajv-validator/ajv/blob/master/docs/keywords.md) and [$data reference](https://github.com/json-schema-org/json-schema-spec/issues/51)"
149+
date-draft: [2019-09, 2020-12]
142150
draft: [7, 6, 4]
143151
license: MIT
144152
- name: djv
@@ -150,7 +158,7 @@
150158
- name: Hyperjump JSV
151159
url: https://github.com/jdesrosiers/json-schema
152160
notes: "Built for Node.js and browsers. Includes support for custom vocabularies."
153-
date-draft: [2019-09]
161+
date-draft: [2019-09, 2020-12]
154162
draft: [7, 6, 4]
155163
license: MIT
156164
- name: vue-vuelidate-jsonschema
@@ -166,17 +174,22 @@
166174
license: MIT
167175
- name: Perl
168176
implementations:
177+
- name: JSON::Schema::Draft201909
178+
url: https://github.com/karenetheridge/JSON-Schema-Draft201909
179+
notes:
180+
date-draft: [2019-09]
181+
license: "GNU General Public License, Version 1 + The Artistic License 1.0"
182+
- name: JSON::Schema::Tiny
183+
url: https://github.com/karenetheridge/JSON-Schema-Tiny
184+
notes:
185+
date-draft: [2019-09]
186+
license: "GNU General Public License, Version 1 + The Artistic License 1.0"
169187
- name: JSON::Validator
170188
url: https://github.com/mojolicious/json-validator
171189
notes:
172190
date-draft:
173191
draft: [7, 6, 4]
174192
license: "The Artistic License 2.0 (GPL Compatible)"
175-
- name: JSON::Schema::Draft201909
176-
url: https://github.com/karenetheridge/JSON-Schema-Draft201909
177-
notes:
178-
date-draft: [2019-09]
179-
license: "GNU General Public License, Version 1 + The Artistic License 1.0"
180193
- name: PHP
181194
implementations:
182195
- name: Opis Json Schema
@@ -193,6 +206,12 @@
193206
license: "MIT"
194207
- name: Python
195208
implementations:
209+
- name: jschon
210+
url: https://github.com/marksparkza/jschon
211+
notes:
212+
date-draft: [2019-09, 2020-12]
213+
draft:
214+
license: MIT
196215
- name: jsonschema
197216
url: https://github.com/Julian/jsonschema
198217
notes:
@@ -206,7 +225,7 @@
206225
draft: [7, 6, 4]
207226
license: BSD-3-Clause
208227
- name: jsonschema-rs
209-
url: https://github.com/Stranger6667/jsonschema-rs/python
228+
url: https://github.com/Stranger6667/jsonschema-rs/tree/master/bindings/python
210229
notes: Python bindings to Rust's jsonschema crate
211230
date-draft:
212231
draft: [7, 6, 4]
@@ -247,7 +266,7 @@
247266
implementations:
248267
- name: Hyperjump JSV
249268
url: https://json-schema.hyperjump.io
250-
date-draft: [2019-09]
269+
date-draft: [2019-09, 2020-12]
251270
draft: [7, 6, 4]
252271
notes: Supports multiple schemas and multiple instances
253272
- name: JSON Schema Validator

‎_data/validator-libraries-obsolete.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
notes:
77
draft: [4]
88
license: Ms-PL
9+
- name: Manatee.Json
10+
url: https://github.com/gregsdennis/Manatee.Json
11+
date-draft: [2019-09]
12+
draft: [7, 6, 4]
13+
license: MIT
914
- name: C++
1015
anchor-name: cpp
1116
implementations:

‎_includes/draft/2020-12

Submodule 2020-12 added at 0e08f03

‎_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/enQtNjc5NTk0MzkzODg5LTVlZGIxNmVhMGY2MWFlYTdiNDQ5NWFiZGUwOThhNmYxZDE0YzA5YjRiOTA5MGY4ZTZlZGZhZDFmYTY4NWM2N2Y">Slack</a> | <a href="https://groups.google.com/forum/#!forum/json-schema">Google Groups</a></li>
15+
<li>Discussion: <a href="/slack">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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +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/enQtNjc5NTk0MzkzODg5LTVlZGIxNmVhMGY2MWFlYTdiNDQ5NWFiZGUwOThhNmYxZDE0YzA5YjRiOTA5MGY4ZTZlZGZhZDFmYTY4NWM2N2Y">Join our Slack</a>
28+
<a class="page-link" href="/slack">Join our Slack</a>
2929
</div>
3030
</nav>
3131
{%- endif -%}

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

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,19 @@ The difficulty is that if you attempt to do this:
7070
{
7171
"type": "object",
7272
"allOf": [
73-
{"$ref": "#/definitions/foo"},
74-
{"$ref": "#/definitions/bar"}
73+
{ "$ref": "#/definitions/foo" },
74+
{ "$ref": "#/definitions/bar" }
7575
],
7676
"definitions": {
7777
"foo": {
7878
"properties": {
79-
"foo": {"type": "string"}
79+
"foo": { "type": "string" }
8080
},
8181
"additionalProperties": false
8282
},
8383
"bar": {
8484
"properties": {
85-
"bar": {"type": "number"}
85+
"bar": { "type": "number" }
8686
},
8787
"additionalProperties": false
8888
}
@@ -100,30 +100,28 @@ A workaround is available with the new `"propertyNames"` keyword:
100100
{
101101
"type": "object",
102102
"allOf": [
103-
{"$ref": "#/definitions/foo"},
104-
{"$ref": "#/definitions/bar"}
105-
],
106-
"anyOf": [
107-
{"$ref": "#/definitions/fooNames"},
108-
{"$ref": "#/definitions/barNames"}
103+
{ "$ref": "#/definitions/foo" },
104+
{ "$ref": "#/definitions/bar" }
109105
],
106+
"propertyNames": {
107+
"anyOf": [
108+
{ "$ref": "#/definitions/fooNames" },
109+
{ "$ref": "#/definitions/barNames" }
110+
]
111+
},
110112
"definitions": {
111113
"foo": {
112114
"properties": {
113-
"foo": {"type": "string"}
115+
"foo": { "type": "string" }
114116
}
115117
},
116-
"fooNames": {
117-
"propertyNames": {"enum": ["foo"]}
118-
},
118+
"fooNames": { "enum": ["foo"] },
119119
"bar": {
120120
"properties": {
121-
"bar": {"type": "number"}
121+
"bar": { "type": "number" }
122122
}
123123
},
124-
"barNames": {
125-
"propertyNames": {"enum": ["bar"]}
126-
}
124+
"barNames": { "enum": ["bar"] }
127125
}
128126
}
129127
```

0 commit comments

Comments
 (0)