Release version 4.4.16 (2021.2.16).

See #2672
Prepare 4.4.16 (2021.2.16).
2026-05-23 04:33:17 +00:00 · 2023-09-15 09:42:27 +02:00 · 2023-09-15 09:42:11 +02:00 · 2023-09-13 12:55:55 +02:00 · 2023-08-18 10:03:13 +02:00 · 2023-08-18 10:03:11 +02:00
621 changed files with 2731 additions and 1510 deletions
@@ -1,3 +1,3 @@
-#Fri Jun 03 09:39:36 CEST 2022
+#Mon Aug 14 07:23:34 EDT 2023
 wrapperUrl=https\://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
-distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
@@ -138,9 +138,9 @@ To use the Release candidate versions of the upcoming major version, use our Mav
 </dependency>

 <repository>
-  <id>spring-libs-snapshot</id>
+  <id>spring-snapshot</id>
  <name>Spring Snapshot Repository</name>
-  <url>https://repo.spring.io/libs-milestone</url>
+  <url>https://repo.spring.io/milestone</url>
 </repository>
 ----

@@ -155,9 +155,9 @@ If you'd rather like the latest snapshots of the upcoming major version, use our
 </dependency>

 <repository>
-  <id>spring-libs-snapshot</id>
+  <id>spring-snapshot</id>
  <name>Spring Snapshot Repository</name>
-  <url>https://repo.spring.io/libs-snapshot</url>
+  <url>https://repo.spring.io/snapshot</url>
 </repository>
 ----

@@ -1,7 +1,7 @@
 # Java versions
-java.main.tag=8u332-b09-jdk
-java.next.tag=11.0.15_10-jdk
-java.lts.tag=17.0.3_7-jdk
+java.main.tag=8u382-b05-jdk-focal
+java.next.tag=20-jdk-jammy
+java.lts.tag=17.0.8_7-jdk-focal

 # Docker container images - standard
 docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
@@ -10,14 +10,14 @@ docker.java.lts.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclip

 # Supported versions of MongoDB
 docker.mongodb.4.0.version=4.0.28
-docker.mongodb.4.4.version=4.4.12
-docker.mongodb.5.0.version=5.0.6
+docker.mongodb.4.4.version=4.4.23
+docker.mongodb.5.0.version=5.0.19

 # Supported versions of Redis
-docker.redis.6.version=6.2.6
+docker.redis.6.version=6.2.13

 # Supported versions of Cassandra
-docker.cassandra.3.version=3.11.12
+docker.cassandra.3.version=3.11.15

 # Docker environment settings
 docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
@@ -1,520 +1,487 @@
 <?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">

-	<modelVersion>4.0.0</modelVersion>
+		<modelVersion>4.0.0</modelVersion>

-	<groupId>org.springframework.data</groupId>
-	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>4.4.2</version>
+		<groupId>org.springframework.data</groupId>
+		<artifactId>spring-data-elasticsearch</artifactId>
+		<version>4.4.16</version>

