Updated libraries.
Change-Id: I35d41bfcc6661177beb3a9a98ad9ddb43f57837c
diff --git a/core/pom.xml b/core/pom.xml
index 30e7d79..6233fab 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -3,17 +3,17 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.ids_mannheim.korap</groupId>
<artifactId>Kustvakt-core</artifactId>
- <version>0.63</version>
+ <version>0.63.1</version>
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring.version>5.3.0</spring.version>
+ <spring.version>5.3.4</spring.version>
<jersey.version>1.19.4</jersey.version>
- <jetty.version>9.4.34.v20201102</jetty.version>
- <hibernate.version>5.4.25.Final</hibernate.version>
+ <jetty.version>9.4.36.v20210114</jetty.version>
+ <hibernate.version>5.4.28.Final</hibernate.version>
<flyway.version>7.4.0</flyway.version>
- <log4j.version>2.13.3</log4j.version>
+ <log4j.version>2.14.0</log4j.version>
<krill.version>[0.59.3,)</krill.version>
<koral.version>[0.37,)</koral.version>
</properties>
@@ -241,7 +241,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.16</version>
+ <version>1.18.18</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
diff --git a/core/src/main/java/de/ids_mannheim/korap/service/SearchService.java b/core/src/main/java/de/ids_mannheim/korap/service/SearchService.java
index 43114cb..ea09a02 100644
--- a/core/src/main/java/de/ids_mannheim/korap/service/SearchService.java
+++ b/core/src/main/java/de/ids_mannheim/korap/service/SearchService.java
@@ -70,6 +70,11 @@
this.graphDBhandler = new ClientsHandler(builder.build());
}
+ public String getKrillVersion () {
+ return searchKrill.getIndex().getVersion();
+
+ }
+
@SuppressWarnings("unchecked")
public String serializeQuery (String q, String ql, String v, String cq,
Integer pageIndex, Integer startPage, Integer pageLength,
diff --git a/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java b/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java
index 2760810..1e75b0e 100644
--- a/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java
+++ b/core/src/main/java/de/ids_mannheim/korap/web/controller/SearchController.java
@@ -89,7 +89,7 @@
m.put("latest_api_version", config.getCurrentVersion());
m.put("supported_api_versions", config.getSupportedVersions());
m.put("kustvakt_version", ServiceInfo.getInfo().getVersion());
- m.put("krill_version", ServiceInfo.getInfo().getKrillVersion());
+ m.put("krill_version", searchService.getKrillVersion());
m.put("koral_version", ServiceInfo.getInfo().getKoralVersion());
try {
return Response.ok(JsonUtils.toJSON(m)).build();