After release cleanups.

See #3195
Prepare next development iteration.
2026-05-24 05:03:17 +00:00 · 2025-12-12 11:00:02 +01:00 · 2025-12-12 11:00:01 +01:00 · 2025-12-12 10:57:10 +01:00 · 2025-12-12 10:56:47 +01:00 · 2025-12-10 08:32:38 +01:00
687 changed files with 3140 additions and 6176 deletions
@@ -1,83 +0,0 @@
-= Spring Data for Elasticsearch image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Elasticsearch"]
-
-The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
-
-The Spring Data Elasticsearch project provides integration with the https://www.elastic.co/[Elasticsearch] search engine.
-Key functional areas of Spring Data Elasticsearch are a POJO centric model for interacting with Elasticsearch Documents and easily writing a Repository style data access layer.
-
-This project is lead and maintained by the community.
-
-== Features
-
-* Spring configuration support using Java based `@Configuration` classes or an XML namespace for an ES client instances.
-* `ElasticsearchOperations` class and implementations that increases productivity performing common ES operations.
-Includes integrated object mapping between documents and POJOs.
-* Feature Rich Object Mapping integrated with Spring’s Conversion Service
-* Annotation based mapping metadata
-* Automatic implementation of `Repository` interfaces including support for custom search methods.
-* CDI support for repositories
-
-include::https://raw.githubusercontent.com/spring-projects/spring-data-build/refs/heads/main/etc/readme/code-of-conduct.adoc[]
-
-== Getting Started
-
-Here is a quick teaser of an application using Spring Data Repositories in Java:
-
-[source,java]
----
-public interface PersonRepository extends CrudRepository<Person, Long> {
-
-  List<Person> findByLastname(String lastname);
-
-  List<Person> findByFirstnameLike(String firstname);
-}
-
-@Service
-public class MyService {
-
-  private final PersonRepository repository;
-
-  public MyService(PersonRepository repository) {
-    this.repository = repository;
-  }
-
-  public void doWork() {
-
-    repository.deleteAll();
-
-    Person person = new Person();
-    person.setFirstname("Oliver");
-    person.setLastname("Gierke");
-    repository.save(person);
-
-    List<Person> lastNameResults = repository.findByLastname("Gierke");
-    List<Person> firstNameResults = repository.findByFirstnameLike("Oli");
- }
-}
----
-
-=== Using the RestClient
-
-Please check the https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#elasticsearch.clients.configuration[official documentation].
-
-include::https://raw.githubusercontent.com/spring-projects/spring-data-build/refs/heads/main/etc/readme/dependencies.adoc[]
-
-**Compatibility Matrix**
-
-The compatibility between Spring Data Elasticsearch, Elasticsearch client drivers and Spring Boot versions can be found in the https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#preface.versions[reference documentation].
-
-To use the Release candidate versions of the upcoming major version, use our Maven milestone repository and declare the appropriate dependency version:
-
-[source,xml]
----
-<dependency>
-  <groupId>org.springframework.data</groupId>
-  <artifactId>spring-data-elasticsearch</artifactId>
-  <version>${version}.RCx</version> <!-- x being 1, 2, ... -->
-</dependency>
----
-
-include::https://raw.githubusercontent.com/spring-projects/spring-data-build/refs/heads/main/etc/readme/getting-help.adoc[]
-
-include::https://raw.githubusercontent.com/spring-projects/spring-data-build/refs/heads/main/etc/readme/license.adoc[]
-
@@ -1,27 +0,0 @@
-name: CI Build
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ 6.0.x, 'issue/6.0.x/**' ]
-
-permissions: read-all
-
-jobs:
-  build-java:
-    strategy:
-      matrix:
-        java-version: [ base, main ]
-    name: Build project
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - name: Setup Java and Maven
-        uses: spring-projects/spring-data-build/actions/setup-maven@4.0.x
-        with:
-          java-version: ${{ matrix.java-version }}
-          develocity-access-key: '${{ secrets.DEVELOCITY_ACCESS_KEY }}'
-      - name: Build
-        uses: spring-projects/spring-data-build/actions/maven-build@4.0.x
-        env:
-          TESTCONTAINERS_REUSE_ENABLE: true
@@ -1,28 +0,0 @@
-name: Snapshots
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ 6.0.x, 'issue/6.0.x/**' ]
-
-permissions: read-all
-
-jobs:
-  build-snapshots:
-    name: Build and deploy snapshots
-    if: ${{ github.repository_owner == 'spring-projects' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - name: Setup Java and Maven
-        uses: spring-projects/spring-data-build/actions/setup-maven@4.0.x
-        with:
-          develocity-access-key: '${{ secrets.DEVELOCITY_ACCESS_KEY }}'
-      - name: Deploy to Artifactory
-        uses: spring-projects/spring-data-build/actions/maven-artifactory-deploy@4.0.x
-        env:
-          TESTCONTAINERS_REUSE_ENABLE: true
-        with:
-          build-name: 'spring-data-elasticsearch'
-          username: '${{ secrets.ARTIFACTORY_USERNAME }}'
-          password: '${{ secrets.ARTIFACTORY_PASSWORD }}'
@@ -3,6 +3,6 @@
 	<extension>
 		<groupId>io.spring.develocity.conventions</groupId>
 		<artifactId>develocity-conventions-maven-extension</artifactId>
-		<version>0.0.25</version>
+		<version>0.0.22</version>
 	</extension>
 </extensions>
@@ -1,3 +1,3 @@
-#Thu Jul 17 13:59:56 CEST 2025
+#Thu Jul 17 14:04:44 CEST 2025
 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.11/apache-maven-3.9.11-bin.zip
@@ -1,5 +1,43 @@
 = Continuous Integration

+image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmain&subject=2020.0.0%20(main)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
+image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2F4.0.x&subject=Neumann%20(4.0.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
+image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2F3.2.x&subject=Moore%20(3.2.x)[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/]
+
 == Running CI tasks locally

-You can run CI jobs locally using Docker and act[https://nektosact.com/].
+Since this pipeline is purely Docker-based, it's easy to:
+
+* Debug what went wrong on your local machine.
+* Test out a a tweak to your `verify.sh` script before sending it out.
+* Experiment against a new image before submitting your pull request.
+
+All of these use cases are great reasons to essentially run what the CI server does on your local machine.
+
+IMPORTANT: To do this you must have Docker installed on your machine.
+
+1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-elasticsearch-github adoptopenjdk/openjdk8:latest /bin/bash`
+
+This will launch the Docker image and mount your source code at `spring-data-elasticsearch-github`.
+
+2. `cd spring-data-elasticsearch-github`
+
+Next, run your tests from inside the container:
+
+3. `./mvnw clean dependency:list test -Dsort` (or whatever profile you need to test out)
+
+Since the container is binding to your source, you can make edits from your IDE and continue to run build jobs.
+
+If you need to package things up, do this:
+
+1. `docker run -it -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source="$(pwd)",target=/spring-data-elasticsearch-github adoptopenjdk/openjdk8:latest /bin/bash`
+
+This will launch the Docker image and mount your source code at `spring-data-elasticsearch-github`.
+
+2. `cd spring-data-elasticsearch-github`
+
+Next, try to package everything up from inside the container:
+
+3. `./mvnw -Pci,snapshot -Dmaven.test.skip=true clean package`
+
+NOTE: Docker containers can eat up disk space fast! From time to time, run `docker system prune` to clean out old images.
@@ -0,0 +1,132 @@
+def p = [:]
+node {
+		checkout scm
+		p = readProperties interpolate: true, file: 'ci/pipeline.properties'
+}
+
+pipeline {
+	agent none
+
+	triggers {
+		pollSCM 'H/10 * * * *'
+		upstream(upstreamProjects: "spring-data-commons/3.4.x", threshold: hudson.model.Result.SUCCESS)
+	}
+
+	options {
+		disableConcurrentBuilds()
+		buildDiscarder(logRotator(numToKeepStr: '14'))
+	}
+
+	stages {
+		stage("test: baseline (main)") {
+			when {
+				beforeAgent(true)
+				anyOf {
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			agent {
+				label 'data'
+			}
+			options { timeout(time: 30, unit: 'MINUTES') }
+
+			environment {
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
+			}
+
+			steps {
+				script {
+					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+						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']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
+					}
+					steps {
+						script {
+							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+								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"
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		stage('Release to artifactory') {
+			when {
+				beforeAgent(true)
+				anyOf {
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			agent {
+				label 'data'
+			}
+			options { timeout(time: 20, unit: 'MINUTES') }
+			environment {
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
+			}
+			steps {
+				script {
+					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+								sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
+									"./mvnw -s settings.xml -Pci,artifactory " +
+									"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-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=spring-data-elasticsearch-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
+									"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch " +
+									"-Dmaven.test.skip=true clean deploy -U -B"
+						}
+					}
+				}
+			}
+		}
+	}
+
+	post {
+		changed {
+			script {
+				emailext(
+						subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}",
+						mimeType: 'text/html',
+						recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']],
+						body: "<a href=\"${env.BUILD_URL}\">${currentBuild.fullDisplayName} is reported as ${currentBuild.currentResult}</a>")
+			}
+		}
+	}
+}
@@ -1,4 +1,4 @@
-= Spring Data for Elasticsearch image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Elasticsearch"]
+= Spring Data for Elasticsearch image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]] image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Elasticsearch"]

 The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.

@@ -62,7 +62,7 @@ public class MyService {

 === Using the RestClient

-Please check the https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#elasticsearch.clients.configuration[official documentation].
+Please check the [official documentation](https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#elasticsearch.clients.configuration).

 === Maven configuration

@@ -168,7 +168,7 @@ Building the documentation builds also the project without running tests.
 $ ./mvnw clean install -Pantora
 ----

-The generated documentation is available from `target/site/index.html`.
+The generated documentation is available from `target/antora/site/index.html`.

 == Examples

@@ -0,0 +1,8 @@
+#!/bin/bash -x
+
+set -euo pipefail
+
+export JENKINS_USER=${JENKINS_USER_NAME}
+
+MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
+  ./mvnw -s settings.xml clean -Dscan=false -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root
@@ -0,0 +1,36 @@
+# Java versions
+java.main.tag=17.0.15_6-jdk-focal
+java.next.tag=24.0.1_9-jdk-noble
+
+# Docker container images - standard
+docker.java.main.image=library/eclipse-temurin:${java.main.tag}
+docker.java.next.image=library/eclipse-temurin:${java.next.tag}
+
+# Supported versions of MongoDB
+docker.mongodb.4.4.version=4.4.25
+docker.mongodb.5.0.version=5.0.21
+docker.mongodb.6.0.version=6.0.10
+docker.mongodb.7.0.version=7.0.2
+docker.mongodb.8.0.version=8.0.0
+
+# Supported versions of Redis
+docker.redis.6.version=6.2.13
+docker.redis.7.version=7.2.4
+
+# Supported versions of Cassandra
+docker.cassandra.3.version=3.11.16
+
+# Docker environment settings
+docker.java.inside.basic=-v $HOME:/tmp/jenkins-home --ulimit nofile=32000:32000
+docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home --ulimit nofile=32000:32000
+
+# Credentials
+docker.registry=
+docker.credentials=hub.docker.com-springbuildmaster
+docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com
+docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
+artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
+artifactory.url=https://repo.spring.io
+artifactory.repository.snapshot=libs-snapshot-local
+develocity.access-key=gradle_enterprise_secret_access_key
+jenkins.user.name=spring-builds+jenkins
@@ -0,0 +1,10 @@
+#!/bin/bash -x
+
+set -euo pipefail
+
+mkdir -p /tmp/jenkins-home/.m2/spring-data-elasticsearch
+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 -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root
@@ -5,12 +5,12 @@

 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>6.0.4</version>
+	<version>5.4.14-SNAPSHOT</version>

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

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

 	<properties>
-		<springdata.commons>4.0.4</springdata.commons>
+		<springdata.commons>3.4.14-SNAPSHOT</springdata.commons>

 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>9.2.6</elasticsearch-java>
-		<elasticsearch-rest-client>9.2.6</elasticsearch-rest-client>
+		<elasticsearch-java>8.15.5</elasticsearch-java>

-		<hoverfly>0.20.2</hoverfly>
-		<log4j>2.25.1</log4j>
+		<hoverfly>0.19.0</hoverfly>
+		<log4j>2.23.1</log4j>
 		<jsonassert>1.5.3</jsonassert>
-		<wiremock>3.9.2</wiremock>
+		<testcontainers>1.20.0</testcontainers>
+		<wiremock>3.9.1</wiremock>

 		<java-module-name>spring.data.elasticsearch</java-module-name>

@@ -91,27 +91,6 @@
 		<url>https://github.com/spring-projects/spring-data-elasticsearch/issues</url>
 	</issueManagement>

-
-	<dependencyManagement>
-		<dependencies>
-
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-lang3</artifactId>
-				<version>3.19.0</version>
-				<scope>test</scope>
-			</dependency>
-
-			<dependency>
-				<groupId>commons-io</groupId>
-				<artifactId>commons-io</artifactId>
-				<version>2.20.0</version>
-				<scope>test</scope>
-			</dependency>
-
-		</dependencies>
-	</dependencyManagement>
-
 	<dependencies>

 		<!-- Spring -->
@@ -157,27 +136,6 @@
 			</exclusions>
 		</dependency>

-		<!-- the old RestCLient is an optional dependency for user that still want to use it-->
-		<dependency>
-			<groupId>org.elasticsearch.client</groupId>
-			<artifactId>elasticsearch-rest-client</artifactId>
-			<version>${elasticsearch-rest-client}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>com.querydsl</groupId>
-			<artifactId>querydsl-core</artifactId>
-			<version>${querydsl}</version>
-			<optional>true</optional>
-		</dependency>
-
 		<!-- Jackson JSON Mapper -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -263,14 +221,6 @@
 			<optional>true</optional>
 		</dependency>

-		<dependency>
-			<groupId>org.jetbrains</groupId>
-			<artifactId>annotations</artifactId>
-			<version>26.0.2-1</version>
-			<scope>test</scope>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>log4j-over-slf4j</artifactId>
@@ -322,6 +272,21 @@
 			<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>
@@ -331,7 +296,16 @@

 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers-elasticsearch</artifactId>
+			<artifactId>elasticsearch</artifactId>
+			<version>${testcontainers}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!--we need Murmur3Hash in a test, before 5.2 we had it from the old Elasticsearch dependency	-->
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.15</version>
 			<scope>test</scope>
 		</dependency>

@@ -480,8 +454,20 @@
 	</profiles>

 	<repositories>
-		
-		
+		<repository>
+			<id>spring-snapshot</id>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>spring-milestone</id>
+			<url>https://repo.spring.io/milestone</url>
+		</repository>
 	</repositories>

 </project>
@@ -17,7 +17,7 @@ content:
    - url: https://github.com/spring-projects/spring-data-commons
      # Refname matching:
      # https://docs.antora.org/antora/latest/playbook/content-refname-matching/
-      branches: [ main ]
+      branches: [ main, 3.2.x ]
      start_path: src/main/antora
 asciidoc:
  attributes:
@@ -6,8 +6,12 @@ nav:
 ext:
  collector:
    - run:
-        command: ./mvnw -B validate process-resources dependency:unpack -am -Pantora-process-resources
+        command: ./mvnw validate process-resources -am -Pantora-process-resources
        local: true
      scan:
-        - dir: target/classes/
-        - dir: target/antora/
+        dir: target/classes/
+    - run:
+        command: ./mvnw package -Pdistribute
+        local: true
+      scan:
+        dir: target/antora
@@ -11,8 +11,6 @@
 *** xref:migration-guides/migration-guide-5.1-5.2.adoc[]
 *** xref:migration-guides/migration-guide-5.2-5.3.adoc[]
 *** xref:migration-guides/migration-guide-5.3-5.4.adoc[]
-*** xref:migration-guides/migration-guide-5.4-5.5.adoc[]
-*** xref:migration-guides/migration-guide-5.5-6.0.adoc[]


 * xref:elasticsearch.adoc[]
@@ -5,7 +5,7 @@
 Spring Data support for Elasticsearch contains a wide range of features:

 * Spring configuration support for various xref:elasticsearch/clients.adoc[Elasticsearch clients].
-* The xref:elasticsearch/template.adoc[`ElasticsearchTemplate` and `ReactiveElasticsearchTemplate`] helper classes that provide object mapping between Elasticsearch index operations and POJOs.
+* The xref:elasticsearch/template.adoc[`ElasticsearchTemplate` and `ReactiveElasticsearchTemplate`] helper classes that provide object mapping between ES index operations and POJOs.
 * xref:elasticsearch/template.adoc#exception-translation[Exception translation] into Spring's portable {springDocsUrl}data-access.html#dao-exceptions[Data Access Exception Hierarchy].
 * Feature rich xref:elasticsearch/object-mapping.adoc[object mapping] integrated with _Spring's_ {springDocsUrl}core.html#core-convert[Conversion Service].
 * xref:elasticsearch/object-mapping.adoc#elasticsearch.mapping.meta-model.annotations[Annotation-based mapping] metadata that is extensible to support other metadata formats.
@@ -10,7 +10,7 @@ In order for the auditing code to be able to decide whether an entity instance i
 ----
 package org.springframework.data.domain;

-import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Nullable;

 public interface Persistable<ID> {
    @Nullable
@@ -81,5 +81,5 @@ class MyConfiguration {
 }
 ----

-If your code contains more than one `AuditorAware` bean for different types, you must provide the name of the bean to use as an argument to the `auditorAwareRef` parameter of the
- `@EnableElasticsearchAuditing` annotation.
+If your code contains more than one `AuditorAware` bean for different types, you must provide the name of the bean to use as an argument to the `auditorAwareRef` parameter of the 
+ `@EnableElasticsearchAuditing` annotation. 
@@ -6,10 +6,10 @@ This chapter illustrates configuration and usage of supported Elasticsearch clie
 Spring Data Elasticsearch operates upon an Elasticsearch client (provided by Elasticsearch client libraries) that is connected to a single Elasticsearch node or a cluster.
 Although the Elasticsearch Client can be used directly to work with the cluster, applications using Spring Data Elasticsearch normally use the higher level abstractions of xref:elasticsearch/template.adoc[Elasticsearch Operations] and xref:elasticsearch/repositories/elasticsearch-repositories.adoc[Elasticsearch Repositories].

-[[elasticsearch.clients.rest5client]]
-== Imperative Rest5Client
+[[elasticsearch.clients.restclient]]
+== Imperative Rest Client

-To use the imperative (non-reactive) Rest5Client - the default client provided by the Elasticsearch Java client library from version 9 on -, a configuration bean must be configured like this:
+To use the imperative (non-reactive) client, a configuration bean must be configured like this:

 ====
 [source,java]
@@ -31,7 +31,7 @@ public class MyClientConfig extends ElasticsearchConfiguration {
 <.> for a detailed description of the builder methods see xref:elasticsearch/clients.adoc#elasticsearch.clients.configuration[Client Configuration]
 ====

-The javadoc:org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration[] class allows further configuration by overriding for example the `jsonpMapper()` or `transportOptions()` methods.
+The javadoc:org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration[]] class allows further configuration by overriding for example the `jsonpMapper()` or `transportOptions()` methods.


 The following beans can then be injected in other Spring components:
@@ -39,85 +39,7 @@ The following beans can then be injected in other Spring components:
 ====
 [source,java]
 ----
-import org.springframework.beans.factory.annotation.Autowired;
-
-@Autowired
-ElasticsearchOperations operations;      <.>
-
-@Autowired
-ElasticsearchClient elasticsearchClient; <.>
-
-@Autowired
-Rest5Client rest5Client;                 <.>
-
-@Autowired
-JsonpMapper jsonpMapper;                 <.>
----
-
-<.> an implementation of javadoc:org.springframework.data.elasticsearch.core.ElasticsearchOperations[]
-<.> the `co.elastic.clients.elasticsearch.ElasticsearchClient` that is used.
-<.> the low level `Rest5Client` from the Elasticsearch libraries
-<.> the `JsonpMapper` user by the Elasticsearch `Transport`
-====
-
-Basically one should just use the javadoc:org.springframework.data.elasticsearch.core.ElasticsearchOperations[] to interact with the Elasticsearch cluster.
-When using repositories, this instance is used under the hood as well.
-
-[[elasticsearch.clients.restclient]]
-== Deprecated Imperative RestClient
-
-To use the imperative (non-reactive) RestClient - deprecated since version 6 - , the following dependency needs to be added, adapt the correct version. The exclusion is needed in a Spring Boot application:
-====
-[source,xml]
----
-        <dependency>
-            <groupId>org.elasticsearch.client</groupId>
-            <artifactId>elasticsearch-rest-client</artifactId>
-            <version>${elasticsearch-client.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
----
-====
-
-The configuration bean must then be configured like this:
-
-====
-[source,java]
----
-import org.springframework.data.elasticsearch.client.elc.ElasticsearchLegacyRestClientConfiguration;
-
-@Configuration
-public class MyClientConfig extends ElasticsearchLegacyRestClientConfiguration {
-
-	@Override
-	public ClientConfiguration clientConfiguration() {
-		return ClientConfiguration.builder()           <.>
-			.connectedTo("localhost:9200")
-			.build();
-	}
-}
----
-
-<.> for a detailed description of the builder methods see xref:elasticsearch/clients.adoc#elasticsearch.clients.configuration[Client Configuration]
-====
-
-The javadoc:org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration[] class allows further configuration by overriding for example the `jsonpMapper()` or `transportOptions()` methods.
-
-
-The following beans can then be injected in other Spring components:
-
-====
-[source,java]
----
-import org.springframework.beans.factory.annotation.Autowired;
-
-@Autowired
+import org.springframework.beans.factory.annotation.Autowired;@Autowired
 ElasticsearchOperations operations;      <.>

@Autowired
@@ -139,8 +61,8 @@ JsonpMapper jsonpMapper;                 <.>
 Basically one should just use the javadoc:org.springframework.data.elasticsearch.core.ElasticsearchOperations[] to interact with the Elasticsearch cluster.
 When using repositories, this instance is used under the hood as well.

-[[elasticsearch.clients.reactiverest5client]]
-== Reactive Rest5Client
+[[elasticsearch.clients.reactiverestclient]]
+== Reactive Rest Client

 When working with the reactive stack, the configuration must be derived from a different class:

@@ -171,69 +93,6 @@ The following beans can then be injected in other Spring components:
 ====
 [source,java]
 ----
-import org.springframework.beans.factory.annotation.Autowired;
-
-@Autowired
-ReactiveElasticsearchOperations operations;      <.>
-
-@Autowired
-ReactiveElasticsearchClient elasticsearchClient; <.>
-
-@Autowired
-Rest5Client rest5Client;                           <.>
-
-@Autowired
-JsonpMapper jsonpMapper;                         <.>
----
-
-the following can be injected:
-
-<.> an implementation of javadoc:org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations[]
-<.> the `org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchClient` that is used.
-This is a reactive implementation based on the Elasticsearch client implementation.
-<.> the low level `RestClient` from the Elasticsearch libraries
-<.> the `JsonpMapper` user by the Elasticsearch `Transport`
-====
-
-Basically one should just use the javadoc:org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations[] to interact with the Elasticsearch cluster.
-When using repositories, this instance is used under the hood as well.
-
-[[elasticsearch.clients.reactiverestclient]]
-== Deprecated Reactive RestClient
-
-See the section above for the imperative code to use the deprecated RestClient for the necessary dependencies to include.
-
-When working with the reactive stack, the configuration must be derived from a different class:
-
-====
-[source,java]
----
-import org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchLegacyRestClientConfiguration;
-
-@Configuration
-public class MyClientConfig extends ReactiveElasticsearchLegacyRestClientConfiguration {
-
-	@Override
-	public ClientConfiguration clientConfiguration() {
-		return ClientConfiguration.builder()           <.>
-			.connectedTo("localhost:9200")
-			.build();
-	}
-}
----
-
-<.> for a detailed description of the builder methods see xref:elasticsearch/clients.adoc#elasticsearch.clients.configuration[Client Configuration]
-====
-
-The javadoc:org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchConfiguration[] class allows further configuration by overriding for example the `jsonpMapper()` or `transportOptions()` methods.
-
-The following beans can then be injected in other Spring components:
-
-====
-[source,java]
----
-import org.springframework.beans.factory.annotation.Autowired;
-
@Autowired
 ReactiveElasticsearchOperations operations;      <.>

@@ -302,7 +161,7 @@ ClientConfiguration clientConfiguration = ClientConfiguration.builder()

 <.> Define default headers, if they need to be customized
 <.> Use the builder to provide cluster addresses, set default `HttpHeaders` or enable SSL.
-<.> Optionally enable SSL.There exist overloads of this function that can take a `SSLContext` or as an alternative the fingerprint of the certificate as it is output by Elasticsearch on startup (since version 8).
+<.> Optionally enable SSL.There exist overloads of this function that can take a `SSLContext` or as an alternative the fingerprint of the certificate as it is output by Elasticsearch 8 on startup.
 <.> Optionally set a proxy.
 <.> Optionally set a path prefix, mostly used when different clusters a behind some reverse proxy.
 <.> Set the connection timeout.
@@ -324,25 +183,8 @@ In the case this is not enough, the user can add callback functions by using the

 The following callbacks are provided:

-[[elasticsearch.clients.configuration.callbacks.rest5]]
-==== Configuration of the low level Elasticsearch `Rest5Client`:
-
-This callback provides a `org.elasticsearch.client.RestClientBuilder` that can be used to configure the Elasticsearch
-`Rest5Client`:
-====
-[source,java]
----
-ClientConfiguration.builder()
-    .connectedTo("localhost:9200", "localhost:9291")
-    .withClientConfigurer(Rest5Clients.ElasticsearchRest5ClientConfigurationCallback.from(restClientBuilder -> {
-        // configure the Elasticsearch Rest5Client
-        return restClientBuilder;
-    }))
-    .build();
----
-====
 [[elasticsearch.clients.configuration.callbacks.rest]]
-==== Configuration of the deprecated low level Elasticsearch `RestClient`:
+==== Configuration of the low level Elasticsearch `RestClient`:

 This callback provides a `org.elasticsearch.client.RestClientBuilder` that can be used to configure the Elasticsearch
 `RestClient`:
@@ -351,7 +193,7 @@ This callback provides a `org.elasticsearch.client.RestClientBuilder` that can b
 ----
 ClientConfiguration.builder()
    .connectedTo("localhost:9200", "localhost:9291")
-    .withClientConfigurer(RestClients.ElasticsearchRestClientConfigurationCallback.from(restClientBuilder -> {
+    .withClientConfigurer(ElasticsearchClients.ElasticsearchRestClientConfigurationCallback.from(restClientBuilder -> {
        // configure the Elasticsearch RestClient
        return restClientBuilder;
    }))
@@ -359,29 +201,10 @@ ClientConfiguration.builder()
 ----
 ====

-[[elasticsearch.clients.configurationcallbacks.httpasync5]]
-==== Configuration of the HttpAsyncClient used by the low level Elasticsearch `Rest5Client`:
-
-This callback provides a `org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder` to configure the HttpClient that is
-used by the `Rest5Client`.
-
-====
-[source,java]
----
-ClientConfiguration.builder()
-    .connectedTo("localhost:9200", "localhost:9291")
-    .withClientConfigurer(Rest5Clients.ElasticsearchHttpClientConfigurationCallback.from(httpAsyncClientBuilder -> {
-        // configure the HttpAsyncClient
-        return httpAsyncClientBuilder;
-    }))
-    .build();
----
-====
-
 [[elasticsearch.clients.configurationcallbacks.httpasync]]
-==== Configuration of the HttpAsyncClient used by the deprecated low level Elasticsearch `RestClient`:
+==== Configuration of the HttpAsyncClient used by the low level Elasticsearch `RestClient`:

-This callback provides a `org.apache.http.impl.nio.client.HttpAsyncClientBuilder` to configure the HttpClient that is
+This callback provides a `org.apache.http.impl.nio.client.HttpAsyncClientBuilder` to configure the HttpCLient that is
 used by the `RestClient`.

 ====
@@ -389,7 +212,7 @@ used by the `RestClient`.
 ----
 ClientConfiguration.builder()
    .connectedTo("localhost:9200", "localhost:9291")
-    .withClientConfigurer(RestClients.ElasticsearchHttpClientConfigurationCallback.from(httpAsyncClientBuilder -> {
+    .withClientConfigurer(ElasticsearchClients.ElasticsearchHttpClientConfigurationCallback.from(httpAsyncClientBuilder -> {
        // configure the HttpAsyncClient
        return httpAsyncClientBuilder;
    }))
@@ -397,92 +220,15 @@ ClientConfiguration.builder()
 ----
 ====

-[[elasticsearch.clients.configurationcallbacks.connectionconfig]]
-==== Configuration of the ConnectionConfig used by the low level Elasticsearch `Rest5Client`:
-
-This callback provides a `org.apache.hc.client5.http.config.ConnectionConfig` to configure the connection that is
-used by the `Rest5Client`.
-
-====
-[source,java]
----
-ClientConfiguration.builder()
-    .connectedTo("localhost:9200", "localhost:9291")
-    .withClientConfigurer(Rest5Clients.ElasticsearchConnectionConfigurationCallback.from(connectionConfigBuilder -> {
-        // configure the connection
-        return connectionConfigBuilder;
-    }))
-    .build();
----
-====
-
-[[elasticsearch.clients.configurationcallbacks.connectioncmanager]]
-==== Configuration of the ConnectionManager used by the low level Elasticsearch `Rest5Client`:
-
-This callback provides a `org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder` to configure the connection manager that is
-used by the `Rest5Client`.
-
-====
-[source,java]
----
-ClientConfiguration.builder()
-    .connectedTo("localhost:9200", "localhost:9291")
-    .withClientConfigurer(Rest5Clients.ElasticsearchConnectionManagerCallback.from(connectionManagerBuilder -> {
-        // configure the connection manager
-        return connectionManagerBuilder;
-    }))
-    .build();
----
-====
-
-[[elasticsearch.clients.configurationcallbacks.requestconfig]]
-==== Configuration of the RequestConfig used by the low level Elasticsearch `Rest5Client`:
-
-This callback provides a `org.apache.hc.client5.http.config.RequestConfig` to configure the RequestConfig that is
-used by the `Rest5Client`.
-
-====
-[source,java]
----
-ClientConfiguration.builder()
-    .connectedTo("localhost:9200", "localhost:9291")
-    .withClientConfigurer(Rest5Clients.ElasticsearchRequestConfigCallback.from(requestConfigBuilder -> {
-        // configure the request config
-        return requestConfigBuilder;
-    }))
-    .build();
----
-====
-
 [[elasticsearch.clients.logging]]
 == Client Logging

 To see what is actually sent to and received from the server `Request` / `Response` logging on the transport level needs to be turned on as outlined in the snippet below.
-This can be enabled in the Elasticsearch client by setting the level of the `co.elastic.clients.transport.rest5_client.low_level.Request` package to "trace" (see
-https://www.elastic.co/docs/reference/elasticsearch/clients/java/transport/rest5-client/usage/logging)
+This can be enabled in the Elasticsearch client by setting the level of the `tracer` package to "trace" (see
+https://www.elastic.co/guide/en/elasticsearch/client/java-api-client/current/java-rest-low-usage-logging.html)

 .Enable transport layer logging
-[tabs]
-======
-XML::
-+
 [source,xml]
 ----
-<logger name="co.elastic.clients.transport.rest5_client.low_level.Request" level="trace"/>
+<logger name="tracer" level="trace"/>
 ----
-
-yml::
-+
-[source,yml]
----
-logging.level:
-  co.elastic.clients.transport.rest5_client.low_level.Request: trace
----
-
-ini::
-+
-[source,ini]
----
-logging.level.co.elastic.clients.transport.rest5_client.low_level.Request=trace
----
-======
@@ -1,22 +1,9 @@
 [[new-features]]
 = What's new

-[[new-features.6-0-0]]
-== New in Spring Data Elasticsearch 6.0
-
-* Upgrade to Spring 7
-* Switch to jspecify nullability annotations
-* Upgrade to Elasticsearch 9.2.2
-* Use the new Elasticsearch Rest5Client as default
-* Add support for SpEL expressions in the `settingPath` parameter of the `@Setting` annotation
-
-
-[[new-features.5-5-0]]
-== New in Spring Data Elasticsearch 5.5
-
-* Upgrade to Elasticsearch 8.18.1.
-* Add support for the `@SearchTemplateQuery` annotation on repository methods.
-* Scripted field properties of type collection can be populated from scripts returning arrays.
+[[new-features.5-4-1]]
+== New in Spring Data Elasticsearch 5.4.1
+* Upgrade to Elasticsearch 8.15.5.

 [[new-features.5-4-0]]
 == New in Spring Data Elasticsearch 5.4
@@ -11,7 +11,7 @@ When creating Elasticsearch indices with Spring Data Elasticsearch different ind
 The following arguments are available:

 * `useServerConfiguration` does not send any settings parameters, so the Elasticsearch server configuration determines them.
-* `settingPath` refers to a JSON file defining the settings that must be resolvable in the classpath, it is possible to use a SpEL expression here
+* `settingPath` refers to a JSON file defining the settings that must be resolvable in the classpath
 * `shards` the number of shards to use, defaults to _1_
 * `replicas` the number of replicas, defaults to _1_
 * `refreshIntervall`, defaults to _"1s"_
@@ -365,8 +365,6 @@ operations.putScript(                            <.>

 To use a search template in a search query, Spring Data Elasticsearch provides the `SearchTemplateQuery`, an implementation of the `org.springframework.data.elasticsearch.core.query.Query` interface.

-NOTE: Although `SearchTemplateQuery` is an implementation of the `Query` interface, not all of the functionality provided by the base class is available for a `SearchTemplateQuery` like setting a `Pageable` or a `Sort`. Values for this functionality must be added to the stored script like shown in the following example for paging parameters. If these values are set on the `Query` object, they will be ignored.
-
 In the following code, we will add a call using a search template query to a custom repository implementation (see
 xref:repositories/custom-implementations.adoc[]) as an example how this can be integrated into a repository call.

@@ -451,3 +449,4 @@ var query = Query.findAll().addSort(Sort.by(order));
 About the filter query: It is not possible to use a `CriteriaQuery` here, as this query would be converted into a Elasticsearch nested query which does not work in the filter context. So only `StringQuery` or `NativeQuery` can be used here. When using one of these, like the term query above, the Elasticsearch field names must be used, so take care, when these are redefined with the `@Field(name="...")` definition.

 For the definition of the order path and the nested paths, the Java entity property names should be used.
+
@@ -10,9 +10,7 @@ The Elasticsearch module supports all basic query building feature as string que
 === Declared queries

 Deriving the query from the method name is not always sufficient and/or may result in unreadable method names.
-In this case one might make use of the `@Query` annotation (see xref:elasticsearch/repositories/elasticsearch-repository-queries.adoc#elasticsearch.query-methods.at-query[Using the @Query Annotation] ).
-
-Another possibility is the use of a search-template, (see xref:elasticsearch/repositories/elasticsearch-repository-queries.adoc#elasticsearch.query-methods.at-searchtemplate-query[Using the @SearchTemplateQuery Annotation] ).
+In this case one might make use of the `@Query` annotation (see xref:elasticsearch/repositories/elasticsearch-repository-queries.adoc#elasticsearch.query-methods.at-query[Using @Query Annotation] ).

 [[elasticsearch.query-methods.criterions]]
 == Query creation
@@ -314,13 +312,11 @@ Repository methods can be defined to have the following return types for returni
 * `SearchPage<T>`

 [[elasticsearch.query-methods.at-query]]
-== Using the @Query Annotation
+== Using @Query Annotation

 .Declare query on the method using the `@Query` annotation.
 ====
-The arguments passed to the method can be inserted into placeholders in the query string.
-The placeholders are of the form `?0`, `?1`, `?2` etc. for the first, second, third parameter and so on.
-
+The arguments passed to the method can be inserted into placeholders in the query string. The placeholders are of the form `?0`, `?1`, `?2` etc. for the first, second, third parameter and so on.
 [source,java]
 ----
 interface BookRepository extends ElasticsearchRepository<Book, String> {
@@ -345,20 +341,15 @@ It will be sent to Easticsearch as value of the query element; if for example th
 }
 ----
 ====
-
 .`@Query` annotation on a method taking a Collection argument
 ====
 A repository method such as
-
 [source,java]
 ----
@Query("{\"ids\": {\"values\": ?0 }}")
 List<SampleEntity> getByIds(Collection<String> ids);
 ----
-
-would make an https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-query.html[IDs query] to return all the matching documents.
-So calling the method with a `List` of `["id1", "id2", "id3"]` would produce the query body
-
+would make an https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-query.html[IDs query] to return all the matching documents. So calling the method with a `List` of `["id1", "id2", "id3"]` would produce the query body
 [source,json]
 ----
 {
@@ -378,6 +369,7 @@ So calling the method with a `List` of `["id1", "id2", "id3"]` would produce the
 ====
 {spring-framework-docs}/core/expressions.html[SpEL expression] is also supported when defining query in `@Query`.

+
 [source,java]
 ----
 interface BookRepository extends ElasticsearchRepository<Book, String> {
@@ -419,7 +411,6 @@ If for example the function is called with the parameter _John_, it would produc
 .accessing parameter property.
 ====
 Supposing that we have the following class as query parameter type:
-
 [source,java]
 ----
 public record QueryParameter(String value) {
@@ -453,9 +444,7 @@ We can pass `new QueryParameter("John")` as the parameter now, and it will produ

 .accessing bean property.
 ====
-{spring-framework-docs}/core/expressions/language-ref/bean-references.html[Bean property] is also supported to access.
-Given that there is a bean named `queryParameter` of type `QueryParameter`, we can access the bean with symbol `@` rather than `#`, and there is no need to declare a parameter of type `QueryParameter` in the query method:
-
+{spring-framework-docs}/core/expressions/language-ref/bean-references.html[Bean property] is also supported to access. Given that there is a bean named `queryParameter` of type `QueryParameter`, we can access the bean with symbol `@` rather than `#`, and there is no need to declare a parameter of type `QueryParameter` in the query method:
 [source,java]
 ----
 interface BookRepository extends ElasticsearchRepository<Book, String> {
@@ -504,7 +493,6 @@ interface BookRepository extends ElasticsearchRepository<Book, String> {
 NOTE: collection values should not be quoted when declaring the elasticsearch json query.

 A collection of `names` like `List.of("name1", "name2")` will produce the following terms query:
-
 [source,json]
 ----
 {
@@ -544,7 +532,6 @@ interface BookRepository extends ElasticsearchRepository<Book, String> {
    Page<Book> findByName(Collection<QueryParameter> parameters, Pageable pageable);
 }
 ----
-
 This will extract all the `value` property values as a new `Collection` from `QueryParameter` collection, thus takes the same effect as above.
 ====

@@ -573,20 +560,3 @@ interface BookRepository extends ElasticsearchRepository<Book, String> {
 ----

 ====
-
-[[elasticsearch.query-methods.at-searchtemplate-query]]
-== Using the @SearchTemplateQuery Annotation
-
-When using Elasticsearch search templates - (see xref:elasticsearch/misc.adoc#elasticsearch.misc.searchtemplates [Search Template support]) it is possible to specify that a repository method should use a template by adding the `@SearchTemplateQuery` annotation to that method.
-
-Let's assume that there is a search template stored with the name "book-by-title" and this template need a parameter named "title", then a repository method using that search template can be defined like this:
-
-[source,java]
----
-interface BookRepository extends ElasticsearchRepository<Book, String> {
-    @SearchTemplateQuery(id = "book-by-title")
-    SearchHits<Book> findByTitle(String title);
-}
----
-
-The parameters of the repository method are sent to the seacrh template as key/value pairs where the key is the parameter name and the value is taken from the actual value when the method is invoked.
@@ -20,12 +20,12 @@ Whereas the birthdate is fix, the age depends on the time when a query is issued
 ====
 [source,java]
 ----
-import org.jspecify.annotations.Nullable;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.ScriptedField;
+import org.springframework.lang.Nullable;

 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -6,11 +6,9 @@ The following table shows the Elasticsearch and Spring versions that are used by
 [cols="^,^,^,^",options="header"]
 |===
 | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
-| 2025.1 | 6.0.x | 9.2.6 | 7.0.x
-| 2025.0 | 5.5.x | 8.18.1 | 6.2.x
-| 2024.1 | 5.4.xfootnote:oom[Out of maintenance] | 8.15.5 | 6.1.x
-| 2024.0 | 5.3.xfootnote:oom[] | 8.13.4 | 6.1.x
-| 2023.1 (Vaughan) | 5.2.xfootnote:oom[] | 8.11.1 | 6.1.x
+| 2024.1  | 5.4.x | 8.15.5 | 6.2.x
+| 2024.0  | 5.3.1 | 8.13.4 | 6.1.x
+| 2023.1 (Vaughan) | 5.2.xfootnote:oom[Out of maintenance] | 8.11.1 | 6.1.x
 | 2023.0 (Ullmann) | 5.1.xfootnote:oom[] | 8.7.1 | 6.0.x
 | 2022.0 (Turing) | 5.0.xfootnote:oom[] | 8.5.3 | 6.0.x
 | 2021.2 (Raj) | 4.4.xfootnote:oom[] | 7.17.3 | 5.3.x
@@ -1,30 +0,0 @@
-[[elasticsearch-migration-guide-5.4-5.5]]
-= Upgrading from 5.4.x to 5.5.x
-
-This section describes breaking changes from version 5.4.x to 5.5.x and how removed features can be replaced by new introduced features.
-
-[[elasticsearch-migration-guide-5.4-5.5.breaking-changes]]
-== Breaking Changes
-
-[[elasticsearch-migration-guide-5.4-5.5.deprecations]]
-== Deprecations
-
-Some classes that probably are not used by a library user have been renamed, the classes with the old names are still there, but are deprecated:
-
-|===
-|old name|new name
-
-|ElasticsearchPartQuery|RepositoryPartQuery
-|ElasticsearchStringQuery|RepositoryStringQuery
-|ReactiveElasticsearchStringQuery|ReactiveRepositoryStringQuery
-|===
-
-=== Removals
-
-The following methods that had been deprecated since release 5.3 have been removed:
-```
-DocumentOperations.delete(Query, Class<?>)
-DocumentOperations.delete(Query, Class<?>, IndexCoordinates)
-ReactiveDocumentOperations.delete(Query, Class<?>)
-ReactiveDocumentOperations.delete(Query, Class<?>, IndexCoordinates)
-```
@@ -1,27 +0,0 @@
-[[elasticsearch-migration-guide-5.5-6.0]]
-= Upgrading from 5.5.x to 6.0.x
-
-This section describes breaking changes from version 5.5.x to 6.0.x and how removed features can be replaced by new introduced features.
-
-[[elasticsearch-migration-guide-5.5-6.0.breaking-changes]]
-== Breaking Changes
-
-From version 6.0 on, Spring Data Elasticsearch uses the Elasticsearch 9 libraries and as default the new `Rest5Client` provided by these libraries. It is still possible to use the old `RestClient`, check xref:elasticsearch/clients.adoc[Elasticsearch clients] for information. The configuration callbacks for this `RestClient` have been moved from `org.springframework.data.elasticsearch.client.elc.ElasticsearchClients` to the `org.springframework.data.elasticsearch.client.elc.rest_client.RestClients` class.
-
-In the `org.springframework.data.elasticsearch.core.query.UpdateQuery` class the type of the two fields `ifSeqNo` and `ifPrimaryTerm` has changed from `Integer` to `Long` to align with the normal query and the underlying Elasticsearch client.
-
-[[elasticsearch-migration-guide-5.5-6.0.deprecations]]
-== Deprecations
-
-All the code using the old `RestClient` has been moved to the `org.springframework.data.elasticsearch.client.elc.rest_client` package and has been deprecated. Users should switch to the classes from the `org.springframework.data.elasticsearch.client.elc.rest5_client` package.
-
-
-=== Removals
-
-The `org.springframework.data.elasticsearch.core.query.ScriptType` enum has been removed. To distinguish between an inline and a stored script set the appropriate values in the `org.springframework.data.elasticsearch.core.query.ScriptData` record.
-
-These methods have been removed because the Elasticsearch Client 9 does not support them anymore:
-```
-org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchIndicesClient.unfreeze(UnfreezeRequest)
-org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchIndicesClient.unfreeze(Function<UnfreezeRequest.Builder, ObjectBuilder<UnfreezeRequest>>)
-```
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-present the original author or authors.
+ * Copyright 2020-2025 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-present the original author or authors.
+ * Copyright 2022-2025 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,9 +15,9 @@
 */
 package org.springframework.data.elasticsearch;

-import java.util.List;
+import org.springframework.lang.Nullable;

-import org.jspecify.annotations.Nullable;
+import java.util.List;

 /**
 * Object describing an Elasticsearch error
@@ -26,7 +26,8 @@ import org.jspecify.annotations.Nullable;
 * @since 4.4
 */
 public class ElasticsearchErrorCause {
-	@Nullable private final String type;
+	@Nullable
+	private final String type;

 	private final String reason;

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-present the original author or authors.
+ * Copyright 2019-2025 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-present the original author or authors.
+ * Copyright 2021-2025 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-present the original author or authors.
+ * Copyright 2022-2025 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-present the original author or authors.
+ * Copyright 2021-2025 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-present the original author or authors.
+ * Copyright 2020-2025 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,8 +15,8 @@
 */
 package org.springframework.data.elasticsearch;

-import org.jspecify.annotations.Nullable;
 import org.springframework.dao.UncategorizedDataAccessException;
+import org.springframework.lang.Nullable;

 /**
 * @author Peter-Josef Meisch
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-present the original author or authors.
+ * Copyright 2023-2025 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 2024-present the original author or authors.
+ * Copyright 2024-2025 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 2024-present the original author or authors.
+ * Copyright 2024-2025 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-present the original author or authors.
+ * Copyright 2019-2025 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-present the original author or authors.
+ * Copyright 2013-2025 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-present the original author or authors.
+ * Copyright 2021-2025 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-present the original author or authors.
+ * Copyright 2014-2025 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-present the original author or authors.
+ * Copyright 2013-2025 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.
@@ -107,15 +107,17 @@ public @interface Document {
 	 */
 	Alias[] aliases() default {};

-    /**
-     * Note: the enum value FORCE, which was introduced in 4.4 has been removed
-     * again by Elasticsearch.
+	/**
 	 * @since 4.3
 	 */
 	enum VersionType {
 		INTERNAL("internal"), //
 		EXTERNAL("external"), //
-		EXTERNAL_GTE("external_gte"); //
+		EXTERNAL_GTE("external_gte"), //
+		/**
+		 * @since 4.4
+		 */
+		FORCE("force");

 		private final String esName;

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-present the original author or authors.
+ * Copyright 2021-2025 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-present the original author or authors.
+ * Copyright 2013-2025 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 2024-present the original author or authors.
+ * Copyright 2024-2025 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-present the original author or authors.
+ * Copyright 2013-2025 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 2024-present the original author or authors.
+ * Copyright 2024-2025 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-present the original author or authors.
+ * Copyright 2013-2025 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-present the original author or authors.
+ * Copyright 2017-2025 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-present the original author or authors.
+ * Copyright 2020-2025 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-present the original author or authors.
+ * Copyright 2020-2025 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-present the original author or authors.
+ * Copyright 2020-2025 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-present the original author or authors.
+ * Copyright 2019-2025 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-present the original author or authors.
+ * Copyright 2019-2025 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-present the original author or authors.
+ * Copyright 2023-2025 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-present the original author or authors.
+ * Copyright 2014-2025 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-present the original author or authors.
+ * Copyright 2020-2025 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-present the original author or authors.
+ * Copyright 2020-2025 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 2024-present the original author or authors.
+ * Copyright 2024-2025 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 2024-present the original author or authors.
+ * Copyright 2024-2025 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 2024-present the original author or authors.
+ * Copyright 2024-2025 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-present the original author or authors.
+ * Copyright 2014-2025 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 2024-present the original author or authors.
+ * Copyright 2024-2025 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-present the original author or authors.
+ * Copyright 2014-2025 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-present the original author or authors.
+ * Copyright 2020-2025 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-present the original author or authors.
+ * Copyright 2013-2025 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,42 +0,0 @@
-/*
- * Copyright 2025-present 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import org.springframework.data.annotation.QueryAnnotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to mark a repository method as a search template method. The annotation defines the search template id,
- * the parameters for the search template are taken from the method's arguments.
- *
- * @author P.J. Meisch (pj.meisch@sothawo.com)
- * @since 5.5
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
-@Documented
-@QueryAnnotation
-public @interface SearchTemplateQuery {
-    /**
-     * The id of the search template. Must not be empt or null.
-     */
-    String id();
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-present the original author or authors.
+ * Copyright 2014-2025 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-present the original author or authors.
+ * Copyright 2019-2025 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-present the original author or authors.
+ * Copyright 2022-2025 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-present the original author or authors.
+ * Copyright 2019-2025 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-present the original author or authors.
+ * Copyright 2021-2025 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-present the original author or authors.
+ * Copyright 2022-2025 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-present the original author or authors.
+ * Copyright 2021-2025 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,2 +1,3 @@
-@org.jspecify.annotations.NullMarked
+@org.springframework.lang.NonNullApi
+@org.springframework.lang.NonNullFields
 package org.springframework.data.elasticsearch.annotations;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-present the original author or authors.
+ * Copyright 2023-2025 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.
@@ -17,7 +17,7 @@ package org.springframework.data.elasticsearch.aot;

 import java.util.function.Predicate;

-import org.springframework.data.core.ReactiveWrappers;
+import org.springframework.data.util.ReactiveWrappers;

 /**
 * @author Peter-Josef Meisch
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-present the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ import static org.springframework.data.elasticsearch.aot.ElasticsearchAotPredica

 import java.util.Arrays;

-import org.jspecify.annotations.Nullable;
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
@@ -33,6 +32,7 @@ import org.springframework.data.elasticsearch.core.event.ReactiveAfterConvertCal
 import org.springframework.data.elasticsearch.core.event.ReactiveAfterLoadCallback;
 import org.springframework.data.elasticsearch.core.event.ReactiveAfterSaveCallback;
 import org.springframework.data.elasticsearch.core.event.ReactiveBeforeConvertCallback;
+import org.springframework.lang.Nullable;

 /**
 * @author Peter-Josef Meisch
@@ -1,2 +1,3 @@
-@org.jspecify.annotations.NullMarked
+@org.springframework.lang.NonNullApi
+@org.springframework.lang.NonNullFields
 package org.springframework.data.elasticsearch.aot;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-present the original author or authors.
+ * Copyright 2018-2025 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.
@@ -25,8 +25,8 @@ import java.util.function.Supplier;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;

-import org.jspecify.annotations.Nullable;
 import org.springframework.data.elasticsearch.support.HttpHeaders;
+import org.springframework.lang.Nullable;

 /**
 * Configuration interface exposing common client configuration properties for Elasticsearch clients.
@@ -127,16 +127,10 @@ public interface ClientConfiguration {
 	Optional<String> getCaFingerprint();

 	/**
-	 * Returns the {@link HostnameVerifier} to use. Must be {@link Optional#empty()} if not configured.
-	 * Cannot be used with the Rest5Client used from Elasticsearch 9 on as the underlying Apache http components 5 does not offer a way
-	 * to set this. Users that need a hostname verifier must integrate this in a SSLContext.
-	 * Returning a value here is ignored in this case
+	 * Returns the {@link HostnameVerifier} to use. Can be {@link Optional#empty()} if not configured.
 	 *
 	 * @return the {@link HostnameVerifier} to use. Can be {@link Optional#empty()} if not configured.
-	 * @deprecated since 6.0
 	 */
-	// todo #3117 document this
-	@Deprecated(since = "6.0", forRemoval=true)
 	Optional<HostnameVerifier> getHostNameVerifier();

 	/**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-present the original author or authors.
+ * Copyright 2018-2025 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.
@@ -25,11 +25,11 @@ import java.util.function.Supplier;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;

-import org.jspecify.annotations.Nullable;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationBuilderWithRequiredEndpoint;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.MaybeSecureClientConfigurationBuilder;
 import org.springframework.data.elasticsearch.client.ClientConfiguration.TerminalClientConfigurationBuilder;
 import org.springframework.data.elasticsearch.support.HttpHeaders;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

 /**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-present the original author or authors.
+ * Copyright 2018-2025 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,8 +24,9 @@ import java.util.function.Supplier;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;

-import org.jspecify.annotations.Nullable;
+import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
 import org.springframework.data.elasticsearch.support.HttpHeaders;
+import org.springframework.lang.Nullable;

 /**
 * Default {@link ClientConfiguration} implementation.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-present the original author or authors.
+ * Copyright 2018-2025 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-present the original author or authors.
+ * Copyright 2018-2025 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-present the original author or authors.
+ * Copyright 2018-2025 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-present the original author or authors.
+ * Copyright 2022-2025 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-present the original author or authors.
+ * Copyright 2022-2025 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 2024-present the original author or authors.
+ * Copyright 2024-2025 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.
@@ -17,10 +17,10 @@ package org.springframework.data.elasticsearch.client.elc;

 import java.util.function.Consumer;

-import org.jspecify.annotations.Nullable;
 import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.StringQuery;
+import org.springframework.lang.Nullable;

 /**
 * An abstract class that serves as a base for query processors. It provides a common interface and basic functionality
@@ -38,8 +38,8 @@ public abstract class AbstractQueryProcessor {
 	 * @param queryConverter correct mapped field names and the values to the converted values.
 	 * @return an Elasticsearch {@literal query}.
 	 */
-
-	static co.elastic.clients.elasticsearch._types.query_dsl.@Nullable Query getEsQuery(@Nullable Query query,
+	@Nullable
+	static co.elastic.clients.elasticsearch._types.query_dsl.Query getEsQuery(@Nullable Query query,
 			@Nullable Consumer<Query> queryConverter) {
 		if (query == null) {
 			return null;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-present the original author or authors.
+ * Copyright 2022-2025 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-present the original author or authors.
+ * Copyright 2021-2025 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.
@@ -18,8 +18,6 @@ package org.springframework.data.elasticsearch.client.elc;
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.transport.ElasticsearchTransport;

-import java.io.IOException;
-
 import org.elasticsearch.client.RestClient;
 import org.springframework.util.Assert;

@@ -38,10 +36,7 @@ public class AutoCloseableElasticsearchClient extends ElasticsearchClient implem
 	}

 	@Override
-	public void close() throws IOException {
-		// since Elasticsearch 8.16 the ElasticsearchClient implements (through ApiClient) the Closeable interface and
-		// handles closing of the underlying transport. We now just call the base class, but keep this as we
-		// have been implementing AutoCloseable since 4.4 and won't change that to a mere Closeable
-		super.close();
+	public void close() throws Exception {
+		transport.close();
 	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-present the original author or authors.
+ * Copyright 2021-2025 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-present the original author or authors.
+ * Copyright 2021-2025 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-present the original author or authors.
+ * Copyright 2021-2025 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-present the original author or authors.
+ * Copyright 2021-2025 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-present the original author or authors.
+ * Copyright 2021-2025 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.
@@ -31,13 +31,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;

-import org.jspecify.annotations.Nullable;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.core.query.Criteria;
 import org.springframework.data.elasticsearch.core.query.Field;
 import org.springframework.data.elasticsearch.core.query.HasChildQuery;
 import org.springframework.data.elasticsearch.core.query.HasParentQuery;
 import org.springframework.data.elasticsearch.core.query.InnerHitsQuery;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

 /**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-present the original author or authors.
+ * Copyright 2021-2025 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,17 +24,6 @@ import co.elastic.clients.elasticsearch.core.search.Hit;
 import co.elastic.clients.elasticsearch.core.search.NestedIdentity;
 import co.elastic.clients.json.JsonData;
 import co.elastic.clients.json.JsonpMapper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jspecify.annotations.Nullable;
-import org.springframework.data.elasticsearch.core.MultiGetItem;
-import org.springframework.data.elasticsearch.core.document.Document;
-import org.springframework.data.elasticsearch.core.document.Explanation;
-import org.springframework.data.elasticsearch.core.document.NestedMetaData;
-import org.springframework.data.elasticsearch.core.document.SearchDocument;
-import org.springframework.data.elasticsearch.core.document.SearchDocumentAdapter;
-import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
-import org.springframework.util.Assert;

 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -43,6 +32,18 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;

+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.data.elasticsearch.core.MultiGetItem;
+import org.springframework.data.elasticsearch.core.document.Document;
+import org.springframework.data.elasticsearch.core.document.Explanation;
+import org.springframework.data.elasticsearch.core.document.NestedMetaData;
+import org.springframework.data.elasticsearch.core.document.SearchDocument;
+import org.springframework.data.elasticsearch.core.document.SearchDocumentAdapter;
+import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
 /**
 * Utility class to adapt different Elasticsearch responses to a
 * {@link org.springframework.data.elasticsearch.core.document.Document}
@@ -54,188 +55,187 @@ import java.util.stream.Collectors;
 */
 final class DocumentAdapters {

-    private static final Log LOGGER = LogFactory.getLog(DocumentAdapters.class);
+	private static final Log LOGGER = LogFactory.getLog(DocumentAdapters.class);

-    private DocumentAdapters() {
-    }
+	private DocumentAdapters() {}

-    /**
-     * Creates a {@link SearchDocument} from a {@link Hit} returned by the Elasticsearch client.
-     *
-     * @param hit         the hit object
-     * @param jsonpMapper to map JsonData objects
-     * @return the created {@link SearchDocument}
-     */
-    public static SearchDocument from(Hit<?> hit, JsonpMapper jsonpMapper) {
+	/**
+	 * Creates a {@link SearchDocument} from a {@link Hit} returned by the Elasticsearch client.
+	 *
+	 * @param hit the hit object
+	 * @param jsonpMapper to map JsonData objects
+	 * @return the created {@link SearchDocument}
+	 */
+	public static SearchDocument from(Hit<?> hit, JsonpMapper jsonpMapper) {

-        Assert.notNull(hit, "hit must not be null");
+		Assert.notNull(hit, "hit must not be null");

-        Map<String, List<String>> highlightFields = hit.highlight();
+		Map<String, List<String>> highlightFields = hit.highlight();

-        Map<String, SearchDocumentResponse> innerHits = new LinkedHashMap<>();
-        hit.innerHits().forEach((name, innerHitsResult) -> {
-            // noinspection ReturnOfNull
-            innerHits.put(name, SearchDocumentResponseBuilder.from(innerHitsResult.hits(), null, null, null, 0, null, null,
-                    searchDocument -> null, jsonpMapper));
-        });
+		Map<String, SearchDocumentResponse> innerHits = new LinkedHashMap<>();
+		hit.innerHits().forEach((name, innerHitsResult) -> {
+			// noinspection ReturnOfNull
+			innerHits.put(name, SearchDocumentResponseBuilder.from(innerHitsResult.hits(), null, null, null, 0, null, null,
+					searchDocument -> null, jsonpMapper));
+		});

-        NestedMetaData nestedMetaData = from(hit.nested());
+		NestedMetaData nestedMetaData = from(hit.nested());

-        Explanation explanation = from(hit.explanation());
+		Explanation explanation = from(hit.explanation());

-        Map<String, Double> matchedQueries = hit.matchedQueries();
+		List<String> matchedQueries = hit.matchedQueries();

-        Function<Map<String, JsonData>, EntityAsMap> fromFields = fields -> {
-            StringBuilder sb = new StringBuilder("{");
-            final boolean[] firstField = {true};
-            hit.fields().forEach((key, jsonData) -> {
-                if (!firstField[0]) {
-                    sb.append(',');
-                }
-                sb.append('"').append(key).append("\":") //
-                        .append(jsonData.toJson(jsonpMapper).toString());
-                firstField[0] = false;
-            });
-            sb.append('}');
-            return new EntityAsMap().fromJson(sb.toString());
-        };
+		Function<Map<String, JsonData>, EntityAsMap> fromFields = fields -> {
+			StringBuilder sb = new StringBuilder("{");
+			final boolean[] firstField = { true };
+			hit.fields().forEach((key, jsonData) -> {
+				if (!firstField[0]) {
+					sb.append(',');
+				}
+				sb.append('"').append(key).append("\":") //
+						.append(jsonData.toJson(jsonpMapper).toString());
+				firstField[0] = false;
+			});
+			sb.append('}');
+			return new EntityAsMap().fromJson(sb.toString());
+		};

-        EntityAsMap hitFieldsAsMap = fromFields.apply(hit.fields());
+		EntityAsMap hitFieldsAsMap = fromFields.apply(hit.fields());

-        Map<String, List<Object>> documentFields = new LinkedHashMap<>();
-        hitFieldsAsMap.forEach((key, value) -> {
-            if (value instanceof List) {
-                // noinspection unchecked
-                documentFields.put(key, (List<Object>) value);
-            } else {
-                documentFields.put(key, Collections.singletonList(value));
-            }
-        });
+		Map<String, List<Object>> documentFields = new LinkedHashMap<>();
+		hitFieldsAsMap.forEach((key, value) -> {
+			if (value instanceof List) {
+				// noinspection unchecked
+				documentFields.put(key, (List<Object>) value);
+			} else {
+				documentFields.put(key, Collections.singletonList(value));
+			}
+		});

-        Document document;
-        Object source = hit.source();
-        if (source == null) {
-            document = Document.from(hitFieldsAsMap);
-        } else {
-            if (source instanceof EntityAsMap entityAsMap) {
-                document = Document.from(entityAsMap);
-            } else if (source instanceof JsonData jsonData) {
-                document = Document.from(jsonData.to(EntityAsMap.class));
-            } else {
+		Document document;
+		Object source = hit.source();
+		if (source == null) {
+			document = Document.from(hitFieldsAsMap);
+		} else {
+			if (source instanceof EntityAsMap entityAsMap) {
+				document = Document.from(entityAsMap);
+			} else if (source instanceof JsonData jsonData) {
+				document = Document.from(jsonData.to(EntityAsMap.class));
+			} else {

-                if (LOGGER.isWarnEnabled()) {
-                    LOGGER.warn(String.format("Cannot map from type " + source.getClass().getName()));
-                }
-                document = Document.create();
-            }
-        }
-        document.setIndex(hit.index());
-        document.setId(hit.id());
+				if (LOGGER.isWarnEnabled()) {
+					LOGGER.warn(String.format("Cannot map from type " + source.getClass().getName()));
+				}
+				document = Document.create();
+			}
+		}
+		document.setIndex(hit.index());
+		document.setId(hit.id());

-        if (hit.version() != null) {
-            document.setVersion(hit.version());
-        }
-        document.setSeqNo(hit.seqNo() != null && hit.seqNo() >= 0 ? hit.seqNo() : -2); // -2 was the default value in the
-        // old client
-        document.setPrimaryTerm(hit.primaryTerm() != null && hit.primaryTerm() > 0 ? hit.primaryTerm() : 0);
+		if (hit.version() != null) {
+			document.setVersion(hit.version());
+		}
+		document.setSeqNo(hit.seqNo() != null && hit.seqNo() >= 0 ? hit.seqNo() : -2); // -2 was the default value in the
+		// old client
+		document.setPrimaryTerm(hit.primaryTerm() != null && hit.primaryTerm() > 0 ? hit.primaryTerm() : 0);

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

-    public static SearchDocument from(CompletionSuggestOption<EntityAsMap> completionSuggestOption) {
+	public static SearchDocument from(CompletionSuggestOption<EntityAsMap> completionSuggestOption) {

-        Document document = completionSuggestOption.source() != null ? Document.from(completionSuggestOption.source())
-                : Document.create();
-        document.setIndex(completionSuggestOption.index());
+		Document document = completionSuggestOption.source() != null ? Document.from(completionSuggestOption.source())
+				: Document.create();
+		document.setIndex(completionSuggestOption.index());

-        if (completionSuggestOption.id() != null) {
-            document.setId(completionSuggestOption.id());
-        }
+		if (completionSuggestOption.id() != null) {
+			document.setId(completionSuggestOption.id());
+		}

-        float score = completionSuggestOption.score() != null ? completionSuggestOption.score().floatValue() : Float.NaN;
-        return new SearchDocumentAdapter(document, score, new Object[]{}, Collections.emptyMap(), Collections.emptyMap(),
-                Collections.emptyMap(), null, null, null, completionSuggestOption.routing());
-    }
+		float score = completionSuggestOption.score() != null ? completionSuggestOption.score().floatValue() : Float.NaN;
+		return new SearchDocumentAdapter(document, score, new Object[] {}, Collections.emptyMap(), Collections.emptyMap(),
+				Collections.emptyMap(), null, null, null, completionSuggestOption.routing());
+	}

-    @Nullable
-    private static Explanation from(co.elastic.clients.elasticsearch.core.explain.@Nullable Explanation explanation) {
+	@Nullable
+	private static Explanation from(@Nullable co.elastic.clients.elasticsearch.core.explain.Explanation explanation) {

-        if (explanation == null) {
-            return null;
-        }
-        List<Explanation> details = explanation.details().stream().map(DocumentAdapters::from).collect(Collectors.toList());
-        return new Explanation(true, (double) explanation.value(), explanation.description(), details);
-    }
+		if (explanation == null) {
+			return null;
+		}
+		List<Explanation> details = explanation.details().stream().map(DocumentAdapters::from).collect(Collectors.toList());
+		return new Explanation(true, (double) explanation.value(), explanation.description(), details);
+	}

-    private static Explanation from(ExplanationDetail explanationDetail) {
+	private static Explanation from(ExplanationDetail explanationDetail) {

-        List<Explanation> details = explanationDetail.details().stream().map(DocumentAdapters::from)
-                .collect(Collectors.toList());
-        return new Explanation(null, (double) explanationDetail.value(), explanationDetail.description(), details);
-    }
+		List<Explanation> details = explanationDetail.details().stream().map(DocumentAdapters::from)
+				.collect(Collectors.toList());
+		return new Explanation(null, (double) explanationDetail.value(), explanationDetail.description(), details);
+	}

-    @Nullable
-    private static NestedMetaData from(@Nullable NestedIdentity nestedIdentity) {
+	@Nullable
+	private static NestedMetaData from(@Nullable NestedIdentity nestedIdentity) {

-        if (nestedIdentity == null) {
-            return null;
-        }
+		if (nestedIdentity == null) {
+			return null;
+		}

-        NestedMetaData child = from(nestedIdentity.nested());
-        return NestedMetaData.of(nestedIdentity.field(), nestedIdentity.offset(), child);
-    }
+		NestedMetaData child = from(nestedIdentity.nested());
+		return NestedMetaData.of(nestedIdentity.field(), nestedIdentity.offset(), child);
+	}

-    /**
-     * Creates a {@link Document} from a {@link GetResponse} where the found document is contained as {@link EntityAsMap}.
-     *
-     * @param getResponse the response instance
-     * @return the Document
-     */
-    @Nullable
-    public static Document from(GetResult<EntityAsMap> getResponse) {
+	/**
+	 * Creates a {@link Document} from a {@link GetResponse} where the found document is contained as {@link EntityAsMap}.
+	 *
+	 * @param getResponse the response instance
+	 * @return the Document
+	 */
+	@Nullable
+	public static Document from(GetResult<EntityAsMap> getResponse) {

-        Assert.notNull(getResponse, "getResponse must not be null");
+		Assert.notNull(getResponse, "getResponse must not be null");

-        if (!getResponse.found()) {
-            return null;
-        }
+		if (!getResponse.found()) {
+			return null;
+		}

-        Document document = getResponse.source() != null ? Document.from(getResponse.source()) : Document.create();
-        document.setIndex(getResponse.index());
-        document.setId(getResponse.id());
+		Document document = getResponse.source() != null ? Document.from(getResponse.source()) : Document.create();
+		document.setIndex(getResponse.index());
+		document.setId(getResponse.id());

-        if (getResponse.version() != null) {
-            document.setVersion(getResponse.version());
-        }
+		if (getResponse.version() != null) {
+			document.setVersion(getResponse.version());
+		}

-        if (getResponse.seqNo() != null) {
-            document.setSeqNo(getResponse.seqNo());
-        }
+		if (getResponse.seqNo() != null) {
+			document.setSeqNo(getResponse.seqNo());
+		}

-        if (getResponse.primaryTerm() != null) {
-            document.setPrimaryTerm(getResponse.primaryTerm());
-        }
+		if (getResponse.primaryTerm() != null) {
+			document.setPrimaryTerm(getResponse.primaryTerm());
+		}

-        return document;
-    }
+		return document;
+	}

-    /**
-     * Creates a list of {@link MultiGetItem}s from a {@link MgetResponse} where the data is contained as
-     * {@link EntityAsMap} instances.
-     *
-     * @param mgetResponse the response instance
-     * @return list of multiget items
-     */
-    public static List<MultiGetItem<Document>> from(MgetResponse<EntityAsMap> mgetResponse) {
+	/**
+	 * Creates a list of {@link MultiGetItem}s from a {@link MgetResponse} where the data is contained as
+	 * {@link EntityAsMap} instances.
+	 *
+	 * @param mgetResponse the response instance
+	 * @return list of multiget items
+	 */
+	public static List<MultiGetItem<Document>> from(MgetResponse<EntityAsMap> mgetResponse) {

-        Assert.notNull(mgetResponse, "mgetResponse must not be null");
+		Assert.notNull(mgetResponse, "mgetResponse must not be null");

-        return mgetResponse.docs().stream() //
-                .map(itemResponse -> MultiGetItem.of( //
-                        itemResponse.isFailure() ? null : from(itemResponse.result()), //
-                        ResponseConverter.getFailure(itemResponse)))
-                .collect(Collectors.toList());
-    }
+		return mgetResponse.docs().stream() //
+				.map(itemResponse -> MultiGetItem.of( //
+						itemResponse.isFailure() ? null : from(itemResponse.result()), //
+						ResponseConverter.getFailure(itemResponse)))
+				.collect(Collectors.toList());
+	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-present the original author or authors.
+ * Copyright 2022-2025 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-present the original author or authors.
+ * Copyright 2021-2025 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.
@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import org.jspecify.annotations.Nullable;
 import org.springframework.data.elasticsearch.core.AggregationsContainer;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

 /**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-present the original author or authors.
+ * Copyright 2022-2025 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-present the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,12 +19,12 @@ import co.elastic.clients.elasticsearch.ElasticsearchClient;

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jspecify.annotations.Nullable;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.FactoryBeanNotInitializedException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

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

-import static org.springframework.data.elasticsearch.client.elc.rest5_client.Rest5Clients.*;
-import static org.springframework.data.elasticsearch.client.elc.rest_client.RestClients.*;
-
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import co.elastic.clients.transport.ElasticsearchTransport;
 import co.elastic.clients.transport.TransportOptions;
+import co.elastic.clients.transport.TransportUtils;
 import co.elastic.clients.transport.Version;
-import co.elastic.clients.transport.rest5_client.Rest5ClientOptions;
-import co.elastic.clients.transport.rest5_client.Rest5ClientTransport;
-import co.elastic.clients.transport.rest5_client.low_level.RequestOptions;
-import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
 import co.elastic.clients.transport.rest_client.RestClientOptions;
 import co.elastic.clients.transport.rest_client.RestClientTransport;

+import java.net.InetSocketAddress;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;

+import org.apache.http.HttpHost;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpRequestInterceptor;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.entity.ContentType;
 import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
+import org.apache.http.message.BasicHeader;
 import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.protocol.HttpContext;
+import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestClient;
-import org.jspecify.annotations.Nullable;
+import org.elasticsearch.client.RestClientBuilder;
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
-import org.springframework.data.elasticsearch.support.VersionInfo;
+import org.springframework.data.elasticsearch.support.HttpHeaders;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

 /**
- * Utility class to create the different Elasticsearch clients. The RestClient class is the one used in Elasticsearch
- * until version 9, it is still available, but it's use is deprecated. The Rest5Client class is the one that should be
- * used from Elasticsearch 9 on.
+ * Utility class to create the different Elasticsearch clients
 *
 * @author Peter-Josef Meisch
 * @since 4.4
@@ -113,32 +119,18 @@ public final class ElasticsearchClients {
 	 *
 	 * @param restClient the underlying {@link RestClient}
 	 * @return the {@link ReactiveElasticsearchClient}
-	 * @deprecated since 6.0, use the version with a Rest5Client.
 	 */
-	@Deprecated(since = "6.0", forRemoval = true)
 	public static ReactiveElasticsearchClient createReactive(RestClient restClient) {
 		return createReactive(restClient, null, DEFAULT_JSONP_MAPPER);
 	}

-	/**
-	 * Creates a new {@link ReactiveElasticsearchClient}.
-	 *
-	 * @param rest5Client the underlying {@link RestClient}
-	 * @return the {@link ReactiveElasticsearchClient}
-	 */
-	public static ReactiveElasticsearchClient createReactive(Rest5Client rest5Client) {
-		return createReactive(rest5Client, null, DEFAULT_JSONP_MAPPER);
-	}
-
 	/**
 	 * Creates a new {@link ReactiveElasticsearchClient}.
 	 *
 	 * @param restClient the underlying {@link RestClient}
 	 * @param transportOptions options to be added to each request.
 	 * @return the {@link ReactiveElasticsearchClient}
-	 * @deprecated since 6.0, use the version with a Rest5Client.
 	 */
-	@Deprecated(since = "6.0", forRemoval = true)
 	public static ReactiveElasticsearchClient createReactive(RestClient restClient,
 			@Nullable TransportOptions transportOptions, JsonpMapper jsonpMapper) {

@@ -147,21 +139,6 @@ public final class ElasticsearchClients {
 		var transport = getElasticsearchTransport(restClient, REACTIVE_CLIENT, transportOptions, jsonpMapper);
 		return createReactive(transport);
 	}
-	/**
-	 * Creates a new {@link ReactiveElasticsearchClient}.
-	 *
-	 * @param rest5Client the underlying {@link RestClient}
-	 * @param transportOptions options to be added to each request.
-	 * @return the {@link ReactiveElasticsearchClient}
-	 */
-	public static ReactiveElasticsearchClient createReactive(Rest5Client rest5Client,
-			@Nullable TransportOptions transportOptions, JsonpMapper jsonpMapper) {
-
-		Assert.notNull(rest5Client, "restClient must not be null");
-
-		var transport = getElasticsearchTransport(rest5Client, REACTIVE_CLIENT, transportOptions, jsonpMapper);
-		return createReactive(transport);
-	}

 	/**
 	 * Creates a new {@link ReactiveElasticsearchClient} that uses the given {@link ElasticsearchTransport}.
@@ -179,21 +156,17 @@ public final class ElasticsearchClients {

 	// region imperative client
 	/**
-	 * Creates a new imperative {@link ElasticsearchClient}. This uses a RestClient, if the old RestClient is needed, this
-	 * must be created with the {@link org.springframework.data.elasticsearch.client.elc.rest_client.RestClients} class
-	 * and passed in as parameter.
+	 * Creates a new imperative {@link ElasticsearchClient}
 	 *
 	 * @param clientConfiguration configuration options, must not be {@literal null}.
 	 * @return the {@link ElasticsearchClient}
 	 */
 	public static ElasticsearchClient createImperative(ClientConfiguration clientConfiguration) {
-		return createImperative(getRest5Client(clientConfiguration), null, DEFAULT_JSONP_MAPPER);
+		return createImperative(getRestClient(clientConfiguration), null, DEFAULT_JSONP_MAPPER);
 	}

 	/**
-	 * Creates a new imperative {@link ElasticsearchClient}. This uses a RestClient, if the old RestClient is needed, this
-	 * must be created with the {@link org.springframework.data.elasticsearch.client.elc.rest_client.RestClients} class
-	 * and passed in as parameter.
+	 * Creates a new imperative {@link ElasticsearchClient}
 	 *
 	 * @param clientConfiguration configuration options, must not be {@literal null}.
 	 * @param transportOptions options to be added to each request.
@@ -201,7 +174,7 @@ public final class ElasticsearchClients {
 	 */
 	public static ElasticsearchClient createImperative(ClientConfiguration clientConfiguration,
 			TransportOptions transportOptions) {
-		return createImperative(getRest5Client(clientConfiguration), transportOptions, DEFAULT_JSONP_MAPPER);
+		return createImperative(getRestClient(clientConfiguration), transportOptions, DEFAULT_JSONP_MAPPER);
 	}

 	/**
@@ -209,23 +182,11 @@ public final class ElasticsearchClients {
 	 *
 	 * @param restClient the RestClient to use
 	 * @return the {@link ElasticsearchClient}
-	 * @deprecated since 6.0, use the version with a Rest5Client.
 	 */
-	@Deprecated(since = "6.0", forRemoval = true)
 	public static ElasticsearchClient createImperative(RestClient restClient) {
 		return createImperative(restClient, null, DEFAULT_JSONP_MAPPER);
 	}

-	/**
-	 * Creates a new imperative {@link ElasticsearchClient}
-	 *
-	 * @param rest5Client the Rest5Client to use
-	 * @return the {@link ElasticsearchClient}
-	 */
-	public static ElasticsearchClient createImperative(Rest5Client rest5Client) {
-		return createImperative(rest5Client, null, DEFAULT_JSONP_MAPPER);
-	}
-
 	/**
 	 * Creates a new imperative {@link ElasticsearchClient}
 	 *
@@ -233,9 +194,7 @@ public final class ElasticsearchClients {
 	 * @param transportOptions options to be added to each request.
 	 * @param jsonpMapper the mapper for the transport to use
 	 * @return the {@link ElasticsearchClient}
-	 * @deprecated since 6.0, use the version with a Rest5Client.
 	 */
-	@Deprecated(since = "6.0", forRemoval = true)
 	public static ElasticsearchClient createImperative(RestClient restClient, @Nullable TransportOptions transportOptions,
 			JsonpMapper jsonpMapper) {

@@ -247,27 +206,6 @@ public final class ElasticsearchClients {
 		return createImperative(transport);
 	}

-	/**
-	 * Creates a new imperative {@link ElasticsearchClient}
-	 *
-	 * @param rest5Client the Rest5Client to use
-	 * @param transportOptions options to be added to each request.
-	 * @param jsonpMapper the mapper for the transport to use
-	 * @return the {@link ElasticsearchClient}
-	 * @since 6.0
-	 */
-	public static ElasticsearchClient createImperative(Rest5Client rest5Client,
-			@Nullable TransportOptions transportOptions,
-			JsonpMapper jsonpMapper) {
-
-		Assert.notNull(rest5Client, "restClient must not be null");
-
-		ElasticsearchTransport transport = getElasticsearchTransport(rest5Client, IMPERATIVE_CLIENT, transportOptions,
-				jsonpMapper);
-
-		return createImperative(transport);
-	}
-
 	/**
 	 * Creates a new {@link ElasticsearchClient} that uses the given {@link ElasticsearchTransport}.
 	 *
@@ -282,6 +220,96 @@ public final class ElasticsearchClients {
 	}
 	// endregion

+	// region low level RestClient
+	private static RestClientOptions.Builder getRestClientOptionsBuilder(@Nullable TransportOptions transportOptions) {
+
+		if (transportOptions instanceof RestClientOptions restClientOptions) {
+			return restClientOptions.toBuilder();
+		}
+
+		var builder = new RestClientOptions.Builder(RequestOptions.DEFAULT.toBuilder());
+
+		if (transportOptions != null) {
+			transportOptions.headers().forEach(header -> builder.addHeader(header.getKey(), header.getValue()));
+			transportOptions.queryParameters().forEach(builder::setParameter);
+			builder.onWarnings(transportOptions.onWarnings());
+		}
+
+		return builder;
+	}
+
+	/**
+	 * Creates a low level {@link RestClient} for the given configuration.
+	 *
+	 * @param clientConfiguration must not be {@literal null}
+	 * @return the {@link RestClient}
+	 */
+	public static RestClient getRestClient(ClientConfiguration clientConfiguration) {
+		return getRestClientBuilder(clientConfiguration).build();
+	}
+
+	private static RestClientBuilder getRestClientBuilder(ClientConfiguration clientConfiguration) {
+		HttpHost[] httpHosts = formattedHosts(clientConfiguration.getEndpoints(), clientConfiguration.useSsl()).stream()
+				.map(HttpHost::create).toArray(HttpHost[]::new);
+		RestClientBuilder builder = RestClient.builder(httpHosts);
+
+		if (clientConfiguration.getPathPrefix() != null) {
+			builder.setPathPrefix(clientConfiguration.getPathPrefix());
+		}
+
+		HttpHeaders headers = clientConfiguration.getDefaultHeaders();
+
+		if (!headers.isEmpty()) {
+			builder.setDefaultHeaders(toHeaderArray(headers));
+		}
+
+		builder.setHttpClientConfigCallback(clientBuilder -> {
+			if (clientConfiguration.getCaFingerprint().isPresent()) {
+				clientBuilder
+						.setSSLContext(TransportUtils.sslContextFromCaFingerprint(clientConfiguration.getCaFingerprint().get()));
+			}
+			clientConfiguration.getSslContext().ifPresent(clientBuilder::setSSLContext);
+			clientConfiguration.getHostNameVerifier().ifPresent(clientBuilder::setSSLHostnameVerifier);
+			clientBuilder.addInterceptorLast(new CustomHeaderInjector(clientConfiguration.getHeadersSupplier()));
+
+			RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
+			Duration connectTimeout = clientConfiguration.getConnectTimeout();
+
+			if (!connectTimeout.isNegative()) {
+				requestConfigBuilder.setConnectTimeout(Math.toIntExact(connectTimeout.toMillis()));
+			}
+
+			Duration socketTimeout = clientConfiguration.getSocketTimeout();
+
+			if (!socketTimeout.isNegative()) {
+				requestConfigBuilder.setSocketTimeout(Math.toIntExact(socketTimeout.toMillis()));
+				requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(socketTimeout.toMillis()));
+			}
+
+			clientBuilder.setDefaultRequestConfig(requestConfigBuilder.build());
+
+			clientConfiguration.getProxy().map(HttpHost::create).ifPresent(clientBuilder::setProxy);
+
+			for (ClientConfiguration.ClientConfigurationCallback<?> clientConfigurer : clientConfiguration
+					.getClientConfigurers()) {
+				if (clientConfigurer instanceof ElasticsearchHttpClientConfigurationCallback restClientConfigurationCallback) {
+					clientBuilder = restClientConfigurationCallback.configure(clientBuilder);
+				}
+			}
+
+			return clientBuilder;
+		});
+
+		for (ClientConfiguration.ClientConfigurationCallback<?> clientConfigurationCallback : clientConfiguration
+				.getClientConfigurers()) {
+			if (clientConfigurationCallback instanceof ElasticsearchRestClientConfigurationCallback configurationCallback) {
+				builder = configurationCallback.configure(builder);
+			}
+		}
+		return builder;
+	}
+	// endregion
+
 	// region Elasticsearch transport
 	/**
 	 * Creates an {@link ElasticsearchTransport} that will use the given client that additionally is customized with a
@@ -292,9 +320,7 @@ public final class ElasticsearchClients {
 	 * @param transportOptions options for the transport
 	 * @param jsonpMapper mapper for the transport
 	 * @return ElasticsearchTransport
-	 * @deprecated since 6.0, use the version taking a Rest5Client
 	 */
-	@Deprecated(since = "6.0", forRemoval = true)
 	public static ElasticsearchTransport getElasticsearchTransport(RestClient restClient, String clientType,
 			@Nullable TransportOptions transportOptions, JsonpMapper jsonpMapper) {

@@ -303,7 +329,7 @@ public final class ElasticsearchClients {
 		Assert.notNull(jsonpMapper, "jsonpMapper must not be null");

 		TransportOptions.Builder transportOptionsBuilder = transportOptions != null ? transportOptions.toBuilder()
-				: new RestClientOptions(org.elasticsearch.client.RequestOptions.DEFAULT, false).toBuilder();
+				: new RestClientOptions(RequestOptions.DEFAULT).toBuilder();

 		RestClientOptions.Builder restClientOptionsBuilder = getRestClientOptionsBuilder(transportOptions);

@@ -327,35 +353,70 @@ public final class ElasticsearchClients {

 		return new RestClientTransport(restClient, jsonpMapper, restClientOptionsBuilder.build());
 	}
-
-	/**
-	 * Creates an {@link ElasticsearchTransport} that will use the given client that additionally is customized with a
-	 * header to contain the clientType
-	 *
-	 * @param rest5Client the client to use
-	 * @param clientType the client type to pass in each request as header
-	 * @param transportOptions options for the transport
-	 * @param jsonpMapper mapper for the transport
-	 * @return ElasticsearchTransport
-	 */
-	public static ElasticsearchTransport getElasticsearchTransport(Rest5Client rest5Client, String clientType,
-			@Nullable TransportOptions transportOptions, JsonpMapper jsonpMapper) {
-
-		Assert.notNull(rest5Client, "restClient must not be null");
-		Assert.notNull(clientType, "clientType must not be null");
-		Assert.notNull(jsonpMapper, "jsonpMapper must not be null");
-
-		TransportOptions.Builder transportOptionsBuilder = transportOptions != null ? transportOptions.toBuilder()
-				: new Rest5ClientOptions(RequestOptions.DEFAULT, false).toBuilder();
-
-		Rest5ClientOptions.Builder rest5ClientOptionsBuilder = getRest5ClientOptionsBuilder(transportOptions);
-
-		rest5ClientOptionsBuilder.addHeader(X_SPRING_DATA_ELASTICSEARCH_CLIENT,
-				VersionInfo.clientVersions() + " / " + clientType);
-
-		return new Rest5ClientTransport(rest5Client, jsonpMapper, rest5ClientOptionsBuilder.build());
-	}
 	// endregion

-	// todo #3117 remove and document that ElasticsearchHttpClientConfigurationCallback has been move to RestClients.
+	private static List<String> formattedHosts(List<InetSocketAddress> hosts, boolean useSsl) {
+		return hosts.stream().map(it -> (useSsl ? "https" : "http") + "://" + it.getHostString() + ':' + it.getPort())
+				.collect(Collectors.toList());
+	}
+
+	private static org.apache.http.Header[] toHeaderArray(HttpHeaders headers) {
+		return headers.entrySet().stream() //
+				.flatMap(entry -> entry.getValue().stream() //
+						.map(value -> new BasicHeader(entry.getKey(), value))) //
+				.toArray(org.apache.http.Header[]::new);
+	}
+
+	/**
+	 * Interceptor to inject custom supplied headers.
+	 *
+	 * @since 4.4
+	 */
+	private record CustomHeaderInjector(Supplier<HttpHeaders> headersSupplier) implements HttpRequestInterceptor {
+
+		@Override
+		public void process(HttpRequest request, HttpContext context) {
+			HttpHeaders httpHeaders = headersSupplier.get();
+
+			if (httpHeaders != null && !httpHeaders.isEmpty()) {
+				Arrays.stream(toHeaderArray(httpHeaders)).forEach(request::addHeader);
+			}
+		}
+	}
+
+	/**
+	 * {@link org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationCallback} to configure
+	 * the Elasticsearch RestClient's Http client with a {@link HttpAsyncClientBuilder}
+	 *
+	 * @since 4.4
+	 */
+	public interface ElasticsearchHttpClientConfigurationCallback
+			extends ClientConfiguration.ClientConfigurationCallback<HttpAsyncClientBuilder> {
+
+		static ElasticsearchHttpClientConfigurationCallback from(
+				Function<HttpAsyncClientBuilder, HttpAsyncClientBuilder> httpClientBuilderCallback) {
+
+			Assert.notNull(httpClientBuilderCallback, "httpClientBuilderCallback must not be null");
+
+			return httpClientBuilderCallback::apply;
+		}
+	}
+
+	/**
+	 * {@link org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationCallback} to configure
+	 * the RestClient client with a {@link RestClientBuilder}
+	 *
+	 * @since 5.0
+	 */
+	public interface ElasticsearchRestClientConfigurationCallback
+			extends ClientConfiguration.ClientConfigurationCallback<RestClientBuilder> {
+
+		static ElasticsearchRestClientConfigurationCallback from(
+				Function<RestClientBuilder, RestClientBuilder> restClientBuilderCallback) {
+
+			Assert.notNull(restClientBuilderCallback, "restClientBuilderCallback must not be null");
+
+			return restClientBuilderCallback::apply;
+		}
+	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-present the original author or authors.
+ * Copyright 2021-2025 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.
@@ -20,13 +20,12 @@ import co.elastic.clients.json.JsonpMapper;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import co.elastic.clients.transport.ElasticsearchTransport;
 import co.elastic.clients.transport.TransportOptions;
-import co.elastic.clients.transport.rest5_client.Rest5ClientOptions;
-import co.elastic.clients.transport.rest5_client.low_level.RequestOptions;
-import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
+import co.elastic.clients.transport.rest_client.RestClientOptions;

+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
-import org.springframework.data.elasticsearch.client.elc.rest5_client.Rest5Clients;
 import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
@@ -39,9 +38,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 /**
 * Base class for a @{@link org.springframework.context.annotation.Configuration} class to set up the Elasticsearch
 * connection using the Elasticsearch Client. This class exposes different parts of the setup as Spring beans. Deriving
- * classes must provide the {@link ClientConfiguration} to use. From Version 6.0 on, this class uses the new Rest5Client
- * from Elasticsearch 9. The old implementation using the RestClient is still available under the name
- * {@link ElasticsearchLegacyRestClientConfiguration}.
+ * classes must provide the {@link ClientConfiguration} to use.
 *
 * @author Peter-Josef Meisch
 * @since 4.4
@@ -63,27 +60,27 @@ public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurat
 	 * @return RestClient
 	 */
 	@Bean
-	public Rest5Client elasticsearchRest5Client(ClientConfiguration clientConfiguration) {
+	public RestClient elasticsearchRestClient(ClientConfiguration clientConfiguration) {

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

-		return Rest5Clients.getRest5Client(clientConfiguration);
+		return ElasticsearchClients.getRestClient(clientConfiguration);
 	}

 	/**
-	 * Provides the Elasticsearch transport to be used. The default implementation uses the {@link Rest5Client} bean and
+	 * Provides the Elasticsearch transport to be used. The default implementation uses the {@link RestClient} bean and
 	 * the {@link JsonpMapper} bean provided in this class.
 	 *
 	 * @return the {@link ElasticsearchTransport}
 	 * @since 5.2
 	 */
 	@Bean
-	public ElasticsearchTransport elasticsearchTransport(Rest5Client rest5Client, JsonpMapper jsonpMapper) {
+	public ElasticsearchTransport elasticsearchTransport(RestClient restClient, JsonpMapper jsonpMapper) {

-		Assert.notNull(rest5Client, "restClient must not be null");
+		Assert.notNull(restClient, "restClient must not be null");
 		Assert.notNull(jsonpMapper, "jsonpMapper must not be null");

-		return ElasticsearchClients.getElasticsearchTransport(rest5Client, ElasticsearchClients.IMPERATIVE_CLIENT,
+		return ElasticsearchClients.getElasticsearchTransport(restClient, ElasticsearchClients.IMPERATIVE_CLIENT,
 				transportOptions(), jsonpMapper);
 	}

@@ -118,7 +115,7 @@ public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurat
 	}

 	/**
-	 * Provides the JsonpMapper bean that is used in the {@link #elasticsearchTransport(Rest5Client, JsonpMapper)} method.
+	 * Provides the JsonpMapper bean that is used in the {@link #elasticsearchTransport(RestClient, JsonpMapper)} method.
 	 *
 	 * @return the {@link JsonpMapper} to use
 	 * @since 5.2
@@ -138,6 +135,6 @@ public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurat
 	 * @return the options that should be added to every request. Must not be {@literal null}
 	 */
 	public TransportOptions transportOptions() {
-		return new Rest5ClientOptions(RequestOptions.DEFAULT, false);
+		return new RestClientOptions(RequestOptions.DEFAULT);
 	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-present the original author or authors.
+ * Copyright 2021-2025 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,7 +24,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 import org.elasticsearch.client.ResponseException;
-import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -34,7 +33,6 @@ import org.springframework.data.elasticsearch.NoSuchIndexException;
 import org.springframework.data.elasticsearch.ResourceNotFoundException;
 import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
 import org.springframework.data.elasticsearch.VersionConflictException;
-import org.springframework.util.ClassUtils;

 /**
 * Simple {@link PersistenceExceptionTranslator} for Elasticsearch. Convert the given runtime exception to an
@@ -47,9 +45,6 @@ import org.springframework.util.ClassUtils;
 */
 public class ElasticsearchExceptionTranslator implements PersistenceExceptionTranslator {

-	public static final boolean LEGACY_RESTCLIENT_PRESENT = ClassUtils
-			.isPresent("org.elasticsearch.client.ResponseException", ElasticsearchExceptionTranslator.class.getClassLoader());
-
 	private final JsonpMapper jsonpMapper;

 	public ElasticsearchExceptionTranslator(JsonpMapper jsonpMapper) {
@@ -73,7 +68,7 @@ public class ElasticsearchExceptionTranslator implements PersistenceExceptionTra
 	}

 	@Override
-	public @Nullable DataAccessException translateExceptionIfPossible(RuntimeException ex) {
+	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {

 		checkForConflictException(ex);

@@ -123,20 +118,15 @@ public class ElasticsearchExceptionTranslator implements PersistenceExceptionTra
 		Integer status = null;
 		String message = null;

-		if (LEGACY_RESTCLIENT_PRESENT && exception instanceof ResponseException responseException) {
-			// this code is for the old RestClient
+		if (exception instanceof ResponseException responseException) {
 			status = responseException.getResponse().getStatusLine().getStatusCode();
 			message = responseException.getMessage();
-		} else if (exception instanceof ElasticsearchException elasticsearchException) {
-			// using the RestClient throws this
-			status = elasticsearchException.status();
-			message = elasticsearchException.getMessage();
 		} else if (exception.getCause() != null) {
 			checkForConflictException(exception.getCause());
 		}

 		if (status != null && message != null) {
-			if (status == 409 && message.contains("version_conflict_engine_exception"))
+			if (status == 409 && message.contains("type\":\"version_conflict_engine_exception"))
 				if (message.contains("version conflict, required seqNo")) {
 					throw new OptimisticLockingFailureException("Cannot index a document due to seq_no+primary_term conflict",
 							exception);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark Paluch	9f7e44adae	After release cleanups. See #3195	2025-12-12 11:00:02 +01:00
Mark Paluch	5c6b167c77	Prepare next development iteration. See #3195	2025-12-12 11:00:01 +01:00
Mark Paluch	7c3ea61fa6	Release version 5.4.13 (2024.1.13). See #3195	2025-12-12 10:57:10 +01:00
Mark Paluch	0e7845f0e7	Prepare 5.4.13 (2024.1.13). See #3195	2025-12-12 10:56:47 +01:00
Mark Paluch	c9a15acb07	Update CI Properties. See #3195	2025-12-10 08:32:38 +01:00
Mark Paluch	c8c0a32f2d	Add `docker-java.properties`. See spring-projects/spring-data-build#2726	2025-12-04 09:00:59 +01:00
Mark Paluch	98d4cc0d74	After release cleanups. See #3184	2025-11-14 10:55:59 +01:00
Mark Paluch	1515f33047	Prepare next development iteration. See #3184	2025-11-14 10:55:58 +01:00
Mark Paluch	e0f30b819b	Release version 5.4.12 (2024.1.12). See #3184	2025-11-14 10:53:11 +01:00
Mark Paluch	2825046949	Prepare 5.4.12 (2024.1.12). See #3184	2025-11-14 10:52:47 +01:00
Mark Paluch	a4defdc5fd	Update Update security documentation. See #3184	2025-11-14 10:43:01 +01:00
Christoph Strobl	039f78e311	After release cleanups. See #3169	2025-10-17 10:31:09 +02:00
Christoph Strobl	d93f3c6810	Prepare next development iteration. See #3169	2025-10-17 10:31:08 +02:00
Christoph Strobl	b93ed840db	Release version 5.4.11 (2024.1.11). See #3169	2025-10-17 10:26:05 +02:00
Christoph Strobl	de956dd81c	Prepare 5.4.11 (2024.1.11). See #3169	2025-10-17 10:24:45 +02:00
Peter-Josef Meisch	21306745b3	Fix string comparison in TypeUtils. Original Pull Request #3177 Closes #3176 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `0e1a97a27a`) (cherry picked from commit `00c99852fa`)	2025-10-03 10:52:20 +02:00
Mark Paluch	0f7dc4f54d	Update GitHub Actions. See #3169	2025-09-23 10:51:19 +02:00
Peter-Josef Meisch	48855e75df	Adjust test to slower performance of build machines in Jenkins Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `5529af8f76`) (cherry picked from commit `3fca4e8be3`)	2025-09-20 20:43:07 +02:00
Peter-Josef Meisch	430527504e	Speedup Criteria hashcode calculation Original Pull Request #3172 Closes #3083 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `c0dd082f4e`) (cherry picked from commit `91f3393abc`)	2025-09-20 20:02:23 +02:00
Mark Paluch	40cd3f127f	Polishing. Update project metadata, add PJ as project lead (long overdue). See #3154	2025-09-12 11:39:57 +02:00
Christoph Strobl	2ccf157a58	After release cleanups. See #3152	2025-09-12 10:57:11 +02:00
Christoph Strobl	274df0e9d8	Prepare next development iteration. See #3152	2025-09-12 10:57:09 +02:00
Christoph Strobl	b66146dadd	Release version 5.4.10 (2024.1.10). See #3152	2025-09-12 10:53:28 +02:00
Christoph Strobl	930c04e355	Prepare 5.4.10 (2024.1.10). See #3152	2025-09-12 10:53:02 +02:00
Mark Paluch	4f475575e6	Refine version properties for documentation build. See spring-projects/spring-data-build#2638	2025-08-18 09:16:33 +02:00
Mark Paluch	268f73e692	After release cleanups. See #3133	2025-08-15 08:41:14 +02:00
Mark Paluch	37c20975a9	Prepare next development iteration. See #3133	2025-08-15 08:41:13 +02:00
Mark Paluch	e3afc2b704	Release version 5.4.9 (2024.1.9). See #3133	2025-08-15 08:38:42 +02:00
Mark Paluch	e634d7ac05	Prepare 5.4.9 (2024.1.9). See #3133	2025-08-15 08:38:22 +02:00
Mark Paluch	5f1f46acd4	Polishing. Use documentation variables for references, reorder antora keys. See #3135	2025-08-14 17:28:11 +02:00
Mark Paluch	7a5c8b4546	After release cleanups. See #3119	2025-07-18 09:34:22 +02:00
Mark Paluch	ac6dd91b57	Prepare next development iteration. See #3119	2025-07-18 09:34:21 +02:00
Mark Paluch	89c20c3b21	Release version 5.4.8 (2024.1.8). See #3119	2025-07-18 09:31:52 +02:00
Mark Paluch	6fdd786b03	Prepare 5.4.8 (2024.1.8). See #3119	2025-07-18 09:31:32 +02:00
Mark Paluch	c739e023b6	Upgrade to Maven Wrapper 3.9.11. See #3132	2025-07-17 14:04:44 +02:00
Peter-Josef Meisch	c7a8c0bf60	Fix the calculation of the requested number of documents. Original Pull Request #3128 Closes #3127 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `12ddb74fae`) (cherry picked from commit `786e0928ed`)	2025-07-15 18:45:54 +02:00
Mark Paluch	57b4af14c2	After release cleanups. See #3112	2025-06-13 11:17:52 +02:00
Mark Paluch	5175f34418	Prepare next development iteration. See #3112	2025-06-13 11:17:51 +02:00
Mark Paluch	f5f73dc67a	Release version 5.4.7 (2024.1.7). See #3112	2025-06-13 11:15:17 +02:00
Mark Paluch	6700580755	Prepare 5.4.7 (2024.1.7). See #3112	2025-06-13 11:14:57 +02:00
Mark Paluch	7ff25485de	After release cleanups. See #3095	2025-05-16 10:51:20 +02:00
Mark Paluch	394e56d3a9	Prepare next development iteration. See #3095	2025-05-16 10:51:19 +02:00
Mark Paluch	474e433926	Release version 5.4.6 (2024.1.6). See #3095	2025-05-16 10:48:33 +02:00
Mark Paluch	7e64d85efc	Prepare 5.4.6 (2024.1.6). See #3095	2025-05-16 10:48:14 +02:00
Peter-Josef Meisch	ea51ce062e	Fix missing return value in ByQueryResponse. Original Pull Request #3109 Closes #3108 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `ebbe242a72`)	2025-05-14 14:19:45 +02:00
Mark Paluch	4767a8215e	Update CI Properties. See #3095	2025-05-12 09:00:10 +02:00
Peter-Josef Meisch	6c4fc59a11	Fix handling of page size and max results in search request preparation. Original Pull Request #3106 Closes #3089 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `945179e4eb`)	2025-05-10 21:22:32 +02:00
Peter-Josef Meisch	0e8401d3b1	Fix code not terminating on repository saving an empty flux. Original Pull Request #3099 Closes: #3039 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `a07ac3c93d`)	2025-04-26 11:08:21 +02:00
Mark Paluch	2c20671379	After release cleanups. See #3078	2025-04-22 10:47:46 +02:00
Mark Paluch	65b0709b73	Prepare next development iteration. See #3078	2025-04-22 10:47:45 +02:00
Mark Paluch	47110a212a	Release version 5.4.5 (2024.1.5). See #3078	2025-04-22 10:45:18 +02:00
Mark Paluch	ed59fc85ca	Prepare 5.4.5 (2024.1.5). See #3078	2025-04-22 10:45:00 +02:00
Peter-Josef Meisch	46fdc8a84b	Fix implementation of equlas/hashcode for Criteria class. Original Pull Request: #3088 Closes: #3083 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `0e5af90581`)	2025-04-05 20:50:55 +02:00
Peter-Josef Meisch	394fb7a831	Fix cutting of unknown properties in property paths for search. Original Pull Request #3082 Closes #3081 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `1ae6301c2f`)	2025-03-24 21:46:34 +01:00
Mark Paluch	c23da6ed5e	After release cleanups. See #3057	2025-03-14 08:20:03 +01:00
Mark Paluch	cc56e27633	Prepare next development iteration. See #3057	2025-03-14 08:20:02 +01:00
Mark Paluch	ce64d2d6d1	Release version 5.4.4 (2024.1.4). See #3057	2025-03-14 08:17:35 +01:00
Mark Paluch	e02599d177	Prepare 5.4.4 (2024.1.4). See #3057	2025-03-14 08:17:17 +01:00
Peter-Josef Meisch	8558c44714	Add testcontainers-local.properties handling. Original Pull Request #3062 Closes #3061 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `64f88ae9ac`)	2025-03-09 12:53:46 +01:00
Peter-Josef Meisch	88e2e9da2a	Fix mapping of property names in sort parameters. Original Pull Request #3074 Closes #3072 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `42383624ea`)	2025-03-09 12:49:27 +01:00
Mark Paluch	c15c1d08d7	After release cleanups. See #3046	2025-02-14 10:42:42 +01:00
Mark Paluch	c653e6a4ec	Prepare next development iteration. See #3046	2025-02-14 10:42:41 +01:00
Mark Paluch	7318c31692	Release version 5.4.3 (2024.1.3). See #3046	2025-02-14 10:40:05 +01:00
Mark Paluch	6812684122	Prepare 5.4.3 (2024.1.3). See #3046	2025-02-14 10:39:46 +01:00
Mark Paluch	cd5d3da110	Update CI Properties. See #3046	2025-02-11 15:22:46 +01:00
Mark Paluch	f87f7469f1	After release cleanups. See #3024	2025-01-17 11:40:00 +01:00
Mark Paluch	817967a282	Prepare next development iteration. See #3024	2025-01-17 11:39:59 +01:00
Mark Paluch	60b71dcb11	Release version 5.4.2 (2024.1.2). See #3024	2025-01-17 11:37:36 +01:00
Mark Paluch	33a149ae2d	Prepare 5.4.2 (2024.1.2). See #3024	2025-01-17 11:37:19 +01:00
Peter-Josef Meisch	29158f9097	Update copyright notices to 2025. Original Pull Request #3035 Closes #3033	2025-01-03 08:44:05 +01:00
Alfonso	5d52918a5c	fix: use scripted field name to populate entity. Original Pull Request: #3023 Closes: #3022 (cherry picked from commit `944e7e81dd`)	2024-12-14 18:51:27 +01:00
Christoph Strobl	457c9b71b3	After release cleanups. See #3004	2024-12-13 09:38:13 +01:00
Christoph Strobl	18b91d5da2	Prepare next development iteration. See #3004	2024-12-13 09:38:11 +01:00
Christoph Strobl	62091be997	Release version 5.4.1 (2024.1.1). See #3004	2024-12-13 09:34:47 +01:00
Christoph Strobl	fdc7893817	Prepare 5.4.1 (2024.1.1). See #3004	2024-12-13 09:34:27 +01:00
Peter-Josef Meisch	535d76faf0	Upgrade Elasticsearch to 8.15.5. Original Pull Request #3018 Closes #3016	2024-12-01 11:59:53 +01:00
Peter-Josef Meisch	26bd770b8c	Update versions documentation. Original Pull request #3011 Closes #3010	2024-11-23 22:46:46 +01:00
Mark Paluch	aec03a3529	After release cleanups. See #2990	2024-11-15 14:13:26 +01:00
Mark Paluch	e3b26b2268	Prepare next development iteration. See #2990	2024-11-15 14:13:25 +01:00