From 9337ee32dff047108aba0c9c5ddc758c16a30c55 Mon Sep 17 00:00:00 2001
From: Peter-Josef Meisch <pj.meisch@sothawo.com>
Date: Mon, 14 Aug 2023 19:51:56 +0200
Subject: [PATCH] Upgrade to Elasticsearch 7.17.12

---
 pom.xml                                       | 951 +++++++++---------
 src/main/asciidoc/preface.adoc                |   8 +-
 ...elasticsearch-migration-guide-4.3-4.4.adoc |   4 +-
 .../testcontainers-elasticsearch.properties   |   2 +-
 4 files changed, 482 insertions(+), 483 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7bd8d8ba7..de9f2df54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,499 +1,500 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+		<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.springframework.data</groupId>
-	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>4.4.15-SNAPSHOT</version>
+		<groupId>org.springframework.data</groupId>
+		<artifactId>spring-data-elasticsearch</artifactId>
+		<version>4.4.15-SNAPSHOT</version>
 
-	<parent>
-		<groupId>org.springframework.data.build</groupId>
-		<artifactId>spring-data-parent</artifactId>
-		<version>2.7.15-SNAPSHOT</version>
-	</parent>
+		<parent>
+				<groupId>org.springframework.data.build</groupId>
+				<artifactId>spring-data-parent</artifactId>
+				<version>2.7.15-SNAPSHOT</version>
+		</parent>
 
-	<name>Spring Data Elasticsearch</name>
-	<description>Spring Data Implementation for Elasticsearch</description>
-	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
-
-	<properties>
-		<!-- version of the RestHighLevelClient	-->
-		<elasticsearch-rhlc>7.17.9</elasticsearch-rhlc>
-		<!-- version of the new ElasticsearchClient	-->
-		<elasticsearch-java>7.17.9</elasticsearch-java>
-		<log4j>2.17.1</log4j>
-		<netty>4.1.65.Final</netty>
-		<springdata.commons>2.7.15-SNAPSHOT</springdata.commons>
-		<testcontainers>1.16.2</testcontainers>
-		<blockhound-junit>1.0.6.RELEASE</blockhound-junit>
-		<java-module-name>spring.data.elasticsearch</java-module-name>
-
-		<!--
-			properties defining the maven phase for the tests and integration tests
-			set to "none" to disable the corresponding test execution (-Dmvn.unit-test.goal=none)
-			default execution for unit-test: "test", for the integration tests: "integration-test"
-		-->
-		<mvn.unit-test.goal>test</mvn.unit-test.goal>
-		<mvn.integration-test-elasticsearch.goal>integration-test</mvn.integration-test-elasticsearch.goal>
-		<mvn.integration-test-opensearch.goal>none</mvn.integration-test-opensearch.goal>
-	</properties>
-
-	<developers>
-		<developer>
-			<id>biomedcentral</id>
-			<name>BioMed Central Development Team</name>
-			<timezone>+0</timezone>
-		</developer>
-		<developer>
-			<id>cstrobl</id>
-			<name>Christoph Strobl</name>
-			<email>cstrobl at pivotal.io</email>
-			<organization>Pivotal</organization>
-			<organizationUrl>https://www.pivotal.io</organizationUrl>
-			<roles>
-				<role>Developer</role>
-			</roles>
-			<timezone>+1</timezone>
-		</developer>
-		<developer>
-			<id>mpaluch</id>
-			<name>Mark Paluch</name>
-			<email>mpaluch at pivotal.io</email>
-			<organization>Pivotal</organization>
-			<organizationUrl>https://www.pivotal.io</organizationUrl>
-			<roles>
-				<role>Developer</role>
-			</roles>
-			<timezone>+1</timezone>
-		</developer>
-	</developers>
-
-	<scm>
+		<name>Spring Data Elasticsearch</name>
+		<description>Spring Data Implementation for Elasticsearch</description>
 		<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
-		<connection>scm:git:git://github.com/spring-projects/spring-data-elasticsearch.git</connection>
-		<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git
-		</developerConnection>
-	</scm>
 
