[geode] branch develop updated: GEODE-5761: Exclude android-json transitive dependency (#2494)

[kl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 1998a21  GEODE-5761: Exclude android-json transitive dependency (#2494)
1998a21 is described below

commit 1998a219e8c1114aaa327e4585cb049b37b44700
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Fri Sep 21 10:37:13 2018 -0700

    GEODE-5761: Exclude android-json transitive dependency (#2494)
    
    org.skyscreamer:jsonassert which brings in a transitive dependency
    on com.vaadin.external.google:android-json which is incompatible
    with geode-json.
---
 geode-junit/build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
index dd04842..bbb289e 100755
--- a/geode-junit/build.gradle
+++ b/geode-junit/build.gradle
@@ -34,7 +34,9 @@ dependencies {
     exclude module: 'hamcrest-core'
   }
   compile 'org.hamcrest:hamcrest-all:' + project.'hamcrest-all.version'
-  compile 'org.skyscreamer:jsonassert:' + project.'jsonassert.version'
+  compile ('org.skyscreamer:jsonassert:' + project.'jsonassert.version') {
+    exclude module: 'android-json'
+  }
 
   compile 'org.bouncycastle:bcpkix-jdk15on:' + project.'bounty-castle.version'