Release version 5.5.2 (2025.0.2).

See #3120
Prepare 5.5.2 (2025.0.2).
2026-05-23 12:43:17 +00:00 · 2025-07-18 10:27:59 +02:00 · 2025-07-18 10:27:38 +02:00 · 2025-07-17 14:00:55 +02:00 · 2025-07-15 18:41:17 +02:00 · 2025-06-13 13:42:19 +02:00
750 changed files with 3227 additions and 8485 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: [ main, 'issue/**' ]
-
-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@main
-        with:
-          java-version: ${{ matrix.java-version }}
-          develocity-access-key: '${{ secrets.DEVELOCITY_ACCESS_KEY }}'
-      - name: Build
-        uses: spring-projects/spring-data-build/actions/maven-build@main
-        env:
-          TESTCONTAINERS_REUSE_ENABLE: true
@@ -1,21 +0,0 @@
-# GitHub Actions for CodeQL Scanning
-
-name: "CodeQL Advanced"
-
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
-  schedule:
-    # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#schedule
-    - cron: '0 5 * * *'
-
-permissions: read-all
-
-jobs:
-  codeql-analysis-call:
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-    uses: spring-io/github-actions/.github/workflows/codeql-analysis.yml@1
@@ -1,28 +0,0 @@
-name: Snapshots
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ main, 'issue/**' ]
-
-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@main
-        with:
-          develocity-access-key: '${{ secrets.DEVELOCITY_ACCESS_KEY }}'
-      - name: Deploy to Artifactory
-        uses: spring-projects/spring-data-build/actions/maven-artifactory-deploy@main
-        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:00:55 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.5.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.

@@ -1,15 +1,9 @@
-= Security Policy
+# Security Policy

-== Reporting a Vulnerability
+## Supported Versions

-Please, https://github.com/spring-projects/security-advisories/security/advisories/new[open a draft security advisory] if you need to disclose and discuss a security issue in private with the Spring Data team.
-Note that we only accept reports against https://spring.io/projects/spring-data#support[supported versions].
+Please see the https://spring.io/projects/spring-data-elasticsearch[Spring Data Elasticsearch] project page for supported versions.

-For more details, check out our https://spring.io/security-policy[security policy].
+## Reporting a Vulnerability

-== JAR signing
-
-Spring Data JARs released on Maven Central are signed.
-You'll find more information about the key here: https://spring.io/GPG-KEY-spring.txt
-
-Versions released prior to 2023 may be signed with a different key.
+Please don't raise security vulnerabilities here. Head over to https://pivotal.io/security to learn how to disclose them responsibly.
@@ -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,32 @@
+# 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.6.0.version=6.0.23
+docker.mongodb.7.0.version=7.0.20
+docker.mongodb.8.0.version=8.0.9
+
+# Supported versions of Redis
+docker.redis.6.version=6.2.13
+docker.redis.7.version=7.2.4
+docker.valkey.8.version=8.1.1
+
+# Docker environment settings
+docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
+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
+
+# 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
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

 	<modelVersion>4.0.0</modelVersion>

 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>6.1.0-SNAPSHOT</version>
+	<version>5.5.2</version>

 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>3.5.2</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.1.0-SNAPSHOT</springdata.commons>
+		<springdata.commons>3.5.2</springdata.commons>

 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>9.4.1</elasticsearch-java>
-		<elasticsearch-rest-client>9.4.1</elasticsearch-rest-client>
+		<elasticsearch-java>8.18.1</elasticsearch-java>

-		<hoverfly>0.20.2</hoverfly>
-		<log4j>2.25.4</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>

@@ -41,15 +41,6 @@
 	</properties>

 	<developers>
-		<developer>
-			<id>sothawo</id>
-			<name>Peter-Josef Meisch</name>
-			<email>pj.meisch at sothawo.com</email>
-			<roles>
-				<role>Project Lead</role>
-			</roles>
-			<timezone>+1</timezone>
-		</developer>
 		<developer>
 			<id>biomedcentral</id>
 			<name>BioMed Central Development Team</name>