-	<parent>
-		<groupId>org.springframework.data.build</groupId>
-		<artifactId>spring-data-parent</artifactId>
-		<version>2.7.2</version>
-	</parent>
+		<parent>
+				<groupId>org.springframework.data.build</groupId>
+				<artifactId>spring-data-parent</artifactId>
+				<version>2.7.16</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.4</elasticsearch-rhlc>
-		<!-- version of the new ElasticsearchClient	-->
-		<elasticsearch-java>7.17.4</elasticsearch-java>
-		<log4j>2.17.1</log4j>
-		<netty>4.1.65.Final</netty>
-		<springdata.commons>2.7.2</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.13</elasticsearch-rhlc>
+				<!-- version of the new ElasticsearchClient	-->
+				<elasticsearch-java>7.17.13</elasticsearch-java>
+				<log4j>2.17.1</log4j>
+				<netty>4.1.65.Final</netty>
+				<springdata.commons>2.7.16</springdata.commons>
+				<testcontainers>1.16.2</testcontainers>
+				<blockhound-junit>1.0.8.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>
-
-
-		<!--
-		  we don't use lombok in Spring Data Elasticsearch anymore. But the dependency is set in the parent project, and so the
-		  lombok compiler stuff is executed regardless of the fact that we don't need it.
-		  On AdoptOpenJdk 16.0.0 this leads to an error, so the project does not build.
-		  Therefore we replace lombok with a jar - that just contains an empty file - that lives in a local maven repository in
-		  src/test/resources/local-maven-repo/
-		  It was installed with
-		   mvn deploy:deploy-file -DgroupId=org.projectlombok -DartifactId=lombok -Dversion=999999 -Durl=file:./src/test/resources/local-maven-repo/ -DrepositoryId=local-maven-repo -DupdateReleaseInfo=true -Dfile=path/to/empty.jar
-		-->
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<!--suppress MavenPackageUpdate -->
-			<version>999999</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-libs-release</id>
-			<url>https://repo.spring.io/libs-release</url>
-		</repository>
+																		<!-- Configure checker to use UTF-8 encoding -->
+																		<property name="charset" value="UTF-8"/>

-		<repository>
-			<id>local-maven-repo</id>
-			<url>file:///${project.basedir}/src/test/resources/local-maven-repo</url>
-		</repository>
+																		<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>
+		
+		
 	</repositories>

-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-plugins-release</id>
-			<url>https://repo.spring.io/plugins-release</url>
-		</pluginRepository>
-	</pluginRepositories>
-
 </project>
@@ -17,9 +17,9 @@ include::reference/elasticsearch-new.adoc[leveloffset=+1]
 * Version Control - https://github.com/spring-projects/spring-data-elasticsearch
 * API Documentation - https://docs.spring.io/spring-data/elasticsearch/docs/current/api/
 * Bugtracker - https://github.com/spring-projects/spring-data-elasticsearch/issues
-* Release repository - https://repo.spring.io/libs-release
-* Milestone repository - https://repo.spring.io/libs-milestone
-* Snapshot repository - https://repo.spring.io/libs-snapshot
+* Release repository - https://repo1.maven.org/maven2/
+* Milestone repository - https://repo.spring.io/milestone/
+* Snapshot repository - https://repo.spring.io/snapshot/

 [[preface.requirements]]
 == Requirements
@@ -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.4 | 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
@@ -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.4</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.4</version>
+        <version>7.17.12</version>
        <exclusions>
            <exclusion>
                <groupId>commons-logging</groupId>
@@ -5,7 +5,7 @@
 == New in Spring Data Elasticsearch 4.4

 * Introduction of new imperative and reactive clients using the classes from the new Elasticsearch Java client
-* Upgrade to Elasticsearch 7.17.4.
+* Upgrade to Elasticsearch 7.17.6.

 [[new-features.4-3-0]]
 == New in Spring Data Elasticsearch 4.3
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ public enum Dynamic {
 	/**
 	 * Inherit the dynamic setting from their parent object or from the mapping type.
 	 */
-	INHERIT("nherit");
+	INHERIT("inherit");

 	private final String mappedName;

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2022 the original author or authors.
+ * Copyright 2017-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -138,9 +138,8 @@ final class DocumentAdapters {
 		document.setPrimaryTerm(hit.primaryTerm() != null && hit.primaryTerm() > 0 ? hit.primaryTerm() : 0);

 		float score = hit.score() != null ? hit.score().floatValue() : Float.NaN;
-		return new SearchDocumentAdapter(document, score, hit.sort().toArray(new String[0]), documentFields,
-				highlightFields, innerHits, nestedMetaData, explanation, matchedQueries, hit.routing());
-	}
+		return new SearchDocumentAdapter(document, score, hit.sort().stream().map(TypeUtils::toString).toArray(),
+			documentFields, highlightFields, innerHits, nestedMetaData, explanation, matchedQueries, hit.routing());	}

 	@Nullable
 	private static Explanation from(@Nullable co.elastic.clients.elasticsearch.core.explain.Explanation explanation) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
 import static org.springframework.util.CollectionUtils.*;

 import co.elastic.clients.elasticsearch._types.Conflicts;
