From 9e42c5e2c4af5aeee9fed51d55044b00757ef39d Mon Sep 17 00:00:00 2001 From: Oscar Guindzberg Date: Sun, 19 May 2019 20:57:56 -0300 Subject: [PATCH] Prevent seednode to use older guava version --- build.gradle | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index ca6ce42d982..eb7b7b55da7 100644 --- 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"