-	<ciManagement>
-		<system>Bamboo</system>
-		<url>https://build.spring.io/browse/SPRINGDATAES</url>
-	</ciManagement>
+		<properties>
+				<!-- version of the RestHighLevelClient	-->
+				<elasticsearch-rhlc>7.17.12</elasticsearch-rhlc>
+				<!-- version of the new ElasticsearchClient	-->
+				<elasticsearch-java>7.17.12</elasticsearch-java>
+				<log4j>2.17.1</log4j>
+				<netty>4.1.65.Final</netty>
+				<springdata.commons>2.7.15-SNAPSHOT</springdata.commons>
+				<testcontainers>1.16.2</testcontainers>
+				<blockhound-junit>1.0.6.RELEASE</blockhound-junit>
+				<java-module-name>spring.data.elasticsearch</java-module-name>
 
-	<issueManagement>
-		<system>GitHub</system>
-		<url>https://github.com/spring-projects/spring-data-elasticsearch/issues</url>
-	</issueManagement>
+				<!--
+					properties defining the maven phase for the tests and integration tests
+					set to "none" to disable the corresponding test execution (-Dmvn.unit-test.goal=none)
+					default execution for unit-test: "test", for the integration tests: "integration-test"
+				-->
+				<mvn.unit-test.goal>test</mvn.unit-test.goal>
+				<mvn.integration-test-elasticsearch.goal>integration-test</mvn.integration-test-elasticsearch.goal>
+				<mvn.integration-test-opensearch.goal>none</mvn.integration-test-opensearch.goal>
+		</properties>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-bom</artifactId>
-				<version>${netty}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+		<developers>
+				<developer>
+						<id>biomedcentral</id>
+						<name>BioMed Central Development Team</name>
+						<timezone>+0</timezone>
+				</developer>
+				<developer>
+						<id>cstrobl</id>
+						<name>Christoph Strobl</name>
+						<email>cstrobl at pivotal.io</email>
+						<organization>Pivotal</organization>
+						<organizationUrl>https://www.pivotal.io</organizationUrl>
+						<roles>
+								<role>Developer</role>
+						</roles>
+						<timezone>+1</timezone>
+				</developer>
+				<developer>
+						<id>mpaluch</id>
+						<name>Mark Paluch</name>
+						<email>mpaluch at pivotal.io</email>
+						<organization>Pivotal</organization>
+						<organizationUrl>https://www.pivotal.io</organizationUrl>
+						<roles>
+								<role>Developer</role>
+						</roles>
+						<timezone>+1</timezone>
+				</developer>
+		</developers>
 
-	<dependencies>
+		<scm>
+				<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
+				<connection>scm:git:git://github.com/spring-projects/spring-data-elasticsearch.git</connection>
+				<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git
+				</developerConnection>
+		</scm>
 
-		<!-- Spring -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-		</dependency>
+		<ciManagement>
+				<system>Bamboo</system>
+				<url>https://build.spring.io/browse/SPRINGDATAES</url>
+		</ciManagement>
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-		</dependency>
+		<issueManagement>
+				<system>GitHub</system>
+				<url>https://github.com/spring-projects/spring-data-elasticsearch/issues</url>
+		</issueManagement>
 
