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

allow set processors in transport client setup, update to netty 4.1.69

Browse source
This commit is contained in:
Jörg Prante 2021-10-26 16:46:14 +02:00
parent 1f436a5bbf
commit 0b8d92af9b
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
elx-api/build.gradle
View file

@ -1,9 +1,7 @@
dependencies { dependencies {
api "org.xbib:metrics-common:${project.property('xbib-metrics.version')}" api "org.xbib:metrics-common:${project.property('xbib-metrics.version')}"
api "org.elasticsearch:elasticsearch:${project.property('elasticsearch.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.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')}" api "org.apache.logging.log4j:log4j-api:${project.property('log4j.version')}"
} }

5
elx-transport/src/main/java/org/xbib/elx/transport/TransportClientHelper.java
View file

@ -36,6 +36,11 @@ import java.util.Map;
*/ */
public class TransportClientHelper { 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 Logger logger = LogManager.getLogger(TransportClientHelper.class.getName());
private static final Map<String, ElasticsearchClient> transportClientMap = new HashMap<>(); private static final Map<String, ElasticsearchClient> transportClientMap = new HashMap<>();

8
gradle.properties
View file

@ -1,15 +1,15 @@
group = org.xbib group = org.xbib
name = elx name = elx
version = 7.10.2.16 version = 7.10.2.17
gradle.wrapper.version = 6.6.1 gradle.wrapper.version = 6.6.1
xbib-metrics.version = 2.2.0 xbib-metrics.version = 2.2.0
xbib-time.version = 2.1.0 xbib-time.version = 2.1.0
elasticsearch.version = 7.10.2 elasticsearch.version = 7.10.2
# ES 7.10.2 uses Jackson 2.10.4 # ES 7.10.2 uses Jackson 2.10.4
jackson.version = 2.12.3 jackson.version = 2.12.5
# ES 7.10.2. uses Netty 4.1.49 # ES 7.10.2 uses Netty 4.1.49
xbib-netty-http.version = 4.1.66.0 xbib-netty-http.version = 4.1.69.0
# ES 7.10.2 uses log4j2 2.11.1 # ES 7.10.2 uses log4j2 2.11.1
log4j.version = 2.14.1 log4j.version = 2.14.1
junit.version = 5.7.1 junit.version = 5.7.1