@@ -86,32 +77,16 @@
 		</developerConnection>
 	</scm>

+	<ciManagement>
+		<system>Bamboo</system>
+		<url>https://build.spring.io/browse/SPRINGDATAES</url>
+	</ciManagement>
+
 	<issueManagement>
 		<system>GitHub</system>
 		<url>https://github.com/spring-projects/spring-data-elasticsearch/issues</url>
 	</issueManagement>

-
-	<dependencyManagement>
-		<dependencies>
-
-			<dependency>
-				<groupId>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,52 +132,30 @@
 			</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>
+			<version>${elasticsearch-java}</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>tools.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>tools.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-		</dependency>
-
-        <!-- Version 2 to use with the legacy RestClient -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
 		</dependency>

 		<!-- CDI -->
+
 		<dependency>
 			<groupId>javax.interceptor</groupId>
 			<artifactId>javax.interceptor-api</artifactId>
@@ -276,14 +229,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>
@@ -335,6 +280,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>
@@ -344,7 +304,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>

@@ -355,13 +324,7 @@
 			<scope>test</scope>
 		</dependency>

-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-observation-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
+	</dependencies>

 	<build>
 		<resources>
@@ -499,20 +462,8 @@
 	</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.4.x, 3.3.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
@@ -12,7 +12,6 @@
 *** 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,24 +1,6 @@
 [[new-features]]
 = What's new