-		<!-- SPRING DATA -->
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-commons</artifactId>
-			<version>${springdata.commons}</version>
-		</dependency>
-
-		<!-- Reactive Infrastructure -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webflux</artifactId>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>io.projectreactor.netty</groupId>
-			<artifactId>reactor-netty-http</artifactId>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- Elasticsearch  RestHighLevelClient, will be removed probably in SDE 5 -->
-		<dependency>
-			<groupId>org.elasticsearch.client</groupId>
-			<artifactId>elasticsearch-rest-high-level-client</artifactId>
-			<version>${elasticsearch-rhlc}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!-- new Elasticsearch client, needs the low-level rest client and json api -->
-		<dependency>
-			<groupId>co.elastic.clients</groupId>
-			<artifactId>elasticsearch-java</artifactId>
-			<version>${elasticsearch-java}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.elasticsearch.client</groupId>
-			<artifactId>elasticsearch-rest-client</artifactId> <!-- is Apache 2-->
-			<version>${elasticsearch-java}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!-- Jackson JSON Mapper -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-		</dependency>
-
-		<!-- CDI -->
-		<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jcdi_2.0_spec</artifactId>
-			<version>1.3</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.interceptor</groupId>
-			<artifactId>javax.interceptor-api</artifactId>
-			<version>1.2.1</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
-			<version>${cdi}</version>
-			<scope>provided</scope>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>${javax-annotation-api}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-se</artifactId>
-			<version>${webbeans}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- Test -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>ch.qos.logback</groupId>
-					<artifactId>logback-classic</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>log4j-over-slf4j</artifactId>
-			<version>${slf4j}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<version>${log4j}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-to-slf4j</artifactId>
-			<version>${log4j}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>io.projectreactor.tools</groupId>
-			<artifactId>blockhound-junit-platform</artifactId>
-			<version>${blockhound-junit}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.skyscreamer</groupId>
-			<artifactId>jsonassert</artifactId>
-			<version>1.5.0</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.github.tomakehurst</groupId>
-			<artifactId>wiremock-jre8</artifactId>
-			<version>2.32.0</version>
-			<scope>test</scope>
-			<exclusions>
-				<!-- these exclusions are needed because of Elasticsearch JarHell-->
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.ow2.asm</groupId>
-					<artifactId>asm</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>io.specto</groupId>
-			<artifactId>hoverfly-java-junit5</artifactId>
-			<version>0.14.1</version>
-			<scope>test</scope>
-		</dependency>
-
-		<!-- Upgrade xbean to 4.5 to prevent incompatibilities due to ASM versions -->
-		<dependency>
-			<groupId>org.apache.xbean</groupId>
-			<artifactId>xbean-asm5-shaded</artifactId>
-			<version>4.5</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-junit-jupiter</artifactId>
-			<version>${mockito}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>elasticsearch</artifactId>
-			<version>${testcontainers}</version>
-			<scope>test</scope>
-		</dependency>
-
-	</dependencies>
-
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-				<includes>
-					<include>**/versions.properties</include>
-				</includes>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>false</filtering>
-				<excludes>
-					<exclude>**/versions.properties</exclude>
-				</excludes>
-			</resource>
-		</resources>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<useSystemClassLoader>true</useSystemClassLoader>
-					<useFile>false</useFile>
-					<includes>
-						<include>**/*Tests.java</include>
-						<include>**/*Test.java</include>
-					</includes>
-					<systemPropertyVariables>
-						<es.set.netty.runtime.available.processors>false</es.set.netty.runtime.available.processors>
-					</systemPropertyVariables>
-				</configuration>
-				<executions>
-					<!-- the default-test execution runs only the unit tests -->
-					<execution>
-						<id>default-test</id>
-						<phase>${mvn.unit-test.goal}</phase>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<configuration>
-							<excludedGroups>integration-test</excludedGroups>
-						</configuration>
-					</execution>
-					<!-- execution to run the integration tests against Elasticsearch -->
-					<execution>
-						<id>integration-test-elasticsearch</id>
-						<phase>${mvn.integration-test-elasticsearch.goal}</phase>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<configuration>
-							<groups>integration-test</groups>
-							<systemPropertyVariables>
-								<sde.integration-test.environment>elasticsearch</sde.integration-test.environment>
-							</systemPropertyVariables>
-						</configuration>
-					</execution>
-					<!-- execution to run the integration tests against Opensearch -->
-					<execution>
-						<id>integration-test-opensearch</id>
-						<phase>${mvn.integration-test-opensearch.goal}</phase>
-						<goals>
-							<goal>test</goal>
-						</goals>
-						<configuration>
-							<groups>integration-test</groups>
-							<systemPropertyVariables>
-								<sde.integration-test.environment>opensearch</sde.integration-test.environment>
-							</systemPropertyVariables>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.pitest</groupId>
-				<artifactId>pitest-maven</artifactId>
-				<version>1.5.2</version>
+		<dependencyManagement>
 				<dependencies>