+import co.elastic.clients.elasticsearch._types.FieldValue;
 import co.elastic.clients.elasticsearch._types.InlineScript;
 import co.elastic.clients.elasticsearch._types.OpType;
 import co.elastic.clients.elasticsearch._types.SortOptions;
@@ -32,7 +33,16 @@ import co.elastic.clients.elasticsearch._types.mapping.RuntimeFieldType;
 import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
 import co.elastic.clients.elasticsearch._types.query_dsl.Like;
 import co.elastic.clients.elasticsearch.cluster.HealthRequest;
-import co.elastic.clients.elasticsearch.core.*;
+import co.elastic.clients.elasticsearch.core.BulkRequest;
+import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest;
+import co.elastic.clients.elasticsearch.core.DeleteRequest;
+import co.elastic.clients.elasticsearch.core.GetRequest;
+import co.elastic.clients.elasticsearch.core.IndexRequest;
+import co.elastic.clients.elasticsearch.core.MgetRequest;
+import co.elastic.clients.elasticsearch.core.MsearchRequest;
+import co.elastic.clients.elasticsearch.core.SearchRequest;
+import co.elastic.clients.elasticsearch.core.UpdateByQueryRequest;
+import co.elastic.clients.elasticsearch.core.UpdateRequest;
 import co.elastic.clients.elasticsearch.core.bulk.BulkOperation;
 import co.elastic.clients.elasticsearch.core.bulk.CreateOperation;
 import co.elastic.clients.elasticsearch.core.bulk.IndexOperation;
@@ -42,7 +52,6 @@ import co.elastic.clients.elasticsearch.core.search.Highlight;
 import co.elastic.clients.elasticsearch.core.search.Rescore;
 import co.elastic.clients.elasticsearch.core.search.SourceConfig;
 import co.elastic.clients.elasticsearch.indices.*;
-import co.elastic.clients.elasticsearch.indices.ExistsRequest;
 import co.elastic.clients.elasticsearch.indices.update_aliases.Action;
 import co.elastic.clients.json.JsonData;
 import co.elastic.clients.json.JsonpDeserializer;
