Release version 5.1.3 (2023.0.3).

See #2631
Prepare 5.1.3 (2023.0.3).
2026-07-05 17:50:00 +00:00 · 2023-08-18 14:04:04 +02:00 · 2023-08-18 14:03:49 +02:00 · 2023-08-14 11:29:43 -04:00 · 2023-08-14 07:55:32 -04:00 · 2023-08-13 21:40:31 +02:00
20 changed files with 680 additions and 555 deletions
@@ -1,3 +1,3 @@
-#Thu Apr 06 16:16:37 CEST 2023
+#Mon Aug 14 07:55:32 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.9.1/apache-maven-3.9.1-bin.zip
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
@@ -9,7 +9,7 @@ pipeline {
 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/main", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/3.1.x", threshold: hudson.model.Result.SUCCESS)
 	}
 	options {
@@ -111,10 +111,6 @@ pipeline {
 	post {
 		changed {
 			script {
 				slackSend(
 						color: (currentBuild.currentResult == 'SUCCESS') ? 'good' : 'danger',
 						channel: '#spring-data-dev',
 						message: "${currentBuild.fullDisplayName} - `${currentBuild.currentResult}`\n${env.BUILD_URL}")
 				emailext(
 						subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}",
 						mimeType: 'text/html',
@@ -137,9 +137,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>
 ----
@@ -154,9 +154,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,5 +1,5 @@
 # Java versions
-java.main.tag=17.0.6_10-jdk-focal
+java.main.tag=17.0.8_7-jdk-focal
 java.next.tag=20-jdk-jammy
 # Docker container images - standard
@@ -7,15 +7,15 @@ docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/ecli
 docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
 # Supported versions of MongoDB
-docker.mongodb.4.4.version=4.4.18
+docker.mongodb.4.4.version=4.4.23
-docker.mongodb.5.0.version=5.0.14
+docker.mongodb.5.0.version=5.0.19
-docker.mongodb.6.0.version=6.0.4
+docker.mongodb.6.0.version=6.0.8
 # Supported versions of Redis
-docker.redis.6.version=6.2.10
+docker.redis.6.version=6.2.13
 # Supported versions of Cassandra
-docker.cassandra.3.version=3.11.14
+docker.cassandra.3.version=3.11.15
 # Docker environment settings
 docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
@@ -1,486 +1,471 @@
 <?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>
+	<groupId>org.springframework.data</groupId>
-		<artifactId>spring-data-elasticsearch</artifactId>
+	<artifactId>spring-data-elasticsearch</artifactId>
-		<version>5.1.0</version>
+	<version>5.1.3</version>
-		<parent>
+	<parent>
-				<groupId>org.springframework.data.build</groupId>
+		<groupId>org.springframework.data.build</groupId>
-				<artifactId>spring-data-parent</artifactId>
+		<artifactId>spring-data-parent</artifactId>
-				<version>3.1.0</version>
+		<version>3.1.3</version>
-		</parent>
+	</parent>
-		<name>Spring Data Elasticsearch</name>
+	<name>Spring Data Elasticsearch</name>
-		<description>Spring Data Implementation for Elasticsearch</description>
+	<description>Spring Data Implementation for Elasticsearch</description>
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 	<properties>
 		<springdata.commons>3.1.3</springdata.commons>
 		<!-- version of the RestHighLevelClient	-->
 		<elasticsearch-rhlc>7.17.12</elasticsearch-rhlc>
 		<!-- version of the new ElasticsearchClient	-->
 		<elasticsearch-java>8.7.1</elasticsearch-java>
 		<log4j>2.18.0</log4j>
 		<!-- netty dependency can be removed once the WebClient code is gone -->
 		<netty>4.1.90.Final</netty>
 		<blockhound-junit>1.0.8.RELEASE</blockhound-junit>
 		<hoverfly>0.14.4</hoverfly>
 		<jsonassert>1.5.1</jsonassert>
 		<testcontainers>1.18.0</testcontainers>
 		<wiremock>2.35.0</wiremock>
 		<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>
 	</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>
 		<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>
-		<properties>
+	<ciManagement>
-				<springdata.commons>3.1.0</springdata.commons>
+		<system>Bamboo</system>
 		<url>https://build.spring.io/browse/SPRINGDATAES</url>
 	</ciManagement>
-				<!-- version of the RestHighLevelClient	-->
+	<issueManagement>
-				<elasticsearch-rhlc>7.17.9</elasticsearch-rhlc>
+		<system>GitHub</system>
-				<!-- version of the new ElasticsearchClient	-->
+		<url>https://github.com/spring-projects/spring-data-elasticsearch/issues</url>
-				<elasticsearch-java>8.7.0</elasticsearch-java>
+	</issueManagement>
 				<log4j>2.18.0</log4j>
 				<!-- netty dependency can be removed once the WebClient code is gone -->
 				<netty>4.1.90.Final</netty>
 				<blockhound-junit>1.0.8.RELEASE</blockhound-junit>
 				<hoverfly>0.14.4</hoverfly>
 				<jsonassert>1.5.1</jsonassert>
 				<testcontainers>1.18.0</testcontainers>
 				<wiremock>2.35.0</wiremock>
 				<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>
 		</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>
 				<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>
 		<issueManagement>
 				<system>GitHub</system>
 				<url>https://github.com/spring-projects/spring-data-elasticsearch/issues</url>
 		</issueManagement>
 		<dependencyManagement>
 				<dependencies>
 						<dependency>
 								<groupId>io.netty</groupId>
 								<artifactId>netty-bom</artifactId>
 								<version>${netty}</version>
 								<type>pom</type>
 								<scope>import</scope>
 						</dependency>
 				</dependencies>
 		</dependencyManagement>
 	<dependencyManagement>
 		<dependencies>
-
+			<dependency>
-				<!-- Spring -->
+				<groupId>io.netty</groupId>
-				<dependency>
+				<artifactId>netty-bom</artifactId>
-						<groupId>org.springframework</groupId>
+				<version>${netty}</version>
-						<artifactId>spring-context</artifactId>
+				<type>pom</type>
-				</dependency>
+				<scope>import</scope>
-
+			</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>
 				<!-- optional Elasticsearch RestHighLevelClient, deprecated in SDE 5.0 -->
 				<dependency>
 						<groupId>org.elasticsearch.client</groupId>
 						<artifactId>elasticsearch-rest-high-level-client</artifactId>
 						<version>${elasticsearch-rhlc}</version>
 						<optional>true</optional>
 						<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>
 						<groupId>javax.interceptor</groupId>
 						<artifactId>javax.interceptor-api</artifactId>
 						<version>1.2.2</version>
 						<scope>test</scope>
 				</dependency>
 				<dependency>
 						<groupId>jakarta.enterprise</groupId>
 						<artifactId>jakarta.enterprise.cdi-api</artifactId>
 						<version>3.0.1</version>
 						<scope>provided</scope>
 						<optional>true</optional>
 				</dependency>
 				<dependency>
 						<groupId>jakarta.annotation</groupId>
 						<artifactId>jakarta.annotation-api</artifactId>
 						<version>${jakarta-annotation-api}</version>
 						<scope>test</scope>
 				</dependency>
 				<dependency>
 						<groupId>org.apache.openwebbeans</groupId>
 						<artifactId>openwebbeans-se</artifactId>
 						<classifier>jakarta</classifier>
 						<version>${webbeans}</version>
 						<scope>test</scope>
 				</dependency>
 				<dependency>
 						<groupId>org.apache.openwebbeans</groupId>
 						<artifactId>openwebbeans-spi</artifactId>
 						<classifier>jakarta</classifier>
 						<version>${webbeans}</version>
 						<scope>test</scope>
 				</dependency>
 				<dependency>
 						<groupId>org.apache.openwebbeans</groupId>
 						<artifactId>openwebbeans-impl</artifactId>
 						<classifier>jakarta</classifier>
 						<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>${jsonassert}</version>
 						<scope>test</scope>
 				</dependency>
 				<dependency>
 						<groupId>com.github.tomakehurst</groupId>
 						<artifactId>wiremock-jre8</artifactId>
 						<version>${wiremock}</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>${hoverfly}</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>
 	</dependencyManagement>
-		<build>
+	<dependencies>
 				<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>
 		<!-- 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>
 		<!-- optional Elasticsearch RestHighLevelClient, deprecated in SDE 5.0 -->
 		<dependency>
 			<groupId>org.elasticsearch.client</groupId>
 			<artifactId>elasticsearch-rest-high-level-client</artifactId>
 			<version>${elasticsearch-rhlc}</version>
 			<optional>true</optional>
 			<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>
 			<groupId>javax.interceptor</groupId>
 			<artifactId>javax.interceptor-api</artifactId>
 			<version>1.2.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.enterprise</groupId>
 			<artifactId>jakarta.enterprise.cdi-api</artifactId>
 			<version>3.0.1</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.annotation</groupId>
 			<artifactId>jakarta.annotation-api</artifactId>
 			<version>${jakarta-annotation-api}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-se</artifactId>
 			<classifier>jakarta</classifier>
 			<version>${webbeans}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-spi</artifactId>
 			<classifier>jakarta</classifier>
 			<version>${webbeans}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-impl</artifactId>
 			<classifier>jakarta</classifier>
 			<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>${jsonassert}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.github.tomakehurst</groupId>
 			<artifactId>wiremock-jre8</artifactId>
 			<version>${wiremock}</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>${hoverfly}</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>
 				</executions>
 			</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>
 	<profiles>
 		<profile>
 			<id>ci</id>
 			<build>
 				<plugins>
-						<plugin>
+					<plugin>
-								<groupId>org.apache.maven.plugins</groupId>
+						<groupId>org.apache.maven.plugins</groupId>
-								<artifactId>maven-surefire-plugin</artifactId>
+						<artifactId>maven-checkstyle-plugin</artifactId>
-								<configuration>
+						<configuration>
-										<useSystemClassLoader>true</useSystemClassLoader>
+							<checkstyleRules>
-										<useFile>false</useFile>
+								<module name="Checker">
-										<includes>
+
-												<include>**/*Tests.java</include>
+									<!-- Configure checker to use UTF-8 encoding -->
-												<include>**/*Test.java</include>
+									<property name="charset" value="UTF-8"/>
-										</includes>
+
-										<systemPropertyVariables>
+									<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck"/>
-												<es.set.netty.runtime.available.processors>false</es.set.netty.runtime.available.processors>
+								</module>
-										</systemPropertyVariables>
+							</checkstyleRules>
-								</configuration>
+							<includes>**/*</includes>
-								<executions>
+							<excludes>
-										<!-- the default-test execution runs only the unit tests -->
+								.git/**/*,target/**/*,**/target/**/*,.idea/**/*,**/spring.schemas,**/*.svg,mvnw,mvnw.cmd,**/*.policy
-										<execution>
+							</excludes>
-												<id>default-test</id>
+							<sourceDirectories>./</sourceDirectories>
-												<phase>${mvn.unit-test.goal}</phase>
+						</configuration>
-												<goals>
+					</plugin>
 														<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>
 								</executions>
 						</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>
+			</build>
 		</profile>
-		<profiles>
+		<profile>
-				<profile>
+			<id>jdk13+</id>
-						<id>ci</id>
+			<!-- on jDK13+, Blockhound needs this JVM flag set -->
-						<build>
+			<activation>
-								<plugins>
+				<jdk>[13,)</jdk>
-										<plugin>
+			</activation>
-												<groupId>org.apache.maven.plugins</groupId>
+			<build>
-												<artifactId>maven-checkstyle-plugin</artifactId>
+				<plugins>
-												<configuration>
+					<plugin>
-														<checkstyleRules>
+						<groupId>org.apache.maven.plugins</groupId>
-																<module name="Checker">
+						<artifactId>maven-surefire-plugin</artifactId>
 						<configuration>
 							<argLine>-XX:+AllowRedefinitionToAddDeleteMethods</argLine>
 						</configuration>
 					</plugin>
 				</plugins>
 			</build>
 		</profile>
 	</profiles>
-																		<!-- Configure checker to use UTF-8 encoding -->
+	<repositories>
-																		<property name="charset" value="UTF-8"/>
+		
-
+		
-																		<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck"/>
+	</repositories>
 																</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-libs-release</id>
 						<url>https://repo.spring.io/libs-release</url>
 				</repository>
 				<repository>
 						<id>local-maven-repo</id>
 						<url>file:///${project.basedir}/src/test/resources/local-maven-repo</url>
 				</repository>
 		</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
+* Release repository - https://repo1.maven.org/maven2/
-* Milestone repository - https://repo.spring.io/libs-milestone
+* Milestone repository - https://repo.spring.io/milestone/
-* Snapshot repository - https://repo.spring.io/libs-snapshot
+* Snapshot repository - https://repo.spring.io/snapshot/
 [[preface.requirements]]
 == Requirements
@@ -37,7 +37,7 @@ built and tested.
 [cols="^,^,^,^,^",options="header"]
 |===
 | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot
-| 2023.0 (Ullmann) | 5.1.x | 8.7.0 | 6.0.x | 3.1.x
+| 2023.0 (Ullmann) | 5.1.x | 8.7.1 | 6.0.x | 3.1.x
 | 2022.0 (Turing) | 5.0.x | 8.5.3 | 6.0.x | 3.0.x
 | 2021.2 (Raj) | 4.4.xfootnote:oom[Out of maintenance] | 7.17.3 | 5.3.x | 2.7.x
 | 2021.1 (Q) | 4.3.xfootnote:oom[] | 7.15.2 | 5.3.x | 2.6.x
@@ -15,4 +15,6 @@ include::elasticsearch-migration-guide-4.3-4.4.adoc[]
 include::elasticsearch-migration-guide-4.4-5.0.adoc[]
 include::elasticsearch-migration-guide-5.0-5.1.adoc[]
 :leveloffset: -1
@@ -16,18 +16,25 @@
 package org.springframework.data.elasticsearch.client.elc;
 import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
-import static org.springframework.util.CollectionUtils.isEmpty;
+import static org.springframework.util.CollectionUtils.*;
-import co.elastic.clients.elasticsearch._types.*;
+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;
 import co.elastic.clients.elasticsearch._types.SortOrder;
 import co.elastic.clients.elasticsearch._types.VersionType;
 import co.elastic.clients.elasticsearch._types.WaitForActiveShardOptions;
 import co.elastic.clients.elasticsearch._types.mapping.FieldType;
 import co.elastic.clients.elasticsearch._types.mapping.RuntimeField;
 import co.elastic.clients.elasticsearch._types.mapping.RuntimeFieldType;
 import co.elastic.clients.elasticsearch._types.query_dsl.FieldAndFormat;
 import co.elastic.clients.elasticsearch._types.query_dsl.Like;
 import co.elastic.clients.elasticsearch.cluster.*;
 import co.elastic.clients.elasticsearch.cluster.DeleteComponentTemplateRequest;
 import co.elastic.clients.elasticsearch.cluster.ExistsComponentTemplateRequest;
 import co.elastic.clients.elasticsearch.cluster.GetComponentTemplateRequest;
 import co.elastic.clients.elasticsearch.cluster.HealthRequest;
 import co.elastic.clients.elasticsearch.cluster.PutComponentTemplateRequest;
 import co.elastic.clients.elasticsearch.core.*;
 import co.elastic.clients.elasticsearch.core.bulk.BulkOperation;
@@ -52,7 +59,13 @@ import java.io.ByteArrayInputStream;
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
-import java.util.*;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -1233,11 +1246,9 @@ class RequestConverter {
 							}
 							if (!isEmpty(query.getIndicesBoost())) {
-								Map<String, Double> boosts = new LinkedHashMap<>();
+								bb.indicesBoost(query.getIndicesBoost().stream()
-								query.getIndicesBoost()
+										.map(indexBoost -> Map.of(indexBoost.getIndexName(), Double.valueOf(indexBoost.getBoost())))
-										.forEach(indexBoost -> boosts.put(indexBoost.getIndexName(), (double) indexBoost.getBoost()));
+										.collect(Collectors.toList()));
 								// noinspection unchecked
 								bb.indicesBoost(boosts);
 							}
 							query.getScriptedFields().forEach(scriptedField -> bb.scriptFields(scriptedField.getFieldName(),
@@ -1399,11 +1410,9 @@ class RequestConverter {
 		}
 		if (!isEmpty(query.getIndicesBoost())) {
-			Map<String, Double> boosts = new LinkedHashMap<>();
+			builder.indicesBoost(query.getIndicesBoost().stream()
-			query.getIndicesBoost()
+					.map(indexBoost -> Map.of(indexBoost.getIndexName(), Double.valueOf(indexBoost.getBoost())))
-					.forEach(indexBoost -> boosts.put(indexBoost.getIndexName(), (double) indexBoost.getBoost()));
+					.collect(Collectors.toList()));
 			// noinspection unchecked
 			builder.indicesBoost(boosts);
 		}
 		if (!isEmpty(query.getDocValueFields())) {
@@ -1477,8 +1486,9 @@ class RequestConverter {
 				return SortOptions.of(so -> so //
 						.geoDistance(gd -> gd //
 								.field(fieldName) //
-								.location(loc -> loc.latlon(Queries.latLon(geoDistanceOrder.getGeoPoint())))//
+								.location(loc -> loc.latlon(Queries.latLon(geoDistanceOrder.getGeoPoint()))) //
 								.distanceType(geoDistanceType(geoDistanceOrder.getDistanceType())).mode(sortMode(finalMode)) //
 								.order(sortOrder(geoDistanceOrder.getDirection())) //
 								.unit(distanceUnit(geoDistanceOrder.getUnit())) //
 								.ignoreUnmapped(geoDistanceOrder.getIgnoreUnmapped())));
 			} else {
@@ -1537,8 +1547,11 @@ class RequestConverter {
 		builder //
 				.suggest(query.getSuggester()) //
 				.collapse(query.getFieldCollapse()) //
-				.sort(query.getSortOptions()) //
+				.sort(query.getSortOptions());
-				.knn(query.getKnnQuery());
+
 		if (query.getKnnQuery() != null) {
 			builder.knn(query.getKnnQuery());
 		}
 		if (!isEmpty(query.getAggregations())) {
 			builder.aggregations(query.getAggregations());
@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.core.RefreshPolicy;
 import org.springframework.data.elasticsearch.core.document.Document;
 import org.springframework.data.elasticsearch.core.query.*;
@@ -165,6 +166,20 @@ final class TypeUtils {
 	}
 	@Nullable
 	static SortOrder sortOrder(@Nullable Sort.Direction direction) {
 		if (direction == null) {
 			return null;
 		}
 		return switch (direction) {
 			case ASC -> SortOrder.Asc;
 			case DESC -> SortOrder.Desc;
 		};
 	}
 	@Nullable
 	static HighlighterFragmenter highlighterFragmenter(@Nullable String value) {
@@ -348,8 +348,8 @@ class RequestFactory {
 					for (String aliasName : parametersAliases) {
 						Alias alias = new Alias(aliasName);
-							//noinspection DuplicatedCode
+						// noinspection DuplicatedCode
-							if (parameters.getRouting() != null) {
+						if (parameters.getRouting() != null) {
 							alias.routing(parameters.getRouting());
 						}
@@ -526,7 +526,8 @@ class RequestFactory {
 	// endregion
 	// region delete
-	public DeleteByQueryRequest deleteByQueryRequest(Query query, @Nullable String routing,  Class<?> clazz, IndexCoordinates index) {
+	public DeleteByQueryRequest deleteByQueryRequest(Query query, @Nullable String routing, Class<?> clazz,
 			IndexCoordinates index) {
 		SearchRequest searchRequest = searchRequest(query, routing, clazz, index);
 		DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest(index.getIndexNames()) //
 				.setQuery(searchRequest.source().query()) //
@@ -754,10 +755,11 @@ class RequestFactory {
 		return searchRequest;
 	}
-	public SearchRequest searchRequest(Query query, @Nullable String routing, @Nullable Class<?> clazz, IndexCoordinates index) {
+	public SearchRequest searchRequest(Query query, @Nullable String routing, @Nullable Class<?> clazz,
 			IndexCoordinates index) {
 		elasticsearchConverter.updateQuery(query, clazz);
-		SearchRequest searchRequest = prepareSearchRequest(query, routing,clazz, index);
+		SearchRequest searchRequest = prepareSearchRequest(query, routing, clazz, index);
 		QueryBuilder elasticsearchQuery = getQuery(query);
 		QueryBuilder elasticsearchFilter = getFilter(query);
@@ -771,7 +773,8 @@ class RequestFactory {
 	}
-	private SearchRequest prepareSearchRequest(Query query, @Nullable String routing, @Nullable Class<?> clazz, IndexCoordinates indexCoordinates) {
+	private SearchRequest prepareSearchRequest(Query query, @Nullable String routing, @Nullable Class<?> clazz,
 			IndexCoordinates indexCoordinates) {
 		String[] indexNames = indexCoordinates.getIndexNames();
 		Assert.notNull(indexNames, "No index defined for Query");
@@ -968,6 +971,8 @@ class RequestFactory {
 					sort.ignoreUnmapped(geoDistanceOrder.getIgnoreUnmapped());
 				}
 				sort.order(order.isAscending() ? SortOrder.ASC : SortOrder.DESC);
 				return sort;
 			} else {
 				FieldSortBuilder sort = SortBuilders //
@@ -225,42 +225,42 @@ abstract public class AbstractReactiveElasticsearchTemplate
 		return Flux.defer(() -> {
 			Sinks.Many<T> sink = Sinks.many().unicast().onBackpressureBuffer();
-			entities //
+			entities.window(bulkSize) //
-					.bufferTimeout(bulkSize, Duration.ofMillis(200)) //
+							.concatMap(flux -> flux.collectList()) //
-					.subscribe(new Subscriber<List<T>>() {
+							.subscribe(new Subscriber<List<T>>() {
-						private Subscription subscription;
+				private Subscription subscription;
-						private AtomicBoolean upstreamComplete = new AtomicBoolean(false);
+				private AtomicBoolean upstreamComplete = new AtomicBoolean(false);
-						@Override
+				@Override
-						public void onSubscribe(Subscription subscription) {
+				public void onSubscribe(Subscription subscription) {
-							this.subscription = subscription;
+					this.subscription = subscription;
-							subscription.request(1);
+					subscription.request(1);
-						}
+				}
-						@Override
+				@Override
-						public void onNext(List<T> entityList) {
+				public void onNext(List<T> entityList) {
-							saveAll(entityList, index) //
+					saveAll(entityList, index) //
-									.map(sink::tryEmitNext) //
+							.map(sink::tryEmitNext) //
-									.doOnComplete(() -> {
+							.doOnComplete(() -> {
-										if (!upstreamComplete.get()) {
+								if (!upstreamComplete.get()) {
-											subscription.request(1);
+									subscription.request(1);
-										} else {
+								} else {
-											sink.tryEmitComplete();
+									sink.tryEmitComplete();
-										}
+								}
-									}).subscribe();
+							}).subscribe();
-						}
+				}
-						@Override
+				@Override
-						public void onError(Throwable throwable) {
+				public void onError(Throwable throwable) {
-							subscription.cancel();
+					subscription.cancel();
-							sink.tryEmitError(throwable);
+					sink.tryEmitError(throwable);
-						}
+				}
-						@Override
+				@Override
-						public void onComplete() {
+				public void onComplete() {
-							upstreamComplete.set(true);
+					upstreamComplete.set(true);
-						}
+				}
-					});
+			});
 			return sink.asFlux();
 		});
@@ -919,7 +919,7 @@ public class MappingElasticsearchConverter
 				Class<?> elementType = element == null ? null : element.getClass();
-				if (elementType == null || conversions.isSimpleType(elementType)) {
+				if (elementType == null || isSimpleType(elementType)) {
 					collection.add(getPotentiallyConvertedSimpleWrite(element,
 							componentType != null ? componentType.getType() : Object.class));
 				} else if (element instanceof Collection || elementType.isArray()) {
@@ -332,6 +332,8 @@ public final class MappingParameters {
 		if (!Similarity.Default.equals(similarity)) {
 			objectNode.put(FIELD_PARAM_SIMILARITY, similarity);
 			// similarity must have index explicitly set, otherwise Elasticsearch returns an error
 			objectNode.put(FIELD_PARAM_INDEX, index);
 		}
 		if (termVector != TermVector.none) {
@@ -74,7 +74,7 @@ public class BaseQuery implements Query {
 	protected List<RescorerQuery> rescorerQueries = new ArrayList<>();
 	@Nullable protected Boolean requestCache;
 	protected List<IdWithRouting> idsWithRouting = Collections.emptyList();
-	protected final List<RuntimeField> runtimeFields = new ArrayList<>();
+	protected List<RuntimeField> runtimeFields = new ArrayList<>();
 	@Nullable protected PointInTime pointInTime;
 	private boolean queryIsUpdatedByConverter = false;
 	@Nullable private Integer reactiveBatchSize = null;
@@ -117,6 +117,7 @@ public class BaseQuery implements Query {
 		this.expandWildcards = builder.getExpandWildcards();
 		this.docValueFields = builder.getDocValueFields();
 		this.scriptedFields = builder.getScriptedFields();
 		this.runtimeFields = builder.getRuntimeFields();
 	}
 	/**
@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 5.1 GA (2023.0.0)
+Spring Data Elasticsearch 5.1.3 (2023.0.3)
 Copyright (c) [2013-2022] Pivotal Software, Inc.
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -13,3 +13,6 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
@@ -28,6 +28,7 @@ import java.lang.Boolean;
 import java.lang.Integer;
 import java.lang.Long;
 import java.lang.Object;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -1181,7 +1182,7 @@ public abstract class ReactiveElasticsearchIntegrationTests {
 				}).verifyComplete();
 	}
-	@Test // #2496
+	@Test // #2496, #2576
 	@DisplayName("should save data from Flux and return saved data in a flux")
 	void shouldSaveDataFromFluxAndReturnSavedDataInAFlux() {
@@ -1190,9 +1191,11 @@ public abstract class ReactiveElasticsearchIntegrationTests {
 				.mapToObj(SampleEntity::of) //
 				.collect(Collectors.toList());
-		var entityFlux = Flux.fromIterable(entityList);
+		// we add a random delay to make suure the underlying implementation handles irregular incoming data
 		var entities = Flux.fromIterable(entityList).concatMap(
 				entity -> Mono.just(entity).delay(Duration.ofMillis((long) (Math.random() * 10))).thenReturn(entity));
-		operations.save(entityFlux, SampleEntity.class).collectList() //
+		operations.save(entities, SampleEntity.class).collectList() //
 				.as(StepVerifier::create) //
 				.consumeNextWith(savedEntities -> {
 					assertThat(savedEntities).isEqualTo(entityList);
@@ -909,6 +909,55 @@ public class MappingElasticsearchConverterUnitTests {
 		assertEquals(expected, document.toJson(), false);
 	}
 	@Test // #2627
 	@DisplayName("should write Map containing collection containing map")
 	void shouldWriteMapContainingCollectionContainingMap() throws JSONException {
 		class EntityWithMapCollectionMap {
 			Map<String, Object> map;
 		}
 		class InnerEntity {
 			String prop1;
 			String prop2;
 			public InnerEntity() {}
 			public InnerEntity(String prop1, String prop2) {
 				this.prop1 = prop1;
 				this.prop2 = prop2;
 			}
 		}
 		var entity = new EntityWithMapCollectionMap();
 		entity.map = Collections.singletonMap("collection",
 				Collections.singletonList(Collections.singletonMap("destination", new InnerEntity("prop1", "prop2"))));
 		var expected = """
 				{
 					"_class": "org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverterUnitTests$1EntityWithMapCollectionMap",
 					"map": {
 						"collection": [
 							{
 								"destination": {
 									"_class": "org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverterUnitTests$1InnerEntity",
 									"prop1": "prop1",
 									"prop2": "prop2"
 								}
 							}
 						]
 					}
 				}
 				""";
 		Document document = Document.create();
 		mappingElasticsearchConverter.write(entity, document);
 		assertEquals(expected, document.toJson(), false);
 	}
 	@Nested
 	class RangeTests {
@@ -1953,12 +2002,12 @@ public class MappingElasticsearchConverterUnitTests {
 		@Language("JSON")
 		var expected = """
-				{
+					{
-					"_class": "org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverterUnitTests$FieldNameDotsEntity",
+						"_class": "org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverterUnitTests$FieldNameDotsEntity",
-					"id": "42",
+						"id": "42",
-					"dotted.field": "dotted field"
+						"dotted.field": "dotted field"
-				}
+					}
-			""";
+				""";
 		var entity = new FieldNameDotsEntity();
 		entity.setId("42");
 		entity.setDottedField("dotted field");
@@ -3192,6 +3241,7 @@ public class MappingElasticsearchConverterUnitTests {
 			this.mapToNotWriteWhenEmpty = mapToNotWriteWhenEmpty;
 		}
 	}
 	static class FieldNameDotsEntity {
 		@Id
 		@Nullable private String id;
@@ -287,6 +287,12 @@ public abstract class MappingBuilderIntegrationTests extends MappingContextBaseT
 		indexOps.createWithMapping();
 	}
 	@Test // #2659
 	@DisplayName("should write correct mapping for dense vector property")
 	void shouldWriteCorrectMappingForDenseVectorProperty() {
 		operations.indexOps(SimilarityEntity.class).createWithMapping();
 	}
 	// region Entities
 	@Document(indexName = "#{@indexNameProvider.indexName()}")
 	static class Book {
@@ -916,5 +922,14 @@ public abstract class MappingBuilderIntegrationTests extends MappingContextBaseT
 		@Nullable
 		@Field(name = "dotted.field", type = Text) private String dottedField;
 	}
 	@Document(indexName = "#{@indexNameProvider.indexName()}")
 	static class SimilarityEntity {
 		@Nullable
 		@Id private String id;
 		@Field(type = FieldType.Dense_Vector, dims = 42, similarity = "cosine") private double[] denseVector;
 	}
 	// endregion
 }
@@ -1590,6 +1590,41 @@ public abstract class CustomMethodRepositoryIntegrationTests implements NewElast
 		assertThat(searchHits.getSearchHit(2).getId()).isEqualTo("oslo");
 	}
 	@Test // #2601
 	void shouldUseGeoSortReverseParameter() {
 		GeoPoint munich = new GeoPoint(48.137154, 11.5761247);
 		GeoPoint berlin = new GeoPoint(52.520008, 13.404954);
 		GeoPoint vienna = new GeoPoint(48.20849, 16.37208);
 		GeoPoint oslo = new GeoPoint(59.9127, 10.7461);
 		List<SampleEntity> entities = new ArrayList<>();
 		SampleEntity entity1 = new SampleEntity();
 		entity1.setId("berlin");
 		entity1.setLocation(berlin);
 		entities.add(entity1);
 		SampleEntity entity2 = new SampleEntity();
 		entity2.setId("vienna");
 		entity2.setLocation(vienna);
 		entities.add(entity2);
 		SampleEntity entity3 = new SampleEntity();
 		entity3.setId("oslo");
 		entity3.setLocation(oslo);
 		entities.add(entity3);
 		repository.saveAll(entities);
 		SearchHits<SampleEntity> searchHits = repository
 				.searchBy(Sort.by(new GeoDistanceOrder("location", munich).with(Sort.Direction.DESC)));
 		assertThat(searchHits.getTotalHits()).isEqualTo(3);
 		assertThat(searchHits.getSearchHit(0).getId()).isEqualTo("oslo");
 		assertThat(searchHits.getSearchHit(1).getId()).isEqualTo("berlin");
 		assertThat(searchHits.getSearchHit(2).getId()).isEqualTo("vienna");
 	}
 	@Test // DATAES-749
 	void shouldReturnSearchPage() {
 		List<SampleEntity> entities = createSampleEntities("abc", 20);
@@ -15,7 +15,7 @@
 #
 #
 sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch
-sde.testcontainers.image-version=8.7.0
+sde.testcontainers.image-version=8.7.1
 #
 #
 # 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
Author	SHA1	Message	Date
Mark Paluch	3f085b2675	Release version 5.1.3 (2023.0.3). See #2631	2023-08-18 14:04:04 +02:00
Mark Paluch	42aeb48b43	Prepare 5.1.3 (2023.0.3). See #2631	2023-08-18 14:03:49 +02:00
Julia Lee	449910b4f7	Update CI properties. See #2631	2023-08-14 11:29:43 -04:00
Julia Lee	2e99f5b2e0	Upgrade to Maven Wrapper 3.9.4. See #2669	2023-08-14 07:55:32 -04:00
Peter-Josef Meisch	9b9136d852	Fix similarity field mapping. Original Pull Request #2666 Closes #2659 (cherry picked from commit `8c5ff92cd2`)	2023-08-13 21:40:31 +02:00
Peter-Josef Meisch	a266d7c46a	Upgrade deprecated dependency to Elasticsearch 7.17.12. Original Pull Request #2655 #Closes #2651	2023-07-30 19:51:01 +02:00
Peter-Josef Meisch	c045a8ae29	Fix MappingElasticsearchConverter. Original Pull Request #2637 Closes #2627 (cherry picked from commit `d9bb9911f9`)	2023-07-18 22:51:45 +02:00
Mark Paluch	11c87a1251	After release cleanups. See #2595	2023-07-14 13:57:59 +02:00
Mark Paluch	c9e9bf757e	Prepare next development iteration. See #2595	2023-07-14 13:57:58 +02:00
Mark Paluch	db8d89aeff	Release version 5.1.2 (2023.0.2). See #2595	2023-07-14 13:54:08 +02:00
Mark Paluch	0ed14e7caa	Prepare 5.1.2 (2023.0.2). See #2595	2023-07-14 13:52:55 +02:00
Peter-Josef Meisch	d0658affc3	Upgrade to Elasticsearch 7.17.11. Original Pull Request #2625 Closes #2622	2023-07-12 20:05:40 +02:00
Mark Paluch	7c10128cec	Update CI properties. See #2595	2023-07-03 09:49:00 +02:00
Mark Paluch	6e3535d68d	Upgrade to Maven Wrapper 3.9.3. See #2614	2023-07-03 09:48:29 +02:00
Peter-Josef Meisch	121b47e1be	Fix IndicesBoost error. Original Pull Request #2606 Closes #2598 (cherry picked from commit `d9fd722bb6`)	2023-06-27 22:28:16 +02:00
Greg L. Turnquist	3abe6d9c1b	Stop posting build status on internal Slack. See #2603	2023-06-26 13:38:20 -05:00
seunghyun.cheong	d43b44ba9c	Adding GeoDistanceOrder's direction in request. Original Pull Request #2602 Closes #2601 (cherry picked from commit `8a164b1039`) Polishing (cherry picked from commit `b7570ffa95`) add implementation for old client	2023-06-24 11:16:14 +02:00
John Blum	a715d2836d	After release cleanups. See #2548	2023-06-16 08:13:31 -07:00
John Blum	a69b95867a	Prepare next development iteration. See #2548	2023-06-16 08:13:28 -07:00
John Blum	d424195c8b	Release version 5.1.1 (2023.0.1). See #2548	2023-06-16 08:05:37 -07:00
John Blum	44d1614a20	Prepare 5.1.1 (2023.0.1). See #2548	2023-06-16 08:05:07 -07:00
Mark Paluch	7b6823cc31	Upgrade to Maven Wrapper 3.9.2. See #2588	2023-06-13 08:54:05 +02:00
Mark Paluch	2e43c7800b	Reformat pom.xml. See #2585	2023-06-06 10:57:04 +02:00
Mark Paluch	59968e8118	Use snapshot and milestone repositories instead of libs-snapshot and libs-milestone. Closes #2585	2023-06-06 10:56:48 +02:00
Peter-Josef Meisch	a5934442bf	Fix reactive save of Flux. Original Pull Request #2581 Closes #2576 (cherry picked from commit `d6b5540614`)	2023-06-02 17:39:16 +02:00
Peter-Josef Meisch	89afa819f3	Polishing (cherry picked from commit `6edd3cf1fe`)	2023-05-17 20:23:23 +02:00
Pierre Mazieres @Semarchy	5561a5b1ae	"BaseQuery" class : the "build" method does not apply to the "runtimeFields" field. Original Pull Request #2568 Closes #2567 (cherry picked from commit `7b527c4451`)	2023-05-17 20:23:23 +02:00
Peter-Josef Meisch	23a5071ee5	Upgrade to Elasticsearch 8.7.1. Closes #2541 (cherry picked from commit `af924c2cbc`)	2023-05-12 22:35:53 +02:00
Peter-Josef Meisch	d1324a26db	Documentation misses link to migration page 5.0 -> 5.1. Original Pull Request #2554 Closes #2553	2023-05-12 18:59:21 +02:00
Mark Paluch	34e3e8f5da	Update Jenkins triggers after GA release. See #2532	2023-05-12 14:47:15 +02:00
Christoph Strobl	1571b9b4e2	After release cleanups. See #2532	2023-05-12 14:19:11 +02:00
Christoph Strobl	78e7dd2764	Prepare next development iteration. See #2532	2023-05-12 14:19:10 +02:00