-					<dependency>
-						<groupId>org.pitest</groupId>
-						<artifactId>pitest-junit5-plugin</artifactId>
-						<version>0.12</version>
-					</dependency>
+						<dependency>
+								<groupId>io.netty</groupId>
+								<artifactId>netty-bom</artifactId>
+								<version>${netty}</version>
+								<type>pom</type>
+								<scope>import</scope>
+						</dependency>
 				</dependencies>
-				<configuration>
-					<excludedGroups>integration-test</excludedGroups>
-					<targetClasses>
-						<param>org.springframework.data.elasticsearch.core.geo.*</param>
-					</targetClasses>
-					<excludedMethods>toString</excludedMethods>
-				</configuration>
-			</plugin>
+		</dependencyManagement>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.asciidoctor</groupId>
-				<artifactId>asciidoctor-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+		<dependencies>
+
+				<!-- Spring -->
+				<dependency>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-context</artifactId>
+				</dependency>
+
+				<dependency>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-tx</artifactId>
+				</dependency>
+
+				<!-- SPRING DATA -->
+				<dependency>
+						<groupId>org.springframework.data</groupId>
+						<artifactId>spring-data-commons</artifactId>
+						<version>${springdata.commons}</version>
+				</dependency>
+
+				<!-- Reactive Infrastructure -->
+				<dependency>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-webflux</artifactId>
+						<optional>true</optional>
+				</dependency>
+
+				<dependency>
+						<groupId>io.projectreactor.netty</groupId>
+						<artifactId>reactor-netty-http</artifactId>
+						<optional>true</optional>
+				</dependency>
+
+				<dependency>
+						<groupId>io.projectreactor</groupId>
+						<artifactId>reactor-test</artifactId>
+						<scope>test</scope>
+				</dependency>
+
+				<!-- Elasticsearch  RestHighLevelClient, will be removed probably in SDE 5 -->
+				<dependency>
+						<groupId>org.elasticsearch.client</groupId>
+						<artifactId>elasticsearch-rest-high-level-client</artifactId>
+						<version>${elasticsearch-rhlc}</version>
+						<exclusions>
+								<exclusion>
+										<groupId>commons-logging</groupId>
+										<artifactId>commons-logging</artifactId>
+								</exclusion>
+						</exclusions>
+				</dependency>
+
+				<!-- new Elasticsearch client, needs the low-level rest client and json api -->
+				<dependency>
+						<groupId>co.elastic.clients</groupId>
+						<artifactId>elasticsearch-java</artifactId>
+						<version>${elasticsearch-java}</version>
+						<exclusions>
+								<exclusion>
+										<groupId>commons-logging</groupId>
+										<artifactId>commons-logging</artifactId>
+								</exclusion>
+						</exclusions>
+				</dependency>
+				<dependency>
+						<groupId>org.elasticsearch.client</groupId>
+						<artifactId>elasticsearch-rest-client</artifactId> <!-- is Apache 2-->
+						<version>${elasticsearch-java}</version>
+						<exclusions>
+								<exclusion>
+										<groupId>commons-logging</groupId>
+										<artifactId>commons-logging</artifactId>
+								</exclusion>
+						</exclusions>
+				</dependency>
+
+				<!-- Jackson JSON Mapper -->
+				<dependency>
+						<groupId>com.fasterxml.jackson.core</groupId>
+						<artifactId>jackson-core</artifactId>
+				</dependency>
+				<dependency>
+						<groupId>com.fasterxml.jackson.core</groupId>
+						<artifactId>jackson-databind</artifactId>
+				</dependency>
+
+				<!-- CDI -->
+				<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
+				<dependency>
+						<groupId>org.apache.geronimo.specs</groupId>
+						<artifactId>geronimo-jcdi_2.0_spec</artifactId>
+						<version>1.3</version>
+						<scope>test</scope>
+				</dependency>
+
+				<dependency>
+						<groupId>javax.interceptor</groupId>
+						<artifactId>javax.interceptor-api</artifactId>
+						<version>1.2.1</version>
+						<scope>test</scope>
+				</dependency>
+
+				<dependency>
+						<groupId>javax.enterprise</groupId>
+						<artifactId>cdi-api</artifactId>
+						<version>${cdi}</version>
+						<scope>provided</scope>
+						<optional>true</optional>
+				</dependency>
+
+				<dependency>
+						<groupId>javax.annotation</groupId>
+						<artifactId>javax.annotation-api</artifactId>
+						<version>${javax-annotation-api}</version>
+						<scope>test</scope>
+				</dependency>
+
+				<dependency>
+						<groupId>org.apache.openwebbeans</groupId>
+						<artifactId>openwebbeans-se</artifactId>
+						<version>${webbeans}</version>
+						<scope>test</scope>
+				</dependency>
+
+				<!-- Test -->
+				<dependency>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-test</artifactId>
+						<scope>test</scope>
+						<exclusions>
+								<exclusion>
+										<groupId>ch.qos.logback</groupId>
+										<artifactId>logback-classic</artifactId>
+								</exclusion>
+						</exclusions>
+				</dependency>
+
+				<dependency>
+						<groupId>org.slf4j</groupId>
+						<artifactId>log4j-over-slf4j</artifactId>
+						<version>${slf4j}</version>
+						<scope>test</scope>
+				</dependency>
+				<dependency>
+						<groupId>org.apache.logging.log4j</groupId>
+						<artifactId>log4j-core</artifactId>
+						<version>${log4j}</version>
+						<scope>test</scope>
+				</dependency>
+				<dependency>
+						<groupId>org.apache.logging.log4j</groupId>
+						<artifactId>log4j-to-slf4j</artifactId>
+						<version>${log4j}</version>
+						<scope>test</scope>
+				</dependency>
+
+				<dependency>
+						<groupId>io.projectreactor.tools</groupId>
+						<artifactId>blockhound-junit-platform</artifactId>
+						<version>${blockhound-junit}</version>
+						<scope>test</scope>
+				</dependency>
+
+				<dependency>
+						<groupId>org.skyscreamer</groupId>
+						<artifactId>jsonassert</artifactId>
+						<version>1.5.0</version>
+						<scope>test</scope>
+				</dependency>
+
+				<dependency>
+						<groupId>com.github.tomakehurst</groupId>
+						<artifactId>wiremock-jre8</artifactId>
+						<version>2.32.0</version>
+						<scope>test</scope>
+						<exclusions>
+								<!-- these exclusions are needed because of Elasticsearch JarHell-->
+								<exclusion>
+										<groupId>commons-logging</groupId>
+										<artifactId>commons-logging</artifactId>
+								</exclusion>
+								<exclusion>
+										<groupId>org.ow2.asm</groupId>
+										<artifactId>asm</artifactId>
+								</exclusion>
+						</exclusions>
+				</dependency>
+
+				<dependency>
+						<groupId>io.specto</groupId>
+						<artifactId>hoverfly-java-junit5</artifactId>
+						<version>0.14.1</version>
+						<scope>test</scope>
+				</dependency>
+
+				<!-- Upgrade xbean to 4.5 to prevent incompatibilities due to ASM versions -->
+				<dependency>
+						<groupId>org.apache.xbean</groupId>
+						<artifactId>xbean-asm5-shaded</artifactId>
+						<version>4.5</version>
+						<scope>test</scope>
+				</dependency>
+
+				<dependency>
+						<groupId>javax.servlet</groupId>
+						<artifactId>javax.servlet-api</artifactId>
+						<version>3.1.0</version>
+						<scope>test</scope>
+				</dependency>
+
+				<dependency>
+						<groupId>org.mockito</groupId>
+						<artifactId>mockito-junit-jupiter</artifactId>
+						<version>${mockito}</version>
+						<scope>test</scope>
+				</dependency>
+
+				<dependency>
+						<groupId>org.testcontainers</groupId>
+						<artifactId>elasticsearch</artifactId>
+						<version>${testcontainers}</version>
+						<scope>test</scope>
+				</dependency>
+
+		</dependencies>
+
+		<build>
+				<resources>
+						<resource>
+								<directory>src/main/resources</directory>
+								<filtering>true</filtering>
+								<includes>
+										<include>**/versions.properties</include>
+								</includes>
+						</resource>
+						<resource>
+								<directory>src/main/resources</directory>
+								<filtering>false</filtering>
+								<excludes>
+										<exclude>**/versions.properties</exclude>
+								</excludes>
+						</resource>
+				</resources>
 