@@ -746,7 +755,7 @@ class RequestConverter {

 					ReindexRequest.Slice slice = source.getSlice();
 					if (slice != null) {
-						s.slice(sl -> sl.id(slice.getId()).max(slice.getMax()));
+						s.slice(sl -> sl.id(String.valueOf(slice.getId())).max(slice.getMax()));
 					}

 					if (source.getQuery() != null) {
@@ -820,7 +829,11 @@ class RequestConverter {
 				.refresh(reindexRequest.getRefresh()) //
 				.requireAlias(reindexRequest.getRequireAlias()) //
 				.requestsPerSecond(reindexRequest.getRequestsPerSecond()) //
-				.slices(reindexRequest.getSlices());
+		;
+
+		if (reindexRequest.getSlices() != null) {
+			builder.slices(sb -> sb.value(reindexRequest.getSlices().intValue()));
+		}

 		return builder.build();
 	}
@@ -963,9 +976,12 @@ class RequestConverter {
 					.pipeline(updateQuery.getPipeline()) //
 					.requestsPerSecond(
 							updateQuery.getRequestsPerSecond() != null ? updateQuery.getRequestsPerSecond().longValue() : null) //
-					.slices(updateQuery.getSlices() != null ? Long.valueOf(updateQuery.getSlices()) : null) //
 			;

+			if (updateQuery.getSlices() != null) {
+				ub.slices(sb -> sb.value(updateQuery.getSlices() != null ? updateQuery.getSlices() : null));
+			}
+
 			if (updateQuery.getAbortOnVersionConflict() != null) {
 				ub.conflicts(updateQuery.getAbortOnVersionConflict() ? Conflicts.Abort : Conflicts.Proceed);
 			}
@@ -1153,7 +1169,8 @@ class RequestConverter {
 		}

 		if (!isEmpty(query.getSearchAfter())) {
-			builder.searchAfter(query.getSearchAfter().stream().map(Object::toString).collect(Collectors.toList()));
+			builder.searchAfter(
+					query.getSearchAfter().stream().map(it -> FieldValue.of(it.toString())).collect(Collectors.toList()));
 		}

 		query.getRescorerQueries().forEach(rescorerQuery -> {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -122,6 +122,31 @@ final class TypeUtils {
 		return null;
 	}

+	@Nullable
+	static String toString(@Nullable FieldValue fieldValue) {
+
+		if (fieldValue == null) {
+			return null;
+		}
+
+		switch (fieldValue._kind()) {
+			case Double:
+				return String.valueOf(fieldValue.doubleValue());
+			case Long:
+				return String.valueOf(fieldValue.longValue());
+			case Boolean:
+				return String.valueOf(fieldValue.booleanValue());
+			case String:
+				return fieldValue.stringValue();
+			case Null:
+				return null;
+			case Any:
+				return fieldValue.anyValue().toString();
+			default:
+				throw new IllegalStateException("Unexpected value: " + fieldValue._kind());
+		}
+	}
+
 	@Nullable
 	static GeoDistanceType geoDistanceType(GeoDistanceOrder.DistanceType distanceType) {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 the original author or authors.
+ * Copyright 2021-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -256,6 +256,15 @@ public interface WebClientProvider {
 							HttpHeaders suppliedHeaders = clientConfiguration.getHeadersSupplier().get();

 							if (suppliedHeaders != null && suppliedHeaders != HttpHeaders.EMPTY) {
+
+								// remove content-type and accept if they are provided by the client configuration (ES7 compatibility headers)
+								if (suppliedHeaders.containsKey(HttpHeaders.CONTENT_TYPE)) {
+									httpHeaders.remove(HttpHeaders.CONTENT_TYPE);
+								}
+								if (suppliedHeaders.containsKey(HttpHeaders.ACCEPT)) {
+									httpHeaders.remove(HttpHeaders.ACCEPT);
+								}
+
 								httpHeaders.addAll(suppliedHeaders);
 							}
 						}));
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -336,8 +336,13 @@ public class RequestConverters {
 	public static Request index(IndexRequest indexRequest) {
 		String method = Strings.hasLength(indexRequest.id()) ? HttpMethod.PUT.name() : HttpMethod.POST.name();
 		boolean isCreate = (indexRequest.opType() == DocWriteRequest.OpType.CREATE);
-		String endpoint = endpoint(indexRequest.index(), indexRequest.type(), indexRequest.id(),
-				isCreate ? "_create" : null);
+		String endpoint;
+		if (indexRequest.opType() == DocWriteRequest.OpType.CREATE) {
+			endpoint = indexRequest.type().equals("_doc") ? endpoint(indexRequest.index(), "_create", indexRequest.id())
+					: endpoint(indexRequest.index(), indexRequest.type(), indexRequest.id(), "_create");
+		} else {
+			endpoint = endpoint(indexRequest.index(), indexRequest.type(), indexRequest.id());
+		}
 		Request request = new Request(method, endpoint);

 		Params parameters = new Params(request);
@@ -362,7 +367,9 @@ public class RequestConverters {
 	}

 	public static Request update(UpdateRequest updateRequest) {
-		String endpoint = endpoint(updateRequest.index(), updateRequest.type(), updateRequest.id(), "_update");
+		String endpoint = updateRequest.type().equals("_doc")
+				? endpoint(updateRequest.index(), "_update", updateRequest.id())
+				: endpoint(updateRequest.index(), updateRequest.type(), updateRequest.id(), "_update");
 		Request request = new Request(HttpMethod.POST.name(), endpoint);

 		Params parameters = new Params(request);
@@ -500,8 +507,11 @@ public class RequestConverters {
 	}

 	public static Request explain(ExplainRequest explainRequest) {
+		String endpoint = explainRequest.type().equals("_doc")
+				? endpoint(explainRequest.index(), "_explain", explainRequest.id())
+				: endpoint(explainRequest.index(), explainRequest.type(), explainRequest.id(), "_explain");
 		Request request = new Request(HttpMethod.GET.name(),
-				endpoint(explainRequest.index(), explainRequest.type(), explainRequest.id(), "_explain"));
+				endpoint(explainRequest.index(), explainRequest.type(), explainRequest.id(), endpoint));

 		Params params = new Params(request);
 		params.withStoredFields(explainRequest.storedFields());
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark Paluch	8475b4c3bd	Release version 4.4.16 (2021.2.16). See #2672	2023-09-15 09:42:27 +02:00
Mark Paluch	5b7197214c	Prepare 4.4.16 (2021.2.16). See #2672	2023-09-15 09:42:11 +02:00
Peter-Josef Meisch	2d91d8a66c	Upgrade to Elasticsearch 7.17.13. Original Pull Request #2691 Closes #2690	2023-09-13 12:55:55 +02:00
Mark Paluch	25c30322a7	After release cleanups. See #2628	2023-08-18 10:03:13 +02:00
Mark Paluch	0b066d4cef	Prepare next development iteration. See #2628	2023-08-18 10:03:11 +02:00
Mark Paluch	7c74e0ba1e	Release version 4.4.15 (2021.2.15). See #2628	2023-08-18 09:59:29 +02:00
Mark Paluch	4792927226	Prepare 4.4.15 (2021.2.15). See #2628	2023-08-18 09:59:07 +02:00
Oliver Drotbohm	fa2f605db8	Upgrade to Blockhound 1.0.8. As 1.0.7 introduces support for JDK 20 (https://github.com/reactor/BlockHound/pull/312). Fixes #2671.	2023-08-15 00:35:17 +02:00
Peter-Josef Meisch	9337ee32df	Upgrade to Elasticsearch 7.17.12	2023-08-14 19:51:56 +02:00
Julia Lee	7325a01b43	Update CI properties. See #2628	2023-08-14 09:36:04 -04:00
Julia Lee	3d517df863	Upgrade to Maven Wrapper 3.9.4. See #2667	2023-08-14 07:23:34 -04:00
Mark Paluch	14d7653c06	Update CI properties. See #2628	2023-07-18 11:45:26 +02:00
Mark Paluch	fd8288a971	After release cleanups. See #2593	2023-07-14 10:35:32 +02:00
Mark Paluch	5dccbd3ca5	Prepare next development iteration. See #2593	2023-07-14 10:35:30 +02:00
Mark Paluch	1f120621fd	Release version 4.4.14 (2021.2.14). See #2593	2023-07-14 10:31:36 +02:00
Mark Paluch	27ade04f8c	Prepare 4.4.14 (2021.2.14). See #2593	2023-07-14 10:31:12 +02:00
Mark Paluch	0695a67ca9	Update CI properties. See #2593	2023-07-03 09:43:46 +02:00
Mark Paluch	72a344918f	Upgrade to Maven Wrapper 3.9.3. See #2612	2023-07-03 09:42:35 +02:00
Mark Paluch	5ec5e52842	After release cleanups. See #2546	2023-06-16 16:24:06 +02:00
Mark Paluch	c99aa8e6b9	Prepare next development iteration. See #2546	2023-06-16 14:59:10 +02:00
Mark Paluch	7c13580a92	Release version 4.4.13 (2021.2.13). See #2546	2023-06-16 14:56:15 +02:00
Mark Paluch	620a8064f2	Prepare 4.4.13 (2021.2.13). See #2546	2023-06-16 14:56:00 +02:00
Mark Paluch	ecc5c54139	Remove lombok dependency override. Lombok issues are resolved. With the Lombok customization, we no longer can resolve the artifact that breaks the build, so removing it. See #2585	2023-06-15 17:06:08 +02:00
Mark Paluch	354c5938b6	Upgrade to Maven Wrapper 3.9.2. See #2586	2023-06-13 08:51:21 +02:00
Mark Paluch	8753d85cf8	Use snapshot and milestone repositories instead of libs-snapshot and libs-milestone. Closes #2585	2023-06-06 10:58:40 +02:00
Christoph Strobl	e2140d05d6	After release cleanups. See #2527	2023-05-12 10:21:26 +02:00
Christoph Strobl	0ebb6b93e5	Prepare next development iteration. See #2527	2023-05-12 10:21:24 +02:00
Christoph Strobl	577184c29d	Release version 4.4.12 (2021.2.12). See #2527	2023-05-12 10:18:02 +02:00
Christoph Strobl	7a9aad128f	Prepare 4.4.12 (2021.2.12). See #2527	2023-05-12 10:17:45 +02:00
Greg L. Turnquist	829e2c6794	After release cleanups. See #2498	2023-04-14 09:26:07 -05:00
Greg L. Turnquist	56df906534	Prepare next development iteration. See #2498	2023-04-14 09:26:00 -05:00
Greg L. Turnquist	1723fd24c3	Release version 4.4.11 (2021.2.11). See #2498	2023-04-14 09:19:58 -05:00
Greg L. Turnquist	7b01fa3582	Prepare 4.4.11 (2021.2.11). See #2498	2023-04-14 09:19:19 -05:00
Peter-Josef Meisch	27954e83c2	Polishing (cherry picked from commit `dfc1be286c`) (cherry picked from commit `fdc03cf29e`)	2023-04-10 11:55:52 +02:00
JKatzwinkel	6c4d101b46	Fix inner hits metadata mapping. Original Pull Request #2522 Closes #2521 (cherry picked from commit `1f7fa77c15`) (cherry picked from commit `e1da43ca9f`)	2023-04-10 11:55:51 +02:00
Mark Paluch	48d77796ab	Upgrade to Maven Wrapper 3.9.1. See #2520	2023-04-06 16:18:44 +02:00
Christoph Strobl	96a4605361	After release cleanups. See #2484	2023-03-20 13:48:10 +01:00
Christoph Strobl	144ae6d7d1	Prepare next development iteration. See #2484	2023-03-20 13:48:09 +01:00
Christoph Strobl	7c429c4a94	Release version 4.4.10 (2021.2.10). See #2484	2023-03-20 13:43:05 +01:00
Christoph Strobl	08ec702138	Prepare 4.4.10 (2021.2.10). See #2484	2023-03-20 13:42:32 +01:00
Mark Paluch	91af6fefde	After release cleanups. See #2461	2023-03-03 10:22:38 +01:00
Mark Paluch	823c164ae7	Prepare next development iteration. See #2461	2023-03-03 10:22:36 +01:00
Mark Paluch	08823409c5	Release version 4.4.9 (2021.2.9). See #2461	2023-03-03 10:19:08 +01:00
Mark Paluch	834f48ff67	Prepare 4.4.9 (2021.2.9). See #2461	2023-03-03 10:18:48 +01:00
Mark Paluch	7158e04859	Upgrade to Maven Wrapper 3.9.0. See #2473	2023-02-20 12:02:21 +01:00
Mark Paluch	5074f14f34	After release cleanups. See #2425	2023-02-17 10:11:46 +01:00
Mark Paluch	d048df2c0d	Prepare next development iteration. See #2425	2023-02-17 10:11:44 +01:00
Mark Paluch	be7d2c47c4	Release version 4.4.8 (2021.2.8). See #2425	2023-02-17 10:08:26 +01:00
Mark Paluch	12030cde7c	Prepare 4.4.8 (2021.2.8). See #2425	2023-02-17 10:08:09 +01:00
Peter-Josef Meisch	5cb4ebdd30	Upgrade to Elasticsearch 7.17.9. Original Pull Request #2457 Closes #2453	2023-02-14 19:58:47 +01:00
Peter-Josef Meisch	f8d4e1ccf9	Polishing	2023-02-10 23:53:17 +01:00
Peter-Josef Meisch	c6278556b6	@Query annotated repository method does not use Sort parameter. Original Pull Request #2450 Closes #2449 (cherry picked from commit `4f30a492b9`) (cherry picked from commit `7d5b9d5b7c`)	2023-02-10 23:06:57 +01:00
Mark Paluch	ea48bf5dfe	Update CI properties. See #2425	2023-01-30 10:48:59 +01:00
Mark Paluch	ae4934563b	After release cleanups. See #2365	2023-01-13 10:35:35 +01:00
Mark Paluch	f608c80606	Prepare next development iteration. See #2365	2023-01-13 10:35:33 +01:00
Mark Paluch	401cf99d89	Release version 4.4.7 (2021.2.7). See #2365	2023-01-13 10:32:46 +01:00
Mark Paluch	691a264050	Prepare 4.4.7 (2021.2.7). See #2365	2023-01-13 10:32:32 +01:00
Peter-Josef Meisch	87540bcabc	findAllById returns all requested documents. Original Pull Request #2421 Closes #2417 (cherry picked from commit `28489ffee8`) (cherry picked from commit `6551a80ccc`)	2023-01-04 20:03:40 +01:00
Mark Paluch	b896694d3a	Extend license header copyright years to 2023. See #2415	2023-01-02 09:52:11 +01:00
Peter-Josef Meisch	87be6dbd82	Upgrade to Elasticsearch 7.17.8. Original Pull Request #2413 Closes #2401	2022-12-31 00:30:58 +01:00
Mark Paluch	bb05d0ba76	Update CI properties. See #2365	2022-11-18 15:33:55 +01:00
Mark Paluch	7a7e51ff6c	After release cleanups. See #2335	2022-11-18 10:55:38 +01:00
Mark Paluch	2c2e493ce4	Prepare next development iteration. See #2335	2022-11-18 10:55:36 +01:00
Mark Paluch	3a876901c0	Release version 4.4.6 (2021.2.6). See #2335	2022-11-18 10:45:33 +01:00
Mark Paluch	f59d9c6eae	Prepare 4.4.6 (2021.2.6). See #2335	2022-11-18 10:44:45 +01:00
Tiny	a1094527a9	Update Dynamic.java Original Pull Request #2357 Closes #2359 (cherry picked from commit `f8ddf16c0c`)	2022-11-10 20:18:24 +01:00
Peter-Josef Meisch	cd8fabe499	Upgrade to Elasticsearch 7.17.7. Original Pull Request #2347 Closes #2346	2022-11-01 20:29:29 +01:00
Mark Paluch	b61f44d872	Update CI properties. See #2335	2022-10-31 13:18:18 +01:00
Peter-Josef Meisch	933ebab0e0	Fix repository methods value converting. Original Pull Request #2339 Closes #2338 (cherry picked from commit `e67150a55b`)	2022-10-19 22:42:06 +02:00
Spring Builds	edac49c470	After release cleanups. See #2334	2022-10-13 13:46:55 +00:00
Spring Builds	cb65bc5ead	Prepare next development iteration. See #2334	2022-10-13 13:46:42 +00:00
Spring Builds	c99d633ac6	Release version 4.4.5 (2021.2.5). See #2334	2022-10-13 13:24:06 +00:00
Spring Builds	7372f9120d	Prepare 4.4.5 (2021.2.5). See #2334	2022-10-13 13:21:37 +00:00
Spring Builds	c09138f985	After release cleanups. See #2296	2022-10-13 09:23:59 +00:00
Spring Builds	5ac167290c	Prepare next development iteration. See #2296	2022-10-13 09:23:46 +00:00
Spring Builds	06db4fde05	Release version 4.4.4 (2021.2.4). See #2296	2022-10-13 08:59:56 +00:00
Spring Builds	c823ce1946	Prepare 4.4.4 (2021.2.4). See #2296	2022-10-13 08:57:08 +00:00
Peter-Josef Meisch	2fa15f772a	Escape backslash in StringQuery. Original Pull Request Closes #2326 (cherry picked from commit `03ecc48b09`)	2022-10-11 22:38:22 +02:00
Peter-Josef Meisch	02b6d54cc9	Prefer config supplied content-type and accept header. Original Pull Request #2328 Closes #2327	2022-10-08 15:10:26 +02:00
Peter-Josef Meisch	8bb3474c05	Revert "Support partially update document by entity." This reverts commit `7e904cdbe7`.	2022-09-24 22:00:49 +02:00
puppylpg	7e904cdbe7	Support partially update document by entity. Original Pull Request #2305 Closes #2304	2022-09-24 21:57:41 +02:00
Spring Builds	e46b4977a4	After release cleanups. See #2221	2022-09-19 12:00:24 +00:00
Spring Builds	5de2e0b96e	Prepare next development iteration. See #2221	2022-09-19 12:00:12 +00:00
Spring Builds	c36b878cee	Release version 4.4.3 (2021.2.3). See #2221	2022-09-19 11:38:46 +00:00
Spring Builds	2efa79d469	Prepare 4.4.3 (2021.2.3). See #2221	2022-09-19 11:36:24 +00:00
Peter-Josef Meisch	20fde914df	Upgrade to Elasticsearch 7.17.6. Original Pull Request #2289 Closes #2285	2022-09-04 12:42:14 +02:00
Peter-Josef Meisch	988736dd41	Fix NPE in RequestFactory when language in UpdateQuery is not set (4.4.x). Original Pull Request #2288 Closes #2287	2022-09-03 07:50:01 +02:00
Peter-Josef Meisch	346c5cce58	Fix mapping of property values into a collection. When reading from Elasticsearch into a property of type Collection<T> (List<T> or Set<T>) the MappingElasticsearchConverter now can read both from the returned JSON: an array of T objects - will put the objects in a corresponding collection a single T object will put the single object into a corrsponding colletcion This is implemented and tested for both: entities where the properties have setters and immutable classes that only provide an all-args constructor. Original Pull Request #2282 Closes #2280 (cherry picked from commit `86634ceb38`)	2022-08-29 21:06:38 +02:00
Peter-Josef Meisch	a3ebd8be78	Fix update call in reactive client (Elasticsearch 7 client) Original Pull Request #2281 Closes #2276 (cherry picked from commit `8377f64a8a`)	2022-08-26 08:12:22 +02:00
Peter-Josef Meisch	3c6d96e49f	Don't try to write non-writeable properties. Original Pull Request #2249 Closes #2230 (cherry picked from commit `acf02a1dc9`) # Conflicts: # src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java	2022-08-04 12:11:22 +02:00
Peter-Josef Meisch	be70a398be	Fix exists query for imperative repository implementation. Original Pull Request #2236 Closes #2162 (cherry picked from commit `373be49f97`)	2022-07-22 22:01:26 +02:00
Peter-Josef Meisch	e3e666fd2e	Upgrade to Elasticsearch 7.17.5. Original Pull Request #2224 Closes #2215	2022-07-16 21:30:41 +02:00
Christoph Strobl	cb3d1e11d3	After release cleanups. See #2186	2022-07-15 11:24:08 +02:00
Christoph Strobl	9e17bf3df8	Prepare next development iteration. See #2186	2022-07-15 11:24:05 +02:00