From cd8fabe4999ba2cc1873c982aafaa76e79a54971 Mon Sep 17 00:00:00 2001
From: Peter-Josef Meisch <pj.meisch@sothawo.com>
Date: Tue, 1 Nov 2022 20:29:29 +0100
Subject: [PATCH] Upgrade to Elasticsearch 7.17.7.

Original Pull Request #2347
Closes #2346
---
 pom.xml                                                     | 4 ++--
 src/main/asciidoc/preface.adoc                              | 2 +-
 .../reference/elasticsearch-migration-guide-4.3-4.4.adoc    | 4 ++--
 .../core/ReactiveElasticsearchELCIntegrationTests.java      | 6 +++---
 src/test/resources/testcontainers-elasticsearch.properties  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index da05d7860..af09385a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,9 +19,9 @@
 
 	<properties>
 		<!-- version of the RestHighLevelClient	-->
-		<elasticsearch-rhlc>7.17.6</elasticsearch-rhlc>
+		<elasticsearch-rhlc>7.17.7</elasticsearch-rhlc>
 		<!-- version of the new ElasticsearchClient	-->
-		<elasticsearch-java>7.17.6</elasticsearch-java>
+		<elasticsearch-java>7.17.7</elasticsearch-java>
 		<log4j>2.17.1</log4j>
 		<netty>4.1.65.Final</netty>
 		<springdata.commons>2.7.6-SNAPSHOT</springdata.commons>
diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc
index 2986759a3..83135eee5 100644
--- a/src/main/asciidoc/preface.adoc
+++ b/src/main/asciidoc/preface.adoc
@@ -37,7 +37,7 @@ built and tested.
 [cols="^,^,^,^,^",options="header"]
 |===
 | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot
-| 2021.2 (Raj) | 4.4.x | 7.17.6 | 5.3.x | 2.7.x
+| 2021.2 (Raj) | 4.4.x | 7.17.7 | 5.3.x | 2.7.x
 | 2021.1 (Q) | 4.3.x | 7.15.2 | 5.3.x | 2.6.x
 | 2021.0 (Pascal) | 4.2.xfootnote:oom[Out of maintenance] | 7.12.0 | 5.3.x | 2.5.x
 | 2020.0 (Ockham)footnote:oom[] | 4.1.xfootnote:oom[] | 7.9.3 | 5.3.2 | 2.4.x
diff --git a/src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc b/src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc
index a9812fc89..a477c4d77 100644
--- a/src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc
+++ b/src/main/asciidoc/reference/elasticsearch-migration-guide-4.3-4.4.adoc
@@ -82,7 +82,7 @@ The dependencies for the new Elasticsearch client are still optional in Spring D
     <dependency>
         <groupId>co.elastic.clients</groupId>
         <artifactId>elasticsearch-java</artifactId>
-        <version>7.17.6</version>
+        <version>7.17.7</version>
         <exclusions>
             <exclusion>
                 <groupId>commons-logging</groupId>
@@ -93,7 +93,7 @@ The dependencies for the new Elasticsearch client are still optional in Spring D
     <dependency>
         <groupId>org.elasticsearch.client</groupId>
         <artifactId>elasticsearch-rest-client</artifactId> <!-- is Apache 2-->
-        <version>7.17.6</version>
+        <version>7.17.7</version>
         <exclusions>
             <exclusion>
                 <groupId>commons-logging</groupId>
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchELCIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchELCIntegrationTests.java
index 80ed21033..b665d4736 100644
--- a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchELCIntegrationTests.java
+++ b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchELCIntegrationTests.java
@@ -103,15 +103,15 @@ public class ReactiveElasticsearchELCIntegrationTests extends ReactiveElasticsea
 		assertThat(bucketList.size()).isEqualTo(3);
 		AtomicInteger count = new AtomicInteger();
 		bucketList.forEach(stringTermsBucket -> {
-			if ("message".equals(stringTermsBucket.key())) {
+			if ("message".equals(stringTermsBucket.key().stringValue())) {
 				count.getAndIncrement();
 				assertThat(stringTermsBucket.docCount()).isEqualTo(3);
 			}
-			if ("some".equals(stringTermsBucket.key())) {
+			if ("some".equals(stringTermsBucket.key().stringValue())) {
 				count.getAndIncrement();
 				assertThat(stringTermsBucket.docCount()).isEqualTo(2);
 			}
-			if ("other".equals(stringTermsBucket.key())) {
+			if ("other".equals(stringTermsBucket.key().stringValue())) {
 				count.getAndIncrement();
 				assertThat(stringTermsBucket.docCount()).isEqualTo(1);
 			}
diff --git a/src/test/resources/testcontainers-elasticsearch.properties b/src/test/resources/testcontainers-elasticsearch.properties
index 1847cc1d5..74c919c7c 100644
--- a/src/test/resources/testcontainers-elasticsearch.properties
+++ b/src/test/resources/testcontainers-elasticsearch.properties
@@ -15,7 +15,7 @@
 #
 #
 sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch
-sde.testcontainers.image-version=7.17.6
+sde.testcontainers.image-version=7.17.7
 #
 #
 # needed as we do a DELETE /* at the end of the tests, will be required from 8.0 on, produces a warning since 7.13