-	<profiles>
-		<profile>
-			<id>ci</id>
-			<build>
 				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-checkstyle-plugin</artifactId>
-						<configuration>
-							<checkstyleRules>
-								<module name="Checker">
+						<plugin>
+								<groupId>org.apache.maven.plugins</groupId>
+								<artifactId>maven-surefire-plugin</artifactId>
+								<configuration>
+										<useSystemClassLoader>true</useSystemClassLoader>
+										<useFile>false</useFile>
+										<includes>
+												<include>**/*Tests.java</include>
+												<include>**/*Test.java</include>
+										</includes>
+										<systemPropertyVariables>
+												<es.set.netty.runtime.available.processors>false</es.set.netty.runtime.available.processors>
+										</systemPropertyVariables>
+								</configuration>
+								<executions>
+										<!-- the default-test execution runs only the unit tests -->
+										<execution>
+												<id>default-test</id>
+												<phase>${mvn.unit-test.goal}</phase>
+												<goals>
+														<goal>test</goal>
+												</goals>
+												<configuration>
+														<excludedGroups>integration-test</excludedGroups>
+												</configuration>
+										</execution>
+										<!-- execution to run the integration tests against Elasticsearch -->
+										<execution>
+												<id>integration-test-elasticsearch</id>
+												<phase>${mvn.integration-test-elasticsearch.goal}</phase>
+												<goals>
+														<goal>test</goal>
+												</goals>
+												<configuration>
+														<groups>integration-test</groups>
+														<systemPropertyVariables>
+																<sde.integration-test.environment>elasticsearch</sde.integration-test.environment>
+														</systemPropertyVariables>
+												</configuration>
+										</execution>
+										<!-- execution to run the integration tests against Opensearch -->
+										<execution>
+												<id>integration-test-opensearch</id>
+												<phase>${mvn.integration-test-opensearch.goal}</phase>
+												<goals>
+														<goal>test</goal>
+												</goals>
+												<configuration>
+														<groups>integration-test</groups>
+														<systemPropertyVariables>
+																<sde.integration-test.environment>opensearch</sde.integration-test.environment>
+														</systemPropertyVariables>
+												</configuration>
+										</execution>
+								</executions>
+						</plugin>
+						<plugin>
+								<groupId>org.pitest</groupId>
+								<artifactId>pitest-maven</artifactId>
+								<version>1.5.2</version>
+								<dependencies>
+										<dependency>
+												<groupId>org.pitest</groupId>
+												<artifactId>pitest-junit5-plugin</artifactId>
+												<version>0.12</version>
+										</dependency>
+								</dependencies>
+								<configuration>
+										<excludedGroups>integration-test</excludedGroups>
+										<targetClasses>
+												<param>org.springframework.data.elasticsearch.core.geo.*</param>
+										</targetClasses>
+										<excludedMethods>toString</excludedMethods>
+								</configuration>
+						</plugin>
 
