From 0b8d92af9bc51b698df886d51357aa3f668fc1c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Tue, 26 Oct 2021 16:46:14 +0200 Subject: [PATCH] allow set processors in transport client setup, update to netty 4.1.69 --- elx-api/build.gradle | 4 +--- .../org/xbib/elx/transport/TransportClientHelper.java | 5 +++++ gradle.properties | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/elx-api/build.gradle b/elx-api/build.gradle index 680326e..4b91301 100644 --- a/elx-api/build.gradle +++ b/elx-api/build.gradle @@ -1,9 +1,7 @@ dependencies { api "org.xbib:metrics-common:${project.property('xbib-metrics.version')}" api "org.elasticsearch:elasticsearch:${project.property('elasticsearch.version')}" + // override old artifacts in ES x-content. We must use jackson smile/cbor/yaml and log4j2 api here. 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/elx-transport/src/main/java/org/xbib/elx/transport/TransportClientHelper.java b/elx-transport/src/main/java/org/xbib/elx/transport/TransportClientHelper.java index 7c203f7..1295b9f 100644 --- a/elx-transport/src/main/java/org/xbib/elx/transport/TransportClientHelper.java +++ b/elx-transport/src/main/java/org/xbib/elx/transport/TransportClientHelper.java @@ -36,6 +36,11 @@ import java.util.Map; */ public class TransportClientHelper { + static { + // https://discuss.elastic.co/t/elasticsearch-5-4-1-availableprocessors-is-already-set/88036 + System.setProperty("es.set.netty.runtime.available.processors", "false"); + } + private static final Logger logger = LogManager.getLogger(TransportClientHelper.class.getName()); private static final Map transportClientMap = new HashMap<>(); diff --git a/gradle.properties b/gradle.properties index ba910de..f27d508 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,15 @@ group = org.xbib name = elx -version = 7.10.2.16 +version = 7.10.2.17 gradle.wrapper.version = 6.6.1 xbib-metrics.version = 2.2.0 xbib-time.version = 2.1.0 elasticsearch.version = 7.10.2 # ES 7.10.2 uses Jackson 2.10.4 -jackson.version = 2.12.3 -# ES 7.10.2. uses Netty 4.1.49 -xbib-netty-http.version = 4.1.66.0 +jackson.version = 2.12.5 +# ES 7.10.2 uses Netty 4.1.49 +xbib-netty-http.version = 4.1.69.0 # ES 7.10.2 uses log4j2 2.11.1 log4j.version = 2.14.1 junit.version = 5.7.1