From 377040cf93c66ebb584aa3bf74135d93b3ce6f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Thu, 4 Jun 2020 20:22:51 +0200 Subject: [PATCH] update jackson to 2.11.0, log4j to 2.13.3 --- elx-api/build.gradle | 7 ++++++- gradle.properties | 10 ++++++---- gradle/compile/java.gradle | 11 ++++++++++- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/elx-api/build.gradle b/elx-api/build.gradle index 83a9f1b..680326e 100644 --- a/elx-api/build.gradle +++ b/elx-api/build.gradle @@ -1,4 +1,9 @@ dependencies { api "org.xbib:metrics-common:${project.property('xbib-metrics.version')}" - api "org.elasticsearch:elasticsearch:${rootProject.property('elasticsearch.version')}" + api "org.elasticsearch:elasticsearch:${project.property('elasticsearch.version')}" + api "com.fasterxml.jackson.core:jackson-core:${project.property('jackson.version')}" + api "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${project.property('jackson.version')}" + api "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${project.property('jackson.version')}" + api "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${project.property('jackson.version')}" + api "org.apache.logging.log4j:log4j-api:${project.property('log4j.version')}" } diff --git a/gradle.properties b/gradle.properties index b91c9ee..477eeda 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,15 @@ group = org.xbib name = elx -version = 7.6.1.1 +version = 7.6.1.2 gradle.wrapper.version = 6.4.1 -elasticsearch.version = 7.6.1 -netty.version = 4.1.49.Final +xbib-metrics.version = 2.1.0 xbib-netty-http.version = 4.1.49.1 +elasticsearch.version = 7.6.1 +# ES 7.6.1 uses Jackson 2.8.11 +jackson.version = 2.11.0 +netty.version = 4.1.49.Final tcnative.version = 2.0.29.Final tcnative-legacy-macosx.version = 2.0.26.Final bouncycastle.version = 1.64 -xbib-metrics.version = 2.1.0 log4j.version = 2.13.1 diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index a9d76ce..0944b0b 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -32,4 +32,13 @@ task javadocJar(type: Jar, dependsOn: javadoc) { artifacts { archives sourcesJar, javadocJar -} \ No newline at end of file +} + +tasks.withType(JavaCompile) { + // TransportClient is deprecated + options.compilerArgs << '-Xlint:all,-deprecation' +} + +javadoc { + options.addStringOption('Xdoclint:none', '-quiet') +}