-									<!-- Configure checker to use UTF-8 encoding -->
-									<property name="charset" value="UTF-8"/>
-
-									<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck"/>
-								</module>
-							</checkstyleRules>
-							<includes>**/*</includes>
-							<excludes>
-								.git/**/*,target/**/*,**/target/**/*,.idea/**/*,**/spring.schemas,**/*.svg,mvnw,mvnw.cmd,**/*.policy
-							</excludes>
-							<sourceDirectories>./</sourceDirectories>
-						</configuration>
-					</plugin>
+						<plugin>
+								<groupId>org.apache.maven.plugins</groupId>
+								<artifactId>maven-assembly-plugin</artifactId>
+						</plugin>
+						<plugin>
+								<groupId>org.asciidoctor</groupId>
+								<artifactId>asciidoctor-maven-plugin</artifactId>
+						</plugin>
 				</plugins>
-			</build>
-		</profile>
+		</build>
 
-		<profile>
-			<id>jdk13+</id>
-			<!-- on jDK13+, Blockhound needs this JVM flag set -->
-			<activation>
-				<jdk>[13,)</jdk>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<argLine>-XX:+AllowRedefinitionToAddDeleteMethods</argLine>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+		<profiles>
+				<profile>
+						<id>ci</id>
+						<build>
+								<plugins>
+										<plugin>
+												<groupId>org.apache.maven.plugins</groupId>
+												<artifactId>maven-checkstyle-plugin</artifactId>
+												<configuration>
+														<checkstyleRules>
+																<module name="Checker">
 
