diff --git a/elx-api/build.gradle b/elx-api/build.gradle index 47e0f09..41bb17d 100644 --- a/elx-api/build.gradle +++ b/elx-api/build.gradle @@ -7,6 +7,8 @@ dependencies { exclude module: 'securesm' // we use log4j2, not log4j exclude group: 'log4j' + // we use our own guava + exclude group: 'com.google.guava' } // override log4j2 of Elastic with ours compile "org.apache.logging.log4j:log4j-core:${project.property('log4j.version')}" @@ -18,5 +20,5 @@ dependencies { // not used, but maybe in other projects compile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${project.property('jackson.version')}" // lift guava - compile "com.google.guava:guava:${project.property('guava.version')}" + compile "org.xbib:guava:${project.property('xbib-guava.version')}" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 9bb1cbb..67e94f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,16 @@ group = org.xbib name = elx -version = 2.2.1.13 +version = 2.2.1.14 # main xbib-metrics.version = 2.0.0 -xbib-guice.version = 4.0.4 -xbib-netty-http.version = 4.1.43.1 +# guice 4 - > our guice 4.4.2 +xbib-guice.version = 4.4.2 +# guava 18 -> our guava 28.1 +xbib-guava.version = 28.1 +xbib-netty-http.version = 4.1.45.0 elasticsearch.version = 2.2.1 -guava.version = 28.0-jre -#jackson.version = 2.6.7 (original ES version) +#jackson 2.6.7 (original ES version) -> 2.9.10 jackson.version = 2.9.10 jna.version = 4.5.2 log4j.version = 2.12.1