Prevent seednode to use older guava version

bisq-network · May 19, 2019 · 9e42c5e · 9e42c5e
1 parent 4a267ab
commit 9e42c5e
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -42,6 +42,7 @@ configure(subprojects) {
         slf4jVersion = '1.7.25'
         sparkVersion = '2.5.2'
         springVersion = '4.3.6.RELEASE'
+        guavaVersion = '27.0.1-jre'
 
         os = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os
     }
@@ -139,7 +140,7 @@ configure(project(':assets')) {
             exclude(module: 'protobuf-java')
             exclude(module: 'bcprov-jdk15on')
         }
-        compile 'com.google.guava:guava:27.0.1-jre'
+        compile "com.google.guava:guava:$guavaVersion"
         compile "org.slf4j:slf4j-api:$slf4jVersion"
         compile "commons-codec:commons-codec:$codecVersion"
         compile "org.apache.commons:commons-lang3:$langVersion"
@@ -172,7 +173,7 @@ configure(project(':common')) {
         compile "ch.qos.logback:logback-core:$logbackVersion"
         compile "ch.qos.logback:logback-classic:$logbackVersion"
         compile 'com.google.code.findbugs:jsr305:3.0.2'
-        compile 'com.google.guava:guava:27.0.1-jre'
+        compile "com.google.guava:guava:$guavaVersion"
         compile('com.google.inject:guice:4.1.0') {
             exclude(module: 'guava')
         }
@@ -221,7 +222,9 @@ configure(project(':core')) {
         compile project(':assets')
         compile project(':p2p')
         compile "net.sf.jopt-simple:jopt-simple:$joptVersion"
+        compile "com.google.guava:guava:$guavaVersion"
         compile('network.bisq.btcd-cli4j:btcd-cli4j-core:065d3786') {
+            exclude(module: 'guava')
             exclude(module: 'slf4j-api')
             exclude(module: 'httpclient')
             exclude(module: 'commons-lang3')
@@ -230,6 +233,7 @@ configure(project(':core')) {
             exclude(module: 'jackson-databind')
         }
         compile('network.bisq.btcd-cli4j:btcd-cli4j-daemon:065d3786') {
+            exclude(module: 'guava')
             exclude(module: 'slf4j-api')
             exclude(module: 'httpclient')
             exclude(module: 'commons-lang3')
@@ -340,7 +344,7 @@ configure(project(':monitor')) {
         compile "org.slf4j:slf4j-api:$slf4jVersion"
         compile "ch.qos.logback:logback-core:$logbackVersion"
         compile "ch.qos.logback:logback-classic:$logbackVersion"
-        compile 'com.google.guava:guava:27.0.1-jre'
+        compile "com.google.guava:guava:$guavaVersion"
 
         compileOnly "org.projectlombok:lombok:$lombokVersion"
         annotationProcessor "org.projectlombok:lombok:$lombokVersion"