From b22d35cf9c07abaf6e0c525bab9b5d858c2d9c8d Mon Sep 17 00:00:00 2001
From: Oleksandr Porunov <alexandr.porunov@gmail.com>
Date: Thu, 19 Oct 2023 20:19:34 +0100
Subject: [PATCH] Update ElasticSearch to 8.10.4

Signed-off-by: Oleksandr Porunov <alexandr.porunov@gmail.com>
---
 docs/changelog.md                                              | 2 +-
 .../org/janusgraph/diskstorage/es/ElasticsearchIndexTest.java  | 2 ++
 .../diskstorage/es/JanusGraphElasticsearchContainer.java       | 2 +-
 pom.xml                                                        | 3 +--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.md b/docs/changelog.md
index 5ab4f95191..d8c1e71678 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -69,7 +69,7 @@ compile "org.janusgraph:janusgraph-core:1.0.0"
 * Apache HBase 2.5.0
 * Oracle BerkeleyJE 7.5.11
 * ScyllaDB 5.1.4
-* Elasticsearch 6.0.1, 6.6.0, 7.17.8, 8.6.0
+* Elasticsearch 6.0.1, 6.6.0, 7.17.8, 8.10.4
 * Apache Lucene 8.11.1
 * Apache Solr 8.11.1
 * Apache TinkerPop 3.7.0
diff --git a/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/ElasticsearchIndexTest.java b/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/ElasticsearchIndexTest.java
index c16f9226a4..905b3814ad 100644
--- a/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/ElasticsearchIndexTest.java
+++ b/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/ElasticsearchIndexTest.java
@@ -230,6 +230,8 @@ public void testErrorInBatch() throws Exception {
 
         switch (JanusGraphElasticsearchContainer.getEsMajorVersion().value){
             case 8:
+                assertTrue(message.contains("document_parsing_exception"));
+                break;
             case 7:
             case 6:
                 assertTrue(message.contains("mapper_parsing_exception"));
diff --git a/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/JanusGraphElasticsearchContainer.java b/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/JanusGraphElasticsearchContainer.java
index d7276c056a..e514dc6e41 100644
--- a/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/JanusGraphElasticsearchContainer.java
+++ b/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/JanusGraphElasticsearchContainer.java
@@ -37,7 +37,7 @@
 public class JanusGraphElasticsearchContainer extends ElasticsearchContainer {
 
     private static final Integer ELASTIC_PORT = 9200;
-    private static final String DEFAULT_VERSION = "8.6.0";
+    private static final String DEFAULT_VERSION = "8.10.4";
     private static final String DEFAULT_IMAGE = "docker.elastic.co/elasticsearch/elasticsearch";
 
     public static ElasticMajorVersion getEsMajorVersion() {
diff --git a/pom.xml b/pom.xml
index d032d2e1a2..a956a634f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,8 +74,7 @@
         <!-- align with org.apache.spark:spark-core_2.12 -->
         <jackson2.version>2.15.3</jackson2.version>
         <lucene-solr.version>8.11.2</lucene-solr.version>
-        <!-- When this version updated please also update sha512 -->
-        <elasticsearch.version>8.6.0</elasticsearch.version>
+        <elasticsearch.version>8.10.4</elasticsearch.version>
         <commons.beanutils.version>1.9.4</commons.beanutils.version>
         <commons.collections.version>3.2.2</commons.collections.version>
         <zookeeper.version>3.8.1</zookeeper.version>