-[[new-features.6-1-0]]
-== New in Spring Data Elasticsearch 6.1
-
-* Upgrade to Elasticsearch 9.4.1
-* Add support to use `IndexCoordinates` as repository query parameter
-* Add support for includeNamedQueriesScore in Query
-* Add support for Micrometer observation.
-
-[[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.1
-* 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

@@ -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"_
@@ -376,7 +376,7 @@ So calling the method with a `List` of `["id1", "id2", "id3"]` would produce the

 .Declare query on the method using the `@Query` annotation with SpEL expression.
 ====
-{spring-framework-docs}/core/expressions.html[SpEL expression] is also supported when defining query in `@Query`.
+https://docs.spring.io/spring-framework/reference/core/expressions.html[SpEL expression] is also supported when defining query in `@Query`.

 [source,java]
 ----
@@ -453,7 +453,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.
+https://docs.spring.io/spring-framework/reference/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]
@@ -523,7 +523,7 @@ A collection of `names` like `List.of("name1", "name2")` will produce the follow

 .access property in the `Collection` param.
 ====
-{spring-framework-docs}/core/expressions/language-ref/collection-projection.html[SpEL Collection Projection] is convenient to use when values in the `Collection` parameter is not plain `String`:
+https://docs.spring.io/spring-framework/reference/core/expressions/language-ref/collection-projection.html[SpEL Collection Projection] is convenient to use when values in the `Collection` parameter is not plain `String`:

 [source,java]
 ----
@@ -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
-| 2026.0 | 6.1.x | 9.4.1 | 7.0.x
-| 2025.1 | 6.0.x | 9.2.2 | 7.0.x
-| 2025.0 | 5.5.xfootnote:oom[Out of maintenance] | 8.18.1 | 6.2.x
-| 2024.1 | 5.4.xfootnote:oom[] | 8.15.5 | 6.1.x
-| 2024.0 | 5.3.xfootnote:oom[] | 8.13.4 | 6.1.x
+| 2025.0 | 5.5.x | 8.18.1 | 6.2.x
+| 2024.1 | 5.4.x | 8.15.5 | 6.1.x
+| 2024.0 | 5.3.xfootnote:oom[Out of maintenance] | 8.13.4 | 6.1.x
 | 2023.1 (Vaughan) | 5.2.xfootnote:oom[] | 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
@@ -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,13 +1,4 @@
 [[elasticsearch.projections]]
 = Projections

-[[elasticsearch.projections.limitations]]
-== Spring Data Elasticsearch Projection Limitations
-
-This chapter is pulled in from the Spring Data Commons documentation, but does not apply to Spring Data Elasticsearch.
-
-IMPORTANT: Interface-based projections are not supported in Spring Data Elasticsearch repository query methods.
-
-To limit the fields returned from Elasticsearch, use the xref:elasticsearch/repositories/elasticsearch-repositories.adoc#elasticsearch.repositories.annotations.sourcefilters[`@SourceFilters`] annotation on your repository methods instead.
-
 include::{commons}@data-commons::page$repositories/projections.adoc[leveloffset=+1]
@@ -3,20 +3,19 @@ prerelease: ${antora-component.prerelease}

 asciidoc:
  attributes:
+    copyright-year: ${current.year}
+    version: ${project.version}
+    springversionshort: ${spring.short}
+    springversion: ${spring}
    attribute-missing: 'warn'
-    chomp: 'all'
-    version: '${project.version}'
-    copyright-year: '${current.year}'
-    springversionshort: '${spring.short}'
-    springversion: '${spring}'
-    commons: '${springdata.commons.docs}'
+    commons: ${springdata.commons.docs}
    include-xml-namespaces: false
-    spring-data-commons-docs-url: '${documentation.baseurl}/spring-data/commons/reference/${springdata.commons.short}'
-    spring-data-commons-javadoc-base: '{spring-data-commons-docs-url}/api/java'
-    springdocsurl: '${documentation.baseurl}/spring-framework/reference/{springversionshort}'
+    spring-data-commons-docs-url: https://docs.spring.io/spring-data/commons/reference
+    spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/commons/docs/${springdata.commons}/api/
+    springdocsurl: https://docs.spring.io/spring-framework/reference/{springversionshort}
+    springjavadocurl: https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api
    spring-framework-docs: '{springdocsurl}'
-    springjavadocurl: '${documentation.spring-javadoc-url}'
    spring-framework-javadoc: '{springjavadocurl}'
-    springhateoasversion: '${spring-hateoas}'
-    releasetrainversion: '${releasetrain}'
+    springhateoasversion: ${spring-hateoas}
+    releasetrainversion: ${releasetrain}
    store: Elasticsearch
@@ -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,11 +15,10 @@
 */
 package org.springframework.data.elasticsearch;

-import java.util.Map;
-
-import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataRetrievalFailureException;

+import java.util.Map;
+
 /**
 * @author Peter-Josef Meisch
 * @author Illia Ulianov
@@ -43,6 +42,6 @@ public class BulkFailureException extends DataRetrievalFailureException {
 	 * @author Illia Ulianov
 	 * @since 5.2
 	 */
-	public record FailureDetails(Integer status, @Nullable String errorMessage) {
+	public record FailureDetails(Integer status, String errorMessage) {
 	}
 }
@@ -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,9 +26,10 @@ import org.jspecify.annotations.Nullable;
 * @since 4.4
 */
 public class ElasticsearchErrorCause {
-	@Nullable private final String type;
+	@Nullable
+	private final String type;

-	@Nullable private final String reason;
+	private final String reason;

 	@Nullable private final String stackTrace;

@@ -38,7 +39,7 @@ public class ElasticsearchErrorCause {

 	private final List<ElasticsearchErrorCause> suppressed;

-	public ElasticsearchErrorCause(@Nullable String type, @Nullable String reason, @Nullable String stackTrace,
+	public ElasticsearchErrorCause(@Nullable String type, String reason, @Nullable String stackTrace,
 			@Nullable ElasticsearchErrorCause causedBy, List<ElasticsearchErrorCause> rootCause,
 			List<ElasticsearchErrorCause> suppressed) {
 		this.type = type;
@@ -54,7 +55,7 @@ public class ElasticsearchErrorCause {
 		return type;
 	}

-	public @Nullable String getReason() {
+	public String getReason() {
 		return 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,5 +1,5 @@
 /*
- * Copyright 2025-present the original author or authors.
+ * Copyright 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 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,18 +1,3 @@
-/*
- * Copyright 2022-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.
- */
-
-@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,18 +1,3 @@
-/*
- * Copyright 2022-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.
- */
-
-@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.
@@ -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,70 +0,0 @@
-/*
- * Copyright 2026-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.client.elc;
-
-import io.micrometer.common.KeyValues;
-
-/**
- * Default {@link ElasticsearchObservationConvention} implementation.
- *
- * @author maryantocinn
- * @since 6.1
- */
-public class DefaultElasticsearchObservationConvention implements ElasticsearchObservationConvention {
-
-	public static final DefaultElasticsearchObservationConvention INSTANCE = new DefaultElasticsearchObservationConvention();
-
-	@Override
-	public String getName() {
-		return ElasticsearchObservation.ELASTICSEARCH_COMMAND_OBSERVATION.getName();
-	}
-
-	@Override
-	public String getContextualName(ElasticsearchObservationContext context) {
-
-		String indexName = context.getIndexName();
-		if (indexName != null) {
-			return context.getOperationName().getValue() + " " + indexName;
-		}
-		return context.getOperationName().getValue();
-	}
-
-	@Override
-	public KeyValues getLowCardinalityKeyValues(ElasticsearchObservationContext context) {
-
-		KeyValues keyValues = KeyValues.of(
-				ElasticsearchObservation.LowCardinalityKeyNames.OPERATION.withValue(context.getOperationName().getValue()));
-
-		String indexName = context.getIndexName();
-		if (indexName != null) {
-			keyValues = keyValues.and(ElasticsearchObservation.LowCardinalityKeyNames.COLLECTION.withValue(indexName));
-		}
-
-		return keyValues;
-	}
-
-	@Override
-	public KeyValues getHighCardinalityKeyValues(ElasticsearchObservationContext context) {
-
-		Integer batchSize = context.getBatchSize();
-		if (batchSize != null) {
-			return KeyValues.of(
-					ElasticsearchObservation.HighCardinalityKeyNames.BATCH_SIZE.withValue(String.valueOf(batchSize)));
-		}
-
-		return KeyValues.empty();
-	}
-}
@@ -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.
@@ -34,7 +34,6 @@ import java.util.stream.Collectors;

 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;
@@ -42,6 +41,7 @@ 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;

 /**
@@ -83,7 +83,7 @@ final class DocumentAdapters {

 		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("{");
@@ -102,7 +102,7 @@ final class DocumentAdapters {

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

-		Map<String, List<@Nullable Object>> documentFields = new LinkedHashMap<>();
+		Map<String, List<Object>> documentFields = new LinkedHashMap<>();
 		hitFieldsAsMap.forEach((key, value) -> {
 			if (value instanceof List) {
 				// noinspection unchecked
@@ -160,7 +160,7 @@ final class DocumentAdapters {
 	}

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

 		if (explanation == 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.
@@ -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.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark Paluch	4c217fa9c4	Release version 5.5.2 (2025.0.2). See #3120	2025-07-18 10:27:59 +02:00
Mark Paluch	003213d4b0	Prepare 5.5.2 (2025.0.2). See #3120	2025-07-18 10:27:38 +02:00
Mark Paluch	85d52014dc	Upgrade to Maven Wrapper 3.9.11. See #3131	2025-07-17 14:00:55 +02:00
Peter-Josef Meisch	786e0928ed	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`)	2025-07-15 18:41:17 +02:00
Mark Paluch	ef6f091d6b	After release cleanups. See #3114	2025-06-13 13:42:19 +02:00
Mark Paluch	9ff829a829	Prepare next development iteration. See #3114	2025-06-13 13:42:18 +02:00
Mark Paluch	30f32b6bbe	Release version 5.5.1 (2025.0.1). See #3114	2025-06-13 13:39:35 +02:00
Mark Paluch	8ce113a083	Prepare 5.5.1 (2025.0.1). See #3114	2025-06-13 13:39:14 +02:00
Mark Paluch	262781c0a0	After release cleanups. See #3096	2025-05-16 11:31:36 +02:00
Mark Paluch	ffe8293365	Prepare next development iteration. See #3096	2025-05-16 11:31:35 +02:00