From 88169042e84d642355d1b212b638b122ff7570b9 Mon Sep 17 00:00:00 2001
From: Alejandro Revilla <apr@jpos.org>
Date: Tue, 12 Mar 2019 21:07:51 -0300
Subject: [PATCH] bump up Guava version

while we wait on https://github.com/java-json-tools/jackson-coreutils/pull/3
---
 libraries.gradle                | 11 +++++++++--
 modules/eerest/build.gradle     |  3 +--
 modules/eeresttest/build.gradle |  3 ++-
 modules/qrest/build.gradle      |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/libraries.gradle b/libraries.gradle
index 8c87c0c261..1a57c33e4d 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -10,6 +10,7 @@ ext {
     jgroupsVersion = '4.0.16.Final'
     jaxrsVersion = '2.0.1'
     jsonSchemaVersion = '2.2.10'
+    guavaVersion = '27.1-jre'
     jacksonVersion = '2.9.8'
     groovyVersion = '2.4.12'
     restAssuredVersion = '2.9.0'
@@ -108,11 +109,17 @@ ext {
             // RestAssured
             restAssured: "com.jayway.restassured:rest-assured:2.9.0",
 
-            jsonSchemaValidator: "com.github.fge:json-schema-validator:${jsonSchemaVersion}",
-
+            jsonSchemaValidator: "com.github.java-json-tools:json-schema-validator:${jsonSchemaVersion}",
+            guava: "com.google.guava:guava:${guavaVersion}",
             httpAsyncClient: "org.apache.httpcomponents:httpasyncclient:${httpAsyncClientVersion}"
     ]
 
+
+    jsonSchemaValidatorLibs = [
+        libraries.jsonSchemaValidator,
+        libraries.guava
+    ]
+
     jettyLibs = [
             libraries.jetty_server,
             libraries.jetty_xml,
diff --git a/modules/eerest/build.gradle b/modules/eerest/build.gradle
index b4d5bd5599..799e5c0625 100644
--- a/modules/eerest/build.gradle
+++ b/modules/eerest/build.gradle
@@ -4,8 +4,7 @@ dependencies {
     compile project(':modules:core')
     compile project(':modules:txn')
     compile "javax.ws.rs:javax.ws.rs-api:${jaxrsVersion}"
-    compile libraries.jsonSchemaValidator
-    compile 'com.google.guava:guava:27.1-jre' // force newer Guava
+    compile jsonSchemaValidatorLibs
     compile libraries.commons_lang
 }
 
diff --git a/modules/eeresttest/build.gradle b/modules/eeresttest/build.gradle
index 6e7863a5e9..2b8c89d236 100644
--- a/modules/eeresttest/build.gradle
+++ b/modules/eeresttest/build.gradle
@@ -6,7 +6,8 @@ dependencies {
     providedCompile project(':modules:eerest')
     providedCompile project(':modules:jetty')
     providedCompile "javax.ws.rs:javax.ws.rs-api:${jaxrsVersion}"
-    providedCompile "com.github.fge:json-schema-validator:${jsonSchemaVersion}"
+    providedCompile jsonSchemaValidatorLibs
+    providedCompile 'com.google.guava:guava:27.1-jre' // force newer Guava
     providedCompile "org.glassfish.jersey.media:jersey-media-json-jackson:2.22.1"
     providedCompile "org.glassfish.jersey.core:jersey-server:2.22.1"
     compile libraries.commons_lang
diff --git a/modules/qrest/build.gradle b/modules/qrest/build.gradle
index 5e7736041c..9c0409ca69 100644
--- a/modules/qrest/build.gradle
+++ b/modules/qrest/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     compile libraries.jacksonDatabind
     compile libraries.nettyHandler
     compile libraries.nettyCodecHttp
-    compile libraries.jsonSchemaValidator
+    compile jsonSchemaValidatorLibs
     testCompile libraries.junit
     testCompile libraries.restAssured
 }