joerg/elx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change to our guava/guice

Browse source
This commit is contained in:
Jörg Prante 2020-01-19 22:20:00 +01:00
parent 8d6cb72777
commit 2c6617473d
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
elx-api/build.gradle
View file

@ -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')}"
}

12
gradle.properties
View file

@ -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