From 6d298e38a69dbddd068d09356c83cc695dd56c0a Mon Sep 17 00:00:00 2001
From: Ananth <ananthg.apex@gmail.com>
Date: Fri, 3 Nov 2017 21:38:39 +1100
Subject: [PATCH] APEXMALHAR-2461.Fix-dependencies-with-license-in-category-x

---
 contrib/pom.xml                                           | 2 +-
 .../java/com/datatorrent/contrib/parser/JsonParser.java   | 8 ++++----
 examples/csvformatter/pom.xml                             | 2 +-
 examples/enricher/pom.xml                                 | 2 +-
 examples/parser/pom.xml                                   | 2 +-
 examples/twitter/pom.xml                                  | 1 +
 sql/pom.xml                                               | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/contrib/pom.xml b/contrib/pom.xml
index 1434c49f26..8ddacd30f0 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -642,7 +642,7 @@
     <dependency>
       <groupId>com.github.fge</groupId>
       <artifactId>json-schema-validator</artifactId>
-      <version>2.0.1</version>
+      <version>2.2.6</version>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/contrib/src/main/java/com/datatorrent/contrib/parser/JsonParser.java b/contrib/src/main/java/com/datatorrent/contrib/parser/JsonParser.java
index bb95f9c261..1b81e6f1c1 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/parser/JsonParser.java
+++ b/contrib/src/main/java/com/datatorrent/contrib/parser/JsonParser.java
@@ -31,12 +31,12 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.fge.jsonschema.exceptions.ProcessingException;
+import com.github.fge.jackson.JsonLoader;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingMessage;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
 import com.github.fge.jsonschema.main.JsonSchema;
 import com.github.fge.jsonschema.main.JsonSchemaFactory;
-import com.github.fge.jsonschema.report.ProcessingMessage;
-import com.github.fge.jsonschema.report.ProcessingReport;
-import com.github.fge.jsonschema.util.JsonLoader;
 import com.google.common.annotations.VisibleForTesting;
 
 import com.datatorrent.api.AutoMetric;
diff --git a/examples/csvformatter/pom.xml b/examples/csvformatter/pom.xml
index ddddab0635..1dea403a2e 100644
--- a/examples/csvformatter/pom.xml
+++ b/examples/csvformatter/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.github.fge</groupId>
             <artifactId>json-schema-validator</artifactId>
-            <version>2.0.1</version>
+            <version>2.2.6</version>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/examples/enricher/pom.xml b/examples/enricher/pom.xml
index e4845c01f8..c18fd38c28 100644
--- a/examples/enricher/pom.xml
+++ b/examples/enricher/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.github.fge</groupId>
       <artifactId>json-schema-validator</artifactId>
-      <version>2.0.1</version>
+      <version>2.2.6</version>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/examples/parser/pom.xml b/examples/parser/pom.xml
index aa41cfaad6..405af222f0 100644
--- a/examples/parser/pom.xml
+++ b/examples/parser/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>com.github.fge</groupId>
       <artifactId>json-schema-validator</artifactId>
-      <version>2.0.1</version>
+      <version>2.2.6</version>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml
index e17db401a3..2781b836cc 100644
--- a/examples/twitter/pom.xml
+++ b/examples/twitter/pom.xml
@@ -70,6 +70,7 @@
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
       <version>5.1.22</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.apex</groupId>
diff --git a/sql/pom.xml b/sql/pom.xml
index c0be2585d6..1f6c856079 100644
--- a/sql/pom.xml
+++ b/sql/pom.xml
@@ -147,7 +147,7 @@
     <dependency>
       <groupId>com.github.fge</groupId>
       <artifactId>json-schema-validator</artifactId>
-      <version>2.0.1</version>
+      <version>2.2.6</version>
     </dependency>
 
     <!-- Kafka Dependency -->