Merging in upstream changes before pushing

Author: handrews

_data/validator-libraries-modern.yml

@@ -31,7 +31,7 @@
     - name: json-schema
       url: https://github.com/luposlip/json-schema
       draft: [7]
-      license: Eclipse Public License 2.0
+      license: Apache License, Version 2.0
 - name: Elixir
   implementations:
     - name: Elixir JSON Schema validator
@@ -134,7 +134,10 @@
       draft: [7, 6, 4, 3]
     - name: JSON Schema Lint
       url: http://jsonschemalint.com/
-      draft: [6, 4, 3, 2, 1]
+      draft: [7, 6, 4, 3, 2, 1]
+    - name: ExtendsClass's JSON Schema Validator
+      url: https://extendsclass.com/json-schema-validator.html
+      draft: [7]
 - name: Command Line
   implementations:
     - name: ajv-cli

implementations.md

@@ -64,6 +64,9 @@ Validators
 
 Benchmarks that compare at least two implementations supporting draft-06+ may be listed here.
 
+-   Go
+    -   [validator-benchmarks](https://github.com/TheWildBlue/validator-benchmarks) - benchmark of Go JSON Schema validators based on official test suite
+
 -   JavaScript
     -   [json-schema-benchmark](https://github.com/ebdrup/json-schema-benchmark) - an independent benchmark for Node.js JSON-schema validators based on JSON-Schema Test Suite (MIT)
 
@@ -149,6 +152,8 @@ For example, the only incompatibilities between draft-04 and draft-06 involve `e
     -   [typescript-json-schema](https://github.com/YousefED/typescript-json-schema)
 -   Python
     -   [Pydantic](https://pydantic-docs.helpmanual.io/) (MIT) - generates schemas from Python models based on Python 3.6+ type hints.
+-   Java
+    -   [jsonschema-generator](https://github.com/victools/jsonschema-generator) (Apache 2.0) - generates schemas from Java types *supports Draft 7*
 
 #### From data
 
@@ -180,6 +185,8 @@ are the only keywords that changed.
     -   [quicktype.io](https://app.quicktype.io/#l=schema) - infer JSON Schema from samples, and generate TypeScript, C++, go, Java, C#, Swift, etc. types from JSON Schema
 -   PHP
     -  [php-code-builder](https://github.com/swaggest/php-code-builder)(MIT) - generates PHP mapping structures defined by JSON schema using [swaggest/json-schema](https://github.com/swaggest/php-json-schema) *supports Draft 7*
+-   Elm
+    -  [json-schema-to-elm](https://github.com/dragonwasrobot/json-schema-to-elm) - generates Elm types, JSON decoders+encoders, and fuzz tests from one or more JSON Schema files, using [dragonwasrobot/json_schema](https://github.com/dragonwasrobot/json_schema) *supports Draft 7*
 
 #### Web UI generation
 
@@ -248,11 +255,12 @@ the utility, and decided on a case-by-case basis.
 -   Python
     -   [hypothesis-jsonschema](https://github.com/Zac-HD/hypothesis-jsonschema) (MPL) *draft-07, -06, -04*;  creates [Hypothesis](https://hypothesis.works/) strategies for documents which match any schema, even with complex and interacting constraints.
     -   [hypo\_schema](https://github.com/mlakewood/hypo_schema) (BSD-2-Clause) Creates generators for Hypothesis from JSON Schema
-    
+
 #### Editors
 
 _TODO: Sort by draft support._
 
+-   [Altova XMLSpy 2019r3](https://www.altova.com/xmlspy-xml-editor#json_schema) - *Graphical JSON Schema editor for draft-06 and draft-7, as well as validation of JSON files based on JSON Schema*
 -   [Liquid XML Studio 2016](https://www.liquid-technologies.com/json-schema-editor) - *Graphical JSON schema editor for draft 4, context sensitive intellisense for JSON documents.*
 -   [Visual Studio 2013](https://www.visualstudio.com/) - *Auto-completion and tooltips based on JSON schema draft 3 and draft 4*
 -   [JSONBuddy](https://www.json-buddy.com/) - *Text and grid-style JSON editor and validator with context sensitive entry-helpers and sample data generation based on JSON schema. Support for draft 4, draft 6 and draft 7.*

learn/examples/calendar.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://example.com/address.schema.json",
+  "$id": "https://example.com/calendar.schema.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "description": "A representation of an event",
   "type": "object",

learn/examples/card.schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://example.com/address.schema.json",
+  "$id": "https://example.com/card.schema.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "description": "A representation of a person, company, organization, or place",
   "type": "object",

obsolete-implementations.md

@@ -129,7 +129,7 @@ Hyper-Schema
   {% endfor %}
 </ul>
 
-Schema generation
+Schema generators
 -----------------
 
 -   Python
@@ -143,6 +143,14 @@ Schema generation
 -   Sparx Enterprise Architect
     -   [API-Add-In](https://github.com/bayeslife/api-add-in) - Sparx EA extension for exporting JSON Schema from UML models
 
+Generators from schemas
+-----------------------
+
+#### Data from schemas
+
+-   JavaScript
+    -   [json-schema-generator](https://github.com/json-schema-faker) (MIT) - JSON-Schema + fake data generators
+
 Data parsing and code generation
 --------------------------------
 

specification.md

@@ -39,8 +39,8 @@ The meta-schemas are schemas against which other schemas can be validated. They
 The latest meta-schema is **draft-07**.
 
 |--------------------------------------------------------------|------------------------------------------------------------|
-| [Core/Validation meta-schema](http://json-schema.org/draft-07/schema) | Used for schemas written for pure validation.              |
-| [Hyper meta-schema](http://json-schema.org/draft-07/hyper-schema)     | Used for schemas written for validation and hyper-linking. |
+| [Core/Validation meta-schema](https://json-schema.org/draft-07/schema) | Used for schemas written for pure validation.              |
+| [Hyper meta-schema](https://json-schema.org/draft-07/hyper-schema)     | Used for schemas written for validation and hyper-linking. |
 
 _If you are accessing the above meta-schema links **from a web browser**, you will need to **save the file** then open it as a JSON document._
 

work-in-progress/WIP-json-schema-release-notes.md

@@ -0,0 +1,52 @@
+---
+title: JSON Schema Draft-07 Release Notes
+layout: page
+---
+
+There are a few non-breaking changes with keywords being deprecated and slates
+for removal, and a few newer keywords based on community feedback. Internally
+there has been a lot of restructuring through a new concept called vocabularies,
+but on the whole things are mostly the same.
+
+* TOC
+{:toc}
+
+- Update to RFC 8359 for JSON specification
+- Add the concept of formal vocabularies, and how they can be recognized through meta-schemas
+- Formalized annotation collection
+- Moved applicator keywords from the Validation specification as their own vocabulary
+- Define "$ref" behavior in terms of the assertion, applicator, and annotation model
+- Note undefined behavior for "$ref" targets involving unknown keywords
+- Additional guidance on initial base URIs beyond network retrieval
+- Allow "schema" media type parameter for "application/schema+json"
+
+### Keywords
+
+* Eight brand new keywords were added
+* One keyword was renamed
+* One keyword was split in half
+* One keyword in Core changed behavior
+* One keyword in Hyper-Schema changed behavior
+
+keyword | change | notes
+---- | ---- | ----
+[`"definitions"`](json-schema-core.html#rfc.section.TODO) | **renamed** | use new "$defs" core keyword
+[`"unevaluatedProperties" and "unevaluatedItems"`](json-schema-core.html#rfc.section.TODO) | **added** |
+[`"$ref"`](json-schema-core.html#rfc.section.TODO) | **changed** | can now have siblings (keywords next to it)
+[`"$defs"`](json-schema-core.html#rfc.section.10.TODO) | **added** | moved over to core from validation
+`"dependencies"` | **removed** | use "dependentRequired" or "dependentSchemas"
+[`"dependentRequired"`](json-schema-core.html#rfc.section.10.TODO) | **added** | added to core schema
+[`"dependentSchemas"`](json-schema-core.html#rfc.section.10.TODO) | **added** | added to core schema
+[`"minContains" and "maxContains"`](json-schema-validation.html#rfc.section.TODO) | added |
+[`"contentSchema"`](json-schema-validation.html#rfc.section.TODO) | added | allows applying a schema to a string-encoded document
+[`"deprecated"`](json-schema-validation.html#rfc.section.TODO) | added |
+[`"rel"`](json-schema-hyperschema.html#rfc.section.TODO) | **changed** | Can now be an array of values instead of just a string
+
+### Formats
+
+Two formats were added.
+
+format | change | notes
+---- | ---- | ----
+[`"uuid"`](json-schema-validation.html#rfc.section.7.3.5) | added | A string instance is valid against this attribute if it is a valid string representation of a UUID, according to RFC4122
+[`"duration"`](json-schema-validation.html#rfc.section.7.3.5) | added | The duration format is from the ISO 8601 ABNF as given in Appendix A of RFC 3339

work-in-progress/index.md

@@ -7,20 +7,21 @@ permalink: /work-in-progress
 * TOC
 {:toc}
 
-## The Next Draft (by whatever name) Is Ready for Final Pre-Publication Review!
+## The Next Draft is Ready for Final Pre-Publication Review!
 
 The forthcoming draft is now feature-frozen and has gone through the initial four-week pre-publication review period.
 
 _**UPDATE: July 28th, 2019** We continue to incorporate feedback and clarify sections of the new draft.  We expect to finally publish the draft during August._
 
+To see what changes are involved, read the [release notes](./WIP-json-schema-release-notes.md).
+
 The following sorts of feedback are particularly desired:
 
 * Clarity, readability, and accessibility to new readers
 * Contradictions, inconsistencies and other bugs
 * Anything so egregious that implementation would be infeasible or impossible
 
-New features or major changes to existing features will be deferred to a future draft,
-and work on the next draft will begin immediately after this one is published.
+Work on the next draft will begin immediately after this one is published.
 
 ## What Is This Draft Called, Anyway?
 
@@ -88,9 +89,9 @@ _**NOTE:** when published, the `.json` will be removed from the final URI_
 * [WIP: meta/meta-data.json](/work-in-progress/meta/WIP-meta-data.json) (meta-data annotations, from the validation spec)
 * [WIP: meta/format.json](/work-in-progress/meta/WIP-format.json) (the format keyword, from the validation spec)
 * [WIP: meta/content.json](/work-in-progress/meta/WIP-content.json) (content keywords, from the validation spec)
-* [WIP: meta/hyper-schema.json](/work-in-progress/meta/WIP-hyper-schema.json) (hyper-schema keywords, from the hyper-shema spec)
+* [WIP: meta/hyper-schema.json](/work-in-progress/meta/WIP-hyper-schema.json) (hyper-schema keywords, from the hyper-schema spec)
 
-### Output schema:
+### Output Schema
 
 The new draft also introduces recommended output formats for reporting errors and annotations.
 
@@ -100,12 +101,12 @@ _**NOTE:** when published, the `.json` will be removed from the final URI_
 * [WIP: verbose-example.json](/work-in-progress/output/WIP-verbose-example.json) (example of the most verbose output format)
 * [WIP: hyper-schema.json](/work-in-progress/output/WIP-hyper-schema.json) (format used by the proposed hyper-schema test suite, and used in examples in the specification)
 
-## Providing Feedback and Tracking Progress in GitHub
+## Get Involved
 
 We are **particularly interested** in feedback on whether the wording and concepts is an
 improvement in terms of how easy it is to understand and learn the specifications.
 
-Note that _all drafts have Changelog appendicies_, for a concise list of notable changes.
+Note that _all drafts have Changelog appendices_, for a concise list of notable changes.
 
 * The active sources are on the
 ["master" branch of json-schema-org/json-schema-spec](https://github.com/json-schema-org/json-schema-spec)
@@ -117,4 +118,3 @@ Note that _all drafts have Changelog appendicies_, for a concise list of notable
 * [file an issue](https://github.com/json-schema-org/json-schema-spec/issues/new?milestone=draft-08)
   or [join us on Slack](https://join.slack.com/t/json-schema/shared_invite/enQtMjk1NDcyNDI2NTAwLTcyYmYwMjdmMmUxNzZjYzIxNGU2YjdkNzdlOGZiNjIwNDI2M2Y3NmRkYjA4YmMwODMwYjgyOTFlNWZjZjAyNjg) to submit feedback
   _(technically there is also a [mailing list](https://groups.google.com/forum/#!forum/json-schema) but it gets very little traffic and is not closely monitored)_
-