-	<repositories>
-		<repository>
-			<id>spring-snapshot</id>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</repository>
-		<repository>
-			<id>spring-milestone</id>
-			<url>https://repo.spring.io/milestone</url>
-		</repository>
-	</repositories>
+																		<!-- Configure checker to use UTF-8 encoding -->
+																		<property name="charset" value="UTF-8"/>
+
+																		<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck"/>
+																</module>
+														</checkstyleRules>
+														<includes>**/*</includes>
+														<excludes>
+																.git/**/*,target/**/*,**/target/**/*,.idea/**/*,**/spring.schemas,**/*.svg,mvnw,mvnw.cmd,**/*.policy
+														</excludes>
+														<sourceDirectories>./</sourceDirectories>
+												</configuration>
+										</plugin>
+								</plugins>
+						</build>
+				</profile>
+
+				<profile>
+						<id>jdk13+</id>
+						<!-- on jDK13+, Blockhound needs this JVM flag set -->
+						<activation>
+								<jdk>[13,)</jdk>
+						</activation>
+						<build>
+								<plugins>
+										<plugin>
+												<groupId>org.apache.maven.plugins</groupId>
+												<artifactId>maven-surefire-plugin</artifactId>
+												<configuration>
+														<argLine>-XX:+AllowRedefinitionToAddDeleteMethods</argLine>
+												</configuration>
+										</plugin>
+								</plugins>
+						</build>
+				</profile>
+		</profiles>
+
+		<repositories>
+				<repository>
+						<id>spring-snapshot</id>
+						<url>https://repo.spring.io/snapshot</url>
+						<snapshots>
+								<enabled>true</enabled>
+						</snapshots>
+						<releases>
+								<enabled>false</enabled>
+						</releases>
+				</repository>
+				<repository>
+						<id>spring-milestone</id>
+						<url>https://repo.spring.io/milestone</url>
+				</repository>
+		</repositories>
 
 </project>
diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc
index c3afb5122..f90811c47 100644
--- a/src/main/asciidoc/preface.adoc
+++ b/src/main/asciidoc/preface.adoc
@@ -29,15 +29,13 @@ Requires an installation of https://www.elastic.co/products/elasticsearch[Elasti
 [[preface.versions]]
 === Versions
 
-The following table shows the Elasticsearch versions that are used by Spring Data release trains and version of
-Spring Data Elasticsearch included in that, as well as the Spring Boot versions referring to that particular Spring
-Data release train. The Elasticsearch version given shows with which client libraries Spring Data Elasticsearch was
-built and tested.
+The following table shows the Elasticsearch versions that are used by Spring Data release trains and version of Spring Data Elasticsearch included in that, as well as the Spring Boot versions referring to that particular Spring Data release train.
+The Elasticsearch version given shows with which client libraries Spring Data Elasticsearch was 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.9 | 5.3.x | 2.7.x
+| 2021.2 (Raj) | 4.4.x | 7.17.12 | 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 3c7ede38c..b477dd398 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.9</version>
+        <version>7.17.12</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.9</version>
+        <version>7.17.12</version>
         <exclusions>
             <exclusion>
                 <groupId>commons-logging</groupId>
diff --git a/src/test/resources/testcontainers-elasticsearch.properties b/src/test/resources/testcontainers-elasticsearch.properties
index 6b386f0c6..522e02e1e 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.9
+sde.testcontainers.image-version=7.17.12
 #
 #
 # 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