Extend license header copyright years to 2024.

See #2816
Introduce property for Jenkins user and Artifactory server details.
2026-05-26 14:13:18 +00:00 · 2024-01-02 09:24:14 +01:00 · 2023-11-27 11:19:07 +01:00 · 2023-11-17 11:00:18 +01:00 · 2023-11-17 11:00:16 +01:00 · 2023-11-17 10:57:14 +01:00
646 changed files with 1395 additions and 867 deletions
@@ -1,3 +1,3 @@
-#Mon Feb 20 11:59:41 CET 2023
+#Wed Oct 04 18:24:26 PDT 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.0/apache-maven-3.9.0-bin.zip
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
@@ -1,7 +1,7 @@
 def p = [:]
 node {
-    checkout scm
-    p = readProperties interpolate: true, file: 'ci/pipeline.properties'
+		checkout scm
+		p = readProperties interpolate: true, file: 'ci/pipeline.properties'
 }

 pipeline {
@@ -18,7 +18,7 @@ pipeline {
 	}

 	stages {
-		stage("test: baseline (Java 17)") {
+		stage("test: baseline (main)") {
 			when {
 				beforeAgent(true)
 				anyOf {
@@ -32,17 +32,42 @@ pipeline {
 			options { timeout(time: 30, unit: 'MINUTES') }

 			environment {
-				DOCKER_HUB = credentials("${p['docker.credentials']}")
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}

 			steps {
 				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
-							sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
-							sh 'PROFILE=none ci/verify.sh'
-							sh "ci/clean.sh"
+					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+						sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/verify.sh"
+						sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
+					}
+				}
+			}
+		}
+
+		stage("Test other configurations") {
+			when {
+				beforeAgent(true)
+				allOf {
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			parallel {
+				stage("test: baseline (next)") {
+					agent {
+						label 'data'
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+					}
+					steps {
+						script {
+							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+								sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/verify.sh"
+								sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
+							}
 						}
 					}
 				}
@@ -61,24 +86,21 @@ pipeline {
 				label 'data'
 			}
 			options { timeout(time: 20, unit: 'MINUTES') }
-
 			environment {
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
 			}
-
 			steps {
 				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
-							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
-									'-Dartifactory.server=https://repo.spring.io ' +
-									"-Dartifactory.username=${ARTIFACTORY_USR} " +
-									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-									"-Dartifactory.staging-repository=libs-snapshot-local " +
-									"-Dartifactory.build-name=spring-data-elasticsearch " +
-									"-Dartifactory.build-number=${BUILD_NUMBER} " +
-									'-Dmaven.test.skip=true clean deploy -U -B'
-						}
+					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
+							sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
+								"./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root " +
+								"-Dartifactory.server=${p['artifactory.url']} " +
+								"-Dartifactory.username=${ARTIFACTORY_USR} " +
+								"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+								"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
+								"-Dartifactory.build-name=spring-data-elasticsearch " +
+								"-Dartifactory.build-number=${BUILD_NUMBER} " +
+								"-Dmaven.test.skip=true clean deploy -U -B"
 					}
 				}
 			}
@@ -88,10 +110,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>
 ----

@@ -2,5 +2,7 @@

 set -euo pipefail

-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
+export JENKINS_USER=${JENKINS_USER_NAME}
+
+MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
  ./mvnw -s settings.xml clean -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch
@@ -1,19 +1,21 @@
 # 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
 docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
+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.5.0.version=5.0.14
-docker.mongodb.6.0.version=6.0.4
+docker.mongodb.4.4.version=4.4.25
+docker.mongodb.5.0.version=5.0.21
+docker.mongodb.6.0.version=6.0.10

 # 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.16

 # Docker environment settings
 docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
@@ -23,3 +25,6 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
 docker.registry=
 docker.credentials=hub.docker.com-springbuildmaster
 artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
+artifactory.url=https://repo.spring.io
+artifactory.repository.snapshot=libs-snapshot-local
+jenkins.user.name=spring-builds+jenkins
@@ -5,6 +5,8 @@ set -euo pipefail
 mkdir -p /tmp/jenkins-home/.m2/spring-data-elasticsearch
 chown -R 1001:1001 .

-MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
+export JENKINS_USER=${JENKINS_USER_NAME}
+
+MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
  ./mvnw -s settings.xml \
-  -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch
+  -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch
@@ -5,12 +5,12 @@

 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>5.0.3</version>
+	<version>5.0.13-SNAPSHOT</version>

 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.0.3</version>
+		<version>3.0.13-SNAPSHOT</version>
 	</parent>

 	<name>Spring Data Elasticsearch</name>
@@ -18,17 +18,17 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>

 	<properties>
-		<springdata.commons>3.0.3</springdata.commons>
+		<springdata.commons>3.0.13-SNAPSHOT</springdata.commons>

 		<!-- version of the RestHighLevelClient	-->
-		<elasticsearch-rhlc>7.17.9</elasticsearch-rhlc>
+		<elasticsearch-rhlc>7.17.15</elasticsearch-rhlc>
 		<!-- version of the new ElasticsearchClient	-->
 		<elasticsearch-java>8.5.3</elasticsearch-java>

 		<log4j>2.18.0</log4j>
 		<netty>4.1.65.Final</netty>

-		<blockhound-junit>1.0.6.RELEASE</blockhound-junit>
+		<blockhound-junit>1.0.7.RELEASE</blockhound-junit>
 		<hoverfly>0.14.3</hoverfly>
 		<jsonassert>1.5.1</jsonassert>
 		<testcontainers>1.17.3</testcontainers>
@@ -279,24 +279,6 @@
 			<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>
@@ -466,7 +448,7 @@
 				<groupId>org.asciidoctor</groupId>
 				<artifactId>asciidoctor-maven-plugin</artifactId>
 			</plugin>
-        </plugins>
+		</plugins>
 	</build>

 	<profiles>
@@ -520,22 +502,19 @@

 	<repositories>
 		<repository>
-			<id>spring-libs-release</id>
-			<url>https://repo.spring.io/libs-release</url>
+			<id>spring-snapshot</id>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
 		</repository>
-
 		<repository>
-			<id>local-maven-repo</id>
-			<url>file:///${project.basedir}/src/test/resources/local-maven-repo</url>
+			<id>spring-milestone</id>
+			<url>https://repo.spring.io/milestone</url>
 		</repository>
-
 	</repositories>

-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-plugins-release</id>
-			<url>https://repo.spring.io/plugins-release</url>
-		</pluginRepository>
-	</pluginRepositories>
-
 </project>
@@ -5,7 +5,7 @@ BioMed Central Development Team; Oliver Drotbohm; Greg Turnquist; Christoph Stro
 ifdef::backend-epub3[:front-cover-image: image:epub-cover.png[Front Cover,1050,1600]]
 :spring-data-commons-docs: ../../../../spring-data-commons/src/main/asciidoc

-(C) 2013-2022 The original author(s).
+(C) 2013-2024 The original author(s).

 NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically.

@@ -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
@@ -154,7 +154,7 @@ The old deprecated `RestHighLevelClient` can still be used, but you will need to
 <dependency>
 	<groupId>org.elasticsearch.client</groupId>
 	<artifactId>elasticsearch-rest-high-level-client</artifactId>
-	<version>7.17.9</version>
+	<version>7.17.12</version>
 	<exclusions>
 		<exclusion>
 			<groupId>commons-logging</groupId>
@@ -165,4 +165,4 @@ The old deprecated `RestHighLevelClient` can still be used, but you will need to
 ----
 ====

-Make sure to specify the version 7.17.9 explicitly, otherwise maven will resolve to 8.5.3, and this does not exist.
+Make sure to specify the version 7.17.12 explicitly, otherwise maven will resolve to 8.5.3, and this does not exist.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 the original author or authors.
+ * Copyright 2020-2024 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-2023 the original author or authors.
+ * Copyright 2022-2024 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-2023 the original author or authors.
+ * Copyright 2019-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2020-2024 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-2023 the original author or authors.
+ * Copyright 2019-2024 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-2023 the original author or authors.
+ * Copyright 2013-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2014-2024 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-2023 the original author or authors.
+ * Copyright 2013-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2013-2024 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-2023 the original author or authors.
+ * Copyright 2013-2024 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-2023 the original author or authors.
+ * Copyright 2013-2024 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-2023 the original author or authors.
+ * Copyright 2017-2024 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-2023 the original author or authors.
+ * Copyright 2020-2024 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-2023 the original author or authors.
+ * Copyright 2020-2024 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-2023 the original author or authors.
+ * Copyright 2020-2024 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-2023 the original author or authors.
+ * Copyright 2019-2024 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-2023 the original author or authors.
+ * Copyright 2019-2024 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-2023 the original author or authors.
+ * Copyright 2014-2024 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-2023 the original author or authors.
+ * Copyright 2020-2024 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-2023 the original author or authors.
+ * Copyright 2020-2024 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-2023 the original author or authors.
+ * Copyright 2014-2024 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-2023 the original author or authors.
+ * Copyright 2014-2024 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-2023 the original author or authors.
+ * Copyright 2020-2024 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-2023 the original author or authors.
+ * Copyright 2013-2024 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-2023 the original author or authors.
+ * Copyright 2014-2024 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-2023 the original author or authors.
+ * Copyright 2019-2024 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-2023 the original author or authors.
+ * Copyright 2022-2024 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-2023 the original author or authors.
+ * Copyright 2019-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2022-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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 2023 the original author or authors.
+ * Copyright 2023-2024 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 2023 the original author or authors.
+ * Copyright 2023-2024 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-2023 the original author or authors.
+ * Copyright 2018-2024 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-2023 the original author or authors.
+ * Copyright 2018-2024 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-2023 the original author or authors.
+ * Copyright 2018-2024 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-2023 the original author or authors.
+ * Copyright 2018-2024 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-2023 the original author or authors.
+ * Copyright 2018-2024 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-2023 the original author or authors.
+ * Copyright 2018-2024 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-2023 the original author or authors.
+ * Copyright 2018-2024 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-2023 the original author or authors.
+ * Copyright 2022-2024 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-2023 the original author or authors.
+ * Copyright 2022-2024 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-2023 the original author or authors.
+ * Copyright 2022-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2022-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2022-2024 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-2023 the original author or authors.
+ * Copyright 2022-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2022-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2022-2024 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.
@@ -184,7 +184,7 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer

 		Assert.notNull(searchExtensions, "searchExtensions must not be null");

-		searchExtensions.putAll(searchExtensions);
+		this.searchExtensions.putAll(searchExtensions);
 		return this;
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2022-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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.
@@ -15,15 +15,10 @@
 */
 package org.springframework.data.elasticsearch.client.elc;

-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.searchType;
-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.slices;
-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.time;
-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.timeStringMs;
-import static org.springframework.data.elasticsearch.client.elc.TypeUtils.toFloat;
-import static org.springframework.util.CollectionUtils.isEmpty;
+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;
@@ -35,20 +30,10 @@ import co.elastic.clients.elasticsearch._types.mapping.Property;
 import co.elastic.clients.elasticsearch._types.mapping.RuntimeField;
 import co.elastic.clients.elasticsearch._types.mapping.RuntimeFieldType;
 import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
+import co.elastic.clients.elasticsearch._types.query_dsl.FieldAndFormat;
 import co.elastic.clients.elasticsearch._types.query_dsl.Like;
 import co.elastic.clients.elasticsearch.cluster.HealthRequest;
-import co.elastic.clients.elasticsearch.core.BulkRequest;
-import co.elastic.clients.elasticsearch.core.ClosePointInTimeRequest;
-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.OpenPointInTimeRequest;
-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.*;
 import co.elastic.clients.elasticsearch.core.bulk.BulkOperation;
 import co.elastic.clients.elasticsearch.core.bulk.CreateOperation;
 import co.elastic.clients.elasticsearch.core.bulk.IndexOperation;
@@ -58,17 +43,8 @@ import co.elastic.clients.elasticsearch.core.msearch.MultisearchBody;
 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.CreateIndexRequest;
-import co.elastic.clients.elasticsearch.indices.DeleteIndexRequest;
+import co.elastic.clients.elasticsearch.indices.*;
 import co.elastic.clients.elasticsearch.indices.ExistsRequest;
-import co.elastic.clients.elasticsearch.indices.GetAliasRequest;
-import co.elastic.clients.elasticsearch.indices.GetIndexRequest;
-import co.elastic.clients.elasticsearch.indices.GetIndicesSettingsRequest;
-import co.elastic.clients.elasticsearch.indices.GetMappingRequest;
-import co.elastic.clients.elasticsearch.indices.IndexSettings;
-import co.elastic.clients.elasticsearch.indices.PutMappingRequest;
-import co.elastic.clients.elasticsearch.indices.RefreshRequest;
-import co.elastic.clients.elasticsearch.indices.UpdateAliasesRequest;
 import co.elastic.clients.elasticsearch.indices.update_aliases.Action;
 import co.elastic.clients.json.JsonData;
 import co.elastic.clients.json.JsonpDeserializer;
@@ -85,7 +61,6 @@ 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;
@@ -107,19 +82,7 @@ import org.springframework.data.elasticsearch.core.index.PutTemplateRequest;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
-import org.springframework.data.elasticsearch.core.query.BaseQuery;
-import org.springframework.data.elasticsearch.core.query.BulkOptions;
-import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
-import org.springframework.data.elasticsearch.core.query.GeoDistanceOrder;
-import org.springframework.data.elasticsearch.core.query.IndexQuery;
-import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
-import org.springframework.data.elasticsearch.core.query.Order;
-import org.springframework.data.elasticsearch.core.query.Query;
-import org.springframework.data.elasticsearch.core.query.RescorerQuery;
-import org.springframework.data.elasticsearch.core.query.ScriptData;
-import org.springframework.data.elasticsearch.core.query.SourceFilter;
-import org.springframework.data.elasticsearch.core.query.StringQuery;
-import org.springframework.data.elasticsearch.core.query.UpdateQuery;
+import org.springframework.data.elasticsearch.core.query.*;
 import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
 import org.springframework.data.elasticsearch.core.reindex.Remote;
 import org.springframework.data.elasticsearch.support.DefaultStringObjectMap;
@@ -918,7 +881,7 @@ class RequestConverter {
 					.docAsUpsert(query.getDocAsUpsert()) //
 					.ifSeqNo(query.getIfSeqNo() != null ? Long.valueOf(query.getIfSeqNo()) : null) //
 					.ifPrimaryTerm(query.getIfPrimaryTerm() != null ? Long.valueOf(query.getIfPrimaryTerm()) : null) //
-					.refresh(TypeUtils.refresh(refreshPolicy)) //
+					.refresh(query.getRefreshPolicy() != null ? refresh(query.getRefreshPolicy()) : refresh(refreshPolicy)) //
 					.retryOnConflict(query.getRetryOnConflict()) //
 			;

@@ -1088,10 +1051,9 @@ class RequestConverter {
 							}

 							if (!isEmpty(query.getFields())) {
-								bb.fields(fb -> {
-									query.getFields().forEach(fb::field);
-									return fb;
-								});
+								var fieldAndFormats = query.getFields().stream()
+										.map(field -> FieldAndFormat.of(b -> b.field(field))).toList();
+								bb.fields(fieldAndFormats);
 							}

 							if (!isEmpty(query.getStoredFields())) {
@@ -1121,8 +1083,7 @@ class RequestConverter {
 							}

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

 							query.getRescorerQueries().forEach(rescorerQuery -> bb.rescore(getRescore(rescorerQuery)));
@@ -1146,11 +1107,9 @@ class RequestConverter {
 							}

 							if (!isEmpty(query.getIndicesBoost())) {
-								Map<String, Double> boosts = new LinkedHashMap<>();
-								query.getIndicesBoost()
-										.forEach(indexBoost -> boosts.put(indexBoost.getIndexName(), (double) indexBoost.getBoost()));
-								// noinspection unchecked
-								bb.indicesBoost(boosts);
+								bb.indicesBoost(query.getIndicesBoost().stream()
+										.map(indexBoost -> Map.of(indexBoost.getIndexName(), Double.valueOf(indexBoost.getBoost())))
+										.collect(Collectors.toList()));
 							}

 							if (query instanceof NativeQuery) {
@@ -1210,10 +1169,9 @@ class RequestConverter {
 		builder.source(getSourceConfig(query));

 		if (!isEmpty(query.getFields())) {
-			builder.fields(fb -> {
-				query.getFields().forEach(fb::field);
-				return fb;
-			});
+			var fieldAndFormats = query.getFields().stream()
+					.map(field -> FieldAndFormat.of(b -> b.field(field))).toList();
+			builder.fields(fieldAndFormats);
 		}

 		if (!isEmpty(query.getStoredFields())) {
@@ -1234,6 +1192,13 @@ class RequestConverter {

 		builder.searchType(searchType(query.getSearchType()));

+		addHighlight(query, builder);
+
+		if (query instanceof NativeQuery) {
+			prepareNativeSearch((NativeQuery) query, builder);
+		}
+		// query.getSort() must be checked after prepareNativeSearch as this already might hav a sort set that must have
+		// higher priority
 		if (query.getSort() != null) {
 			List<SortOptions> sortOptions = getSortOptions(query.getSort(), persistentEntity);

@@ -1242,12 +1207,6 @@ class RequestConverter {
 			}
 		}

-		addHighlight(query, builder);
-
-		if (query instanceof NativeQuery) {
-			prepareNativeSearch((NativeQuery) query, builder);
-		}
-
 		if (query.getTrackTotalHits() != null) {
 			// logic from the RHLC, choose between -1 and Integer.MAX_VALUE
 			int value = query.getTrackTotalHits() ? Integer.MAX_VALUE : -1;
@@ -1263,8 +1222,7 @@ class RequestConverter {
 		}

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

 		query.getRescorerQueries().forEach(rescorerQuery -> builder.rescore(getRescore(rescorerQuery)));
@@ -1301,11 +1259,9 @@ class RequestConverter {
 		}

 		if (!isEmpty(query.getIndicesBoost())) {
-			Map<String, Double> boosts = new LinkedHashMap<>();
-			query.getIndicesBoost()
-					.forEach(indexBoost -> boosts.put(indexBoost.getIndexName(), (double) indexBoost.getBoost()));
-			// noinspection unchecked
-			builder.indicesBoost(boosts);
+			builder.indicesBoost(query.getIndicesBoost().stream()
+					.map(indexBoost -> Map.of(indexBoost.getIndexName(), Double.valueOf(indexBoost.getBoost())))
+					.collect(Collectors.toList()));
 		}
 	}

@@ -1373,9 +1329,10 @@ class RequestConverter {
 				return SortOptions.of(so -> so //
 						.geoDistance(gd -> gd //
 								.field(fieldName) //
-								.location(loc -> loc.latlon(QueryBuilders.latLon(geoDistanceOrder.getGeoPoint())))//
+								.location(loc -> loc.latlon(QueryBuilders.latLon(geoDistanceOrder.getGeoPoint()))) //
 								.distanceType(TypeUtils.geoDistanceType(geoDistanceOrder.getDistanceType()))
 								.mode(TypeUtils.sortMode(finalMode)) //
+								.order(TypeUtils.sortOrder(geoDistanceOrder.getDirection())) //
 								.unit(TypeUtils.distanceUnit(geoDistanceOrder.getUnit())) //
 								.ignoreUnmapped(geoDistanceOrder.getIgnoreUnmapped())));
 			} else {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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.
@@ -192,7 +192,8 @@ class SearchDocumentResponseBuilder {
 			var phraseSuggestOptions = phraseSuggest.options();
 			List<PhraseSuggestion.Entry.Option> options = new ArrayList<>();
 			phraseSuggestOptions.forEach(optionES -> options
-					.add(new PhraseSuggestion.Entry.Option(optionES.text(), optionES.highlighted(), null, null)));
+					.add(new PhraseSuggestion.Entry.Option(optionES.text(), optionES.highlighted(), optionES.score(),
+							optionES.collateMatch())));
 			entries.add(new PhraseSuggestion.Entry(phraseSuggest.text(), phraseSuggest.offset(), phraseSuggest.length(),
 					options, null));
 		});
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 the original author or authors.
+ * Copyright 2022-2024 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.
@@ -24,9 +24,11 @@ import co.elastic.clients.elasticsearch.core.search.HighlighterOrder;
 import co.elastic.clients.elasticsearch.core.search.HighlighterTagsSchema;
 import co.elastic.clients.elasticsearch.core.search.HighlighterType;
 import co.elastic.clients.elasticsearch.core.search.ScoreMode;
+import co.elastic.clients.json.JsonData;

 import java.time.Duration;

+import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.core.RefreshPolicy;
 import org.springframework.data.elasticsearch.core.query.GeoDistanceOrder;
 import org.springframework.data.elasticsearch.core.query.IndexQuery;
@@ -126,6 +128,40 @@ final class TypeUtils {
 		}
 	}

+	@Nullable
+	static FieldValue toFieldValue(@Nullable Object fieldValue) {
+
+		if (fieldValue == null) {
+			return FieldValue.NULL;
+		}
+
+		if (fieldValue instanceof Boolean b) {
+			return b ? FieldValue.TRUE : FieldValue.FALSE;
+		}
+
+		if (fieldValue instanceof String s) {
+			return FieldValue.of(s);
+		}
+
+		if (fieldValue instanceof Long l) {
+			return FieldValue.of(l);
+		}
+
+		if (fieldValue instanceof Integer i) {
+			return FieldValue.of((long) i);
+		}
+
+		if (fieldValue instanceof Double d) {
+			return FieldValue.of(d);
+		}
+
+		if (fieldValue instanceof Float f) {
+			return FieldValue.of((double) f);
+		}
+
+		return FieldValue.of(JsonData.of(fieldValue));
+	}
+
 	@Nullable
 	static GeoDistanceType geoDistanceType(GeoDistanceOrder.DistanceType distanceType) {

@@ -136,6 +172,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) {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 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-2023 the original author or authors.
+ * Copyright 2022-2024 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-2023 the original author or authors.
+ * Copyright 2018-2024 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-2023 the original author or authors.
+ * Copyright 2018-2024 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-2023 the original author or authors.
+ * Copyright 2013-2024 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-2023 the original author or authors.
+ * Copyright 2013-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2021-2024 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-2023 the original author or authors.
+ * Copyright 2018-2024 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.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark Paluch	571bb64534	Extend license header copyright years to 2024. See #2816	2024-01-02 09:24:14 +01:00
Mark Paluch	e05c3016fd	Introduce property for Jenkins user and Artifactory server details. Closes #2781	2023-11-27 11:19:07 +01:00
Mark Paluch	f752aa0367	After release cleanups. See #2735	2023-11-17 11:00:18 +01:00
Mark Paluch	0300dcfcd0	Prepare next development iteration. See #2735	2023-11-17 11:00:16 +01:00
Mark Paluch	b5e7c3d012	Release version 5.0.12 (2022.0.12). See #2735	2023-11-17 10:57:14 +01:00
Mark Paluch	2b8fbc18a2	Prepare 5.0.12 (2022.0.12). See #2735	2023-11-17 10:57:00 +01:00
Peter-Josef Meisch	f1f73a2992	Upgrade dependency of deprecated Elasticsearch client to 7.17.15. Original Pull Request #2768 Closes #2764	2023-11-15 20:54:30 +01:00
Peter-Josef Meisch	50d606bfb8	Use routing info on delete operations. Original Pull Request #2755 Closes #2754 (cherry picked from commit `9abcacb2e9`) (cherry picked from commit `64cf9566d9`)	2023-11-06 22:17:30 +01:00
Peter-Josef Meisch	44b0ef0dac	Fix reactive native sort. Original Pull Request #2746 Closes #2745 (cherry picked from commit `73fe0869e6`) (cherry picked from commit `2c857178f4`)	2023-10-23 22:07:55 +02:00
Peter-Josef Meisch	69329bc62d	Fix field parameters in search request creation. Original Pull Request #2739 Closes #2727 (cherry picked from commit `f087d5aac3`)	2023-10-14 11:52:45 +02:00
Mark Paluch	aaaa18ec4c	After release cleanups. See #2698	2023-10-13 11:44:29 +02:00
Mark Paluch	e9c2961133	Prepare next development iteration. See #2698	2023-10-13 11:44:28 +02:00
Mark Paluch	08ed5b724d	Release version 5.0.11 (2022.0.11). See #2698	2023-10-13 11:41:41 +02:00
Mark Paluch	12b869e9dd	Prepare 5.0.11 (2022.0.11). See #2698	2023-10-13 11:41:28 +02:00
Peter-Josef Meisch	d35dd313b1	Upgrade to Elasticsearch 7.17.14. Original Pull Request #2733	2023-10-13 08:41:05 +02:00
John Blum	f65d557689	Upgrade to Maven Wrapper 3.9.5. See #2716	2023-10-04 18:24:26 -07:00
John Blum	1c4332dd12	Update CI properties. See #2698	2023-10-04 17:47:35 -07:00
Peter-Josef Meisch	b21bd796f6	Fix converting of Range<?> in Lists. Original Pull Request #2707 Closes #2706 (cherry picked from commit `3330d65edf`) (cherry picked from commit `d26d01bab1`)	2023-09-23 13:21:50 +02:00
Mark Paluch	16eefb6f60	After release cleanups. See #2673	2023-09-15 10:20:52 +02:00
Mark Paluch	7ebc4ee13a	Prepare next development iteration. See #2673	2023-09-15 10:20:50 +02:00
Mark Paluch	a065ba6a76	Release version 5.0.10 (2022.0.10). See #2673	2023-09-15 10:17:46 +02:00
Mark Paluch	631e5fe496	Prepare 5.0.10 (2022.0.10). See #2673	2023-09-15 10:17:32 +02:00
Peter-Josef Meisch	b1e6e51e16	Fix refresh policy in UpdateQuery. Original Pull Request #2696 Closes #2692 (cherry picked from commit `2d0aee08ce`) (cherry picked from commit `572cc7ffea`)	2023-09-13 21:55:31 +02:00
Peter-Josef Meisch	d5df3bfd20	Upgrade deprecated client to Elasticsearch 7.17.13. Original Pull Request #2695 Closes #2689	2023-09-13 20:05:41 +02:00
Peter-Josef Meisch	7f390845d3	Polishing. (cherry picked from commit `a82952b124`) (cherry picked from commit `4628908e84`)	2023-09-03 16:04:19 +02:00
Sébastien Comeau	868a994e33	Fix: missing PhraseSuggestion.Entry.Option's score and collateMatch values. Original Pull Request #2680 Closes #2681 (cherry picked from commit `7c466395c4`) (cherry picked from commit `922f4b1760`)	2023-09-03 16:04:18 +02:00
Peter-Josef Meisch	7d9e6a5a2a	Fix search_after field values (#2679 ) Closes #2678 (cherry picked from commit `9adc4d2b36`) (cherry picked from commit `4614c62bb5`)	2023-08-28 21:19:48 +02:00
Mark Paluch	b34ed6fd2b	After release cleanups. See #2629	2023-08-18 10:46:31 +02:00
Mark Paluch	ff4e07d350	Prepare next development iteration. See #2629	2023-08-18 10:46:29 +02:00
Mark Paluch	ede29781da	Release version 5.0.9 (2022.0.9). See #2629	2023-08-18 10:43:13 +02:00
Mark Paluch	53a7af879a	Prepare 5.0.9 (2022.0.9). See #2629	2023-08-18 10:42:57 +02:00
Julia Lee	c7512fb325	Update CI properties. See #2629	2023-08-14 10:19:15 -04:00
Julia Lee	b4fde9d48b	Upgrade to Maven Wrapper 3.9.4. See #2668	2023-08-14 07:45:53 -04:00
Peter-Josef Meisch	8e56ef77b8	Polishing	2023-08-14 08:15:58 +02:00
Peter-Josef Meisch	a2a4114d9c	Fix cherrypicked code merge.	2023-08-14 00:01:24 +02:00
Peter-Josef Meisch	ec8401a2fb	Fix similarity field mapping. Original Pull Request #2666 Closes #2659 (cherry picked from commit `8c5ff92cd2`) (cherry picked from commit `9b9136d852`) # Conflicts: # src/main/java/org/springframework/data/elasticsearch/core/index/MappingParameters.java # src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java	2023-08-13 21:43:38 +02:00
Peter-Josef Meisch	19ec05dae3	Upgrade deprecated dependency to Elasticsearch 7.17.12. Original Pull Request #2654 Closes #2652	2023-07-30 19:24:34 +02:00
Peter-Josef Meisch	70d2de7eec	Fix MappingElasticsearchConverter. Original Pull Request #2637 Closes #2627 (cherry picked from commit `d9bb9911f9`) (cherry picked from commit `c045a8ae29`)	2023-07-18 22:54:56 +02:00
Mark Paluch	1666fcee02	After release cleanups. See #2594	2023-07-14 11:25:33 +02:00
Mark Paluch	c513a0c03e	Prepare next development iteration. See #2594	2023-07-14 11:25:31 +02:00
Mark Paluch	22fe50c73a	Release version 5.0.8 (2022.0.8). See #2594	2023-07-14 11:22:39 +02:00
Mark Paluch	ef90755c27	Prepare 5.0.8 (2022.0.8). See #2594	2023-07-14 11:22:25 +02:00
Peter-Josef Meisch	9153d4dff4	Upgrade to Elasticsearch 7.17.11. Original Pull Request #2624 Closes #2623	2023-07-12 19:12:01 +02:00
Mark Paluch	9109dfa257	Update CI properties. See #2594	2023-07-03 09:47:08 +02:00
Mark Paluch	64eee02b85	Upgrade to Maven Wrapper 3.9.3. See #2613	2023-07-03 09:46:39 +02:00
Peter-Josef Meisch	31365fb722	Fix IndicesBoost error. Original Pull Request #2606 Closes #2598 (cherry picked from commit `d9fd722bb6`)	2023-06-27 22:28:38 +02:00
Greg L. Turnquist	c218c1d5e3	Stop posting build status on internal Slack. See #2603	2023-06-26 13:38:31 -05:00
seunghyun.cheong	5bce5dd880	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 (cherry picked from commit `d43b44ba9c`) # Conflicts: # src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java # src/main/java/org/springframework/data/elasticsearch/client/erhlc/RequestFactory.java	2023-06-24 11:58:57 +02:00
Mark Paluch	32c4c4d03f	After release cleanups. See #2547	2023-06-16 15:43:11 +02:00
Mark Paluch	5102d98e10	Prepare next development iteration. See #2547	2023-06-16 15:43:09 +02:00
Mark Paluch	57a4b755c1	Release version 5.0.7 (2022.0.7). See #2547	2023-06-16 15:39:46 +02:00
Mark Paluch	edaae2a4e8	Prepare 5.0.7 (2022.0.7). See #2547	2023-06-16 15:39:31 +02:00
Mark Paluch	4747caf57a	Upgrade to Maven Wrapper 3.9.2. See #2587	2023-06-13 08:52:21 +02:00
Mark Paluch	aba2ff6f5c	Polishing. Remove Lombok version override. See #2585	2023-06-07 08:57:07 +02:00
Mark Paluch	0dc2902cab	Reformat pom.xml. See #2585	2023-06-06 10:58:01 +02:00
Mark Paluch	3c60e5f9cc	Use snapshot and milestone repositories instead of libs-snapshot and libs-milestone. Closes #2585	2023-06-06 10:57:44 +02:00
Peter-Josef Meisch	ef822355ac	Polishing (cherry picked from commit `6edd3cf1fe`)	2023-05-17 20:35:31 +02:00
Pierre Mazieres @Semarchy	94d23a1403	"BaseQuery" class : the "build" method does not apply to the "runtimeFields" field. Original Pull Request #2568 Closes #2567 (cherry picked from commit `7b527c4451`) # Conflicts: # src/main/java/org/springframework/data/elasticsearch/core/query/BaseQuery.java	2023-05-17 20:35:25 +02:00
Christoph Strobl	13b4d62031	After release cleanups. See #2528	2023-05-12 11:11:32 +02:00
Christoph Strobl	1087b0355f	Prepare next development iteration. See #2528	2023-05-12 11:11:31 +02:00
Christoph Strobl	22ed898d63	Release version 5.0.6 (2022.0.6). See #2528	2023-05-12 11:08:07 +02:00
Christoph Strobl	a474a0f533	Prepare 5.0.6 (2022.0.6). See #2528	2023-05-12 11:07:48 +02:00
Pierre Mazieres @Semarchy	1d23fb14fa	Fix assignment in NativeQueryBuilder. Original Pull Request: #2543 Closes #2542 (cherry picked from commit `9c497c2dea`)	2023-05-10 18:34:06 +02:00
Greg L. Turnquist	e1741ca255	After release cleanups. See #2499	2023-04-14 10:25:06 -05:00
Greg L. Turnquist	3e4477af16	Prepare next development iteration. See #2499	2023-04-14 10:25:01 -05:00
Greg L. Turnquist	2244f855f3	Release version 5.0.5 (2022.0.5). See #2499	2023-04-14 10:19:16 -05:00
Greg L. Turnquist	03265a4551	Prepare 5.0.5 (2022.0.5). See #2499	2023-04-14 10:18:35 -05:00
Peter-Josef Meisch	fdc03cf29e	Polishing (cherry picked from commit `dfc1be286c`)	2023-04-10 11:30:05 +02:00
JKatzwinkel	e1da43ca9f	Fix inner hits metadata mapping. Original Pull Request #2522 Closes #2521 (cherry picked from commit `1f7fa77c15`)	2023-04-10 11:30:05 +02:00
Mark Paluch	4a1a4d3851	Upgrade to Maven Wrapper 3.9.1. See #2519	2023-04-06 16:17:39 +02:00
Greg L. Turnquist	a9ee467455	Test against Java 20 on CI. See #2507.	2023-03-30 11:52:11 -05:00
Greg L. Turnquist	ebccb34db1	Upgrade to BlockHound 1.0.7.RELEASE. Closes #2510.	2023-03-30 11:52:01 -05:00
Greg L. Turnquist	d1e349f689	Update CI properties. See #2499	2023-03-28 14:01:12 -05:00
Christoph Strobl	b8722bab84	After release cleanups. See #2485	2023-03-20 14:26:21 +01:00
Christoph Strobl	9e35f70833	Prepare next development iteration. See #2485	2023-03-20 14:26:20 +01:00
Christoph Strobl	59f3a6b120	Release version 5.0.4 (2022.0.4). See #2485	2023-03-20 14:22:49 +01:00
Christoph Strobl	e534e952a1	Prepare 5.0.4 (2022.0.4). See #2485	2023-03-20 14:22:21 +01:00
Mark Paluch	868a9d049a	After release cleanups. See #2462	2023-03-03 11:02:48 +01:00
Mark Paluch	28727c6b36	Prepare next development iteration. See #2462	2023-03-03 11:02:46 +01:00