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

update dependencies to current versions

Browse source
This commit is contained in:
Jörg Prante 2019-08-08 22:21:08 +02:00
parent d71c164174
commit bd59fdffbd
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build.gradle
View file

@ -32,13 +32,13 @@ subprojects {
} }
compileJava { compileJava {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_11
} }
compileTestJava { compileTestJava {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_11
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {

2
elx-api/build.gradle
View file

@ -17,4 +17,6 @@ dependencies {
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${project.property('jackson.version')}" compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${project.property('jackson.version')}"
// not used, but maybe in other projects // not used, but maybe in other projects
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${project.property('jackson.version')}" compile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${project.property('jackson.version')}"
// lift guava
compile "com.google.guava:guava:${project.property('guava.version')}"
} }

2
elx-common/src/main/java/org/xbib/elx/common/AbstractExtendedClient.java
View file

@ -547,10 +547,10 @@ public abstract class AbstractExtendedClient implements ExtendedClient {
@Override @Override
public String resolveMostRecentIndex(String alias) { public String resolveMostRecentIndex(String alias) {
ensureActive();
if (alias == null) { if (alias == null) {
return null; return null;
} }
ensureActive();
GetAliasesRequest getAliasesRequest = new GetAliasesRequest().aliases(alias); GetAliasesRequest getAliasesRequest = new GetAliasesRequest().aliases(alias);
GetAliasesResponse getAliasesResponse = client.execute(GetAliasesAction.INSTANCE, getAliasesRequest).actionGet(); GetAliasesResponse getAliasesResponse = client.execute(GetAliasesAction.INSTANCE, getAliasesRequest).actionGet();
Pattern pattern = Pattern.compile("^(.*?)(\\d+)$"); Pattern pattern = Pattern.compile("^(.*?)(\\d+)$");

14
gradle.properties
View file

@ -1,20 +1,22 @@
group = org.xbib group = org.xbib
name = elx name = elx
version = 2.2.1.10 version = 2.2.1.11
# main
xbib-metrics.version = 1.2.0 xbib-metrics.version = 1.2.0
xbib-guice.version = 4.0.4 xbib-guice.version = 4.0.4
xbib-netty-http.version = 4.1.36.7 guava.version = 28.0-jre
xbib-netty-http.version = 4.1.38.3
elasticsearch.version = 2.2.1 elasticsearch.version = 2.2.1
jackson.version = 2.6.7 #jackson.version = 2.6.7
jackson.version = 2.9.9
jna.version = 4.5.2 jna.version = 4.5.2
log4j.version = 2.11.1 log4j.version = 2.12.0
mustache.version = 0.9.5 mustache.version = 0.9.5
jts.version = 1.13 jts.version = 1.13
# test # test
junit.version = 5.4.2 junit.version = 5.5.1
# docs # docs
asciidoclet.version = 1.5.4 asciidoclet.version = 1.5.4