From bbddae6d6318beceaff5a6cd5cabbbd370ad37c6 Mon Sep 17 00:00:00 2001
From: Steve Hu <stevehu@gmail.com>
Date: Wed, 6 Nov 2019 10:12:29 -0500
Subject: [PATCH] upgrade to 1.0.25 and update changelog and document

---
 CHANGELOG.md      |  8 ++++++++
 README.md         |  6 ++++--
 doc/validators.md | 15 +++++++++++++++
 pom.xml           |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 doc/validators.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bab1358d..1621f7b49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## 1.0.25 - 2019-11-06
+
+### Added
+
+### Changed
+
+- fixes #206 IF-THEN-ELSE Conditional (Draft 7). Thanks @andersonf
+
 ## 1.0.24 - 2019-10-28
 
 ### Added
diff --git a/README.md b/README.md
index 98907f8b9..b3b8c10a4 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ Maven:
 <dependency>
     <groupId>com.networknt</groupId>
     <artifactId>json-schema-validator</artifactId>
-    <version>1.0.24</version>
+    <version>1.0.25</version>
 </dependency>
 ```
 
@@ -79,7 +79,7 @@ Gradle:
 
 ```
 dependencies {
-    compile(group: "com.networknt", name: "json-schema-validator", version: "1.0.24");
+    compile(group: "com.networknt", name: "json-schema-validator", version: "1.0.25");
 }
 ```
 
@@ -87,6 +87,8 @@ For the latest version, please check the [release](https://github.com/networknt/
 
 ## [Quick Start](doc/quickstart.md)
 
+## [Validators](doc/validators.md)
+
 ## [Configuration](doc/config.md)
 
 ## Known issues
diff --git a/doc/validators.md b/doc/validators.md
new file mode 100644
index 000000000..0f9b89401
--- /dev/null
+++ b/doc/validators.md
@@ -0,0 +1,15 @@
+This document lists all the validators supported and gives users are guideline on how to use them. 
+
+### if-then-else
+
+* Specification(s): draft7
+* Contributor(s): @andersonf
+* Reference: https://json-schema.org/understanding-json-schema/reference/conditionals.html
+* Issues and PRs: https://github.com/networknt/json-schema-validator/pull/206
+
+The `if`, `then` and `else` keywords allow the application of a subschema based on the outcome of another schema, much like the `if/then/else` constructs you’ve probably seen in traditional programming languages.
+
+If `if` is valid, `then` must also be valid (and `else` is ignored.) If `if` is invalid, `else` must also be valid (and `then` is ignored).
+
+For usage, please refer to the test cases at https://github.com/networknt/json-schema-validator/blob/master/src/test/resources/tests/if.json
+
diff --git a/pom.xml b/pom.xml
index 624e93bf7..9dea203e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.networknt</groupId>
     <artifactId>json-schema-validator</artifactId>
-    <version>1.0.24</version>
+    <version>1.0.25</version>
     <packaging>bundle</packaging>
     <description>A json schema validator that supports draft v4</description>
     <url>https://github.com/networknt/json-schema-validator</url>