From 26ed41578bde04b611c9097e9ef9414953817dab Mon Sep 17 00:00:00 2001 From: Lucas Kjaero-Zhang Date: Fri, 14 Jan 2022 00:48:30 +0000 Subject: [PATCH 1/2] Update elasticsearch-rest-high-level-client to 7.16.3 --- local_setup.yml | 2 +- project/Dependencies.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/local_setup.yml b/local_setup.yml index 5d0e4f0d..e24d09f9 100644 --- a/local_setup.yml +++ b/local_setup.yml @@ -22,7 +22,7 @@ services: ports: - 33061:3306 elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.14.2 + image: docker.elastic.co/elasticsearch/elasticsearch:7.16.3 environment: - "discovery.type=single-node" ports: diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 89d169d4..d6e46c60 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ import sbt._ */ object Dependencies { - val elasticsearchVersion = "7.14.2" + val elasticsearchVersion = "7.16.3" val hadoopVersion = "3.3.1" val jacksonVersion = "2.11.3" val log4jVersion = "2.17.1" From bdf024da9384bd57c668930d6406f5c44da50c39 Mon Sep 17 00:00:00 2001 From: Lucas Kjaero Date: Sat, 22 Jan 2022 19:53:23 +0100 Subject: [PATCH 2/2] That was simple --- .../elasticsearch/searchstates/ElasticsearchSearchResult.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain/src/main/scala/io/fluentlabs/domain/client/elasticsearch/searchstates/ElasticsearchSearchResult.scala b/domain/src/main/scala/io/fluentlabs/domain/client/elasticsearch/searchstates/ElasticsearchSearchResult.scala index 66022980..910c64f5 100644 --- a/domain/src/main/scala/io/fluentlabs/domain/client/elasticsearch/searchstates/ElasticsearchSearchResult.scala +++ b/domain/src/main/scala/io/fluentlabs/domain/client/elasticsearch/searchstates/ElasticsearchSearchResult.scala @@ -5,7 +5,7 @@ import io.fluentlabs.content.types.internal.ElasticsearchCacheable import io.fluentlabs.domain.client.elasticsearch.LookupAttempt import org.elasticsearch.action.index.IndexRequest import org.elasticsearch.action.update.UpdateRequest -import org.elasticsearch.common.xcontent.XContentType +import org.elasticsearch.xcontent.XContentType import play.api.libs.json.{Json, Writes} /** Holds the final result from an elasticsearch lookup, Decides whether we need