Release version 6.0.6 (2025.1.6).

See #3276

.github/README.template.adoc

@@ -0,0 +1,83 @@
+= 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[]
+

.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+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
+        with:
+          settings-xml: '${{ vars.SETTINGS_XML }}'

.github/workflows/codeql.yml

@@ -0,0 +1,21 @@
+# 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

.github/workflows/project.yml

@@ -0,0 +1,45 @@
+# GitHub Actions to automate GitHub issues for Spring Data Project Management
+
+name: Spring Data GitHub Issues
+
+on:
+  issues:
+    types: [opened, edited, reopened]
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened, edited, reopened]
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  Inbox:
+    runs-on: ubuntu-latest
+    if: vars.PROJECT_CARDS_ENABLED == 'true' && github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request == null && !contains(join(github.event.issue.labels.*.name, ', '), 'dependency-upgrade') && !contains(github.event.issue.title, 'Release ')
+    steps:
+      - name: Create or Update Issue Card
+        uses: actions/add-to-project@v1.0.2
+        with:
+          project-url: https://github.com/orgs/spring-projects/projects/25
+          github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }}
+  Pull-Request:
+    runs-on: ubuntu-latest
+    if: vars.PROJECT_CARDS_ENABLED == 'true' && github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request != null
+    steps:
+      - name: Create or Update Pull Request Card
+        uses: actions/add-to-project@v1.0.2
+        with:
+          project-url: https://github.com/orgs/spring-projects/projects/25
+          github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }}
+  Feedback-Provided:
+    runs-on: ubuntu-latest
+    if: vars.PROJECT_CARDS_ENABLED == 'true' && github.repository_owner == 'spring-projects' && github.event_name == 'issue_comment' && github.event.action == 'created' && github.actor != 'spring-projects-issues' && github.event.pull_request == null && github.event.issue.state == 'open' && contains(toJSON(github.event.issue.labels), 'waiting-for-feedback')
+    steps:
+      - name: Update Project Card
+        uses: actions/add-to-project@v1.0.2
+        with:
+          project-url: https://github.com/orgs/spring-projects/projects/25
+          github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }}

.github/workflows/snapshots.yml

@@ -0,0 +1,32 @@
+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 }}'
+          context-url: '${{ vars.ARTIFACTORY_CONTEXT_URL }}'
+          repository: '${{ vars.ARTIFACTORY_REPOSITORY }}'
+          project: '${{ vars.ARTIFACTORY_PROJECT }}'
+          settings-xml: '${{ vars.SETTINGS_XML }}'

.mvn/extensions.xml

@@ -3,6 +3,6 @@
 	<extension>
 		<groupId>io.spring.develocity.conventions</groupId>
 		<artifactId>develocity-conventions-maven-extension</artifactId>
-		<version>0.0.22</version>
+		<version>0.0.25</version>
 	</extension>
 </extensions>

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,3 @@
-#Thu Jul 17 13:59:56 CEST 2025
+#Tue Jun 02 14:59:45 CEST 2026
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
 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

CI.adoc

@@ -1,43 +1,5 @@
 = 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
 
-Since this pipeline is purely Docker-based, it's easy to:
+You can run CI jobs locally using Docker and act[https://nektosact.com/].
-
-* 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.

Jenkinsfile

@@ -1,132 +0,0 @@
-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/main", 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>")
-			}
-		}
-	}
-}

README.adoc

@@ -1,4 +1,4 @@
-= 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"]
+= 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.
 

SECURITY.adoc

@@ -1,9 +1,15 @@
-# Security Policy
+= Security Policy
 
-## Supported Versions
+== Reporting a Vulnerability
 
-Please see the https://spring.io/projects/spring-data-elasticsearch[Spring Data Elasticsearch] project page for 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].
 
-## Reporting a Vulnerability
+For more details, check out our https://spring.io/security-policy[security policy].
 
-Please don't raise security vulnerabilities here. Head over to https://pivotal.io/security to learn how to disclose them responsibly.
+== 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.

ci/clean.sh

@@ -1,8 +0,0 @@
-#!/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

ci/pipeline.properties

@@ -1,31 +0,0 @@
-# Java versions
-java.main.tag=24.0.1_9-jdk-noble
-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 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

ci/verify.sh

@@ -1,10 +0,0 @@
-#!/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

pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>6.0.0-M5</version>
+	<version>6.0.6</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>4.0.0-M5</version>
+		<version>4.0.6</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.0-M5</springdata.commons>
+		<springdata.commons>4.0.6</springdata.commons>
 
 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>9.1.1</elasticsearch-java>
+		<elasticsearch-java>9.2.8</elasticsearch-java>
+		<elasticsearch-rest-client>9.2.8</elasticsearch-rest-client>
 
-		<hoverfly>0.19.0</hoverfly>
+		<hoverfly>0.20.2</hoverfly>
-		<log4j>2.23.1</log4j>
+		<log4j>2.25.1</log4j>
 		<jsonassert>1.5.3</jsonassert>
-		<testcontainers>1.20.0</testcontainers>
+		<wiremock>3.9.2</wiremock>
-		<wiremock>3.9.1</wiremock>
 
 		<java-module-name>spring.data.elasticsearch</java-module-name>
 
@@ -41,6 +41,15 @@
 	</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>
@@ -73,20 +82,35 @@
 	<scm>
 		<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 		<connection>scm:git:git://github.com/spring-projects/spring-data-elasticsearch.git</connection>
-		<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git
+		<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git</developerConnection>
-		</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 -->
@@ -136,7 +160,7 @@
 		<dependency>
 			<groupId>org.elasticsearch.client</groupId>
 			<artifactId>elasticsearch-rest-client</artifactId>
-			<version>${elasticsearch-java}</version>
+			<version>${elasticsearch-rest-client}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -238,6 +262,14 @@
 			<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>
@@ -289,21 +321,6 @@
 			<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>
@@ -313,16 +330,7 @@
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>elasticsearch</artifactId>
+			<artifactId>testcontainers-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>
 

settings.xml

@@ -1,29 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
-
-	<servers>
-		<server>
-			<id>spring-plugins-release</id>
-			<username>${env.ARTIFACTORY_USR}</username>
-			<password>${env.ARTIFACTORY_PSW}</password>
-		</server>
-		<server>
-			<id>spring-libs-snapshot</id>
-			<username>${env.ARTIFACTORY_USR}</username>
-			<password>${env.ARTIFACTORY_PSW}</password>
-		</server>
-		<server>
-			<id>spring-libs-milestone</id>
-			<username>${env.ARTIFACTORY_USR}</username>
-			<password>${env.ARTIFACTORY_PSW}</password>
-		</server>
-		<server>
-			<id>spring-libs-release</id>
-			<username>${env.ARTIFACTORY_USR}</username>
-			<password>${env.ARTIFACTORY_PSW}</password>
-		</server>
-	</servers>
-
-</settings>

src/main/antora/antora-playbook.yml

@@ -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, 3.4.x, 3.3.x ]
+      branches: [ main ]
       start_path: src/main/antora
 asciidoc:
   attributes:

src/main/antora/antora.yml

@@ -6,12 +6,8 @@ nav:
 ext:
   collector:
     - run:
-        command: ./mvnw validate process-resources -am -Pantora-process-resources
+        command: ./mvnw -B validate process-resources dependency:unpack -am -Pantora-process-resources
         local: true
       scan:
-        dir: target/classes/
+        - dir: target/classes/
-    - run:
+        - dir: target/antora/
-        command: ./mvnw package -Pdistribute
-        local: true
-      scan:
-        dir: target/antora

src/main/antora/modules/ROOT/pages/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 ES index operations and POJOs.
+* The xref:elasticsearch/template.adoc[`ElasticsearchTemplate` and `ReactiveElasticsearchTemplate`] helper classes that provide object mapping between Elasticsearch 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.

src/main/antora/modules/ROOT/pages/elasticsearch/clients.adoc

@@ -9,7 +9,7 @@ Although the Elasticsearch Client can be used directly to work with the cluster,
 [[elasticsearch.clients.rest5client]]
 == Imperative Rest5Client
 
-To use the imperative (non-reactive) Rest5Client, a configuration bean must be configured like this:
+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:
 
 ====
 [source,java]
@@ -39,7 +39,9 @@ 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
@@ -83,7 +85,7 @@ To use the imperative (non-reactive) RestClient - deprecated since version 6 - ,
 ----
 ====
 
-The configuration bean must be configured like this:
+The configuration bean must then be configured like this:
 
 ====
 [source,java]
@@ -113,14 +115,16 @@ 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
 ElasticsearchClient elasticsearchClient; <.>
 
 @Autowired
-RestClient restClient;                 <.>
+RestClient restClient;                   <.>
 
 @Autowired
 JsonpMapper jsonpMapper;                 <.>
@@ -167,6 +171,8 @@ The following beans can then be injected in other Spring components:
 ====
 [source,java]
 ----
+import org.springframework.beans.factory.annotation.Autowired;
+
 @Autowired
 ReactiveElasticsearchOperations operations;      <.>
 
@@ -226,6 +232,8 @@ The following beans can then be injected in other Spring components:
 ====
 [source,java]
 ----
+import org.springframework.beans.factory.annotation.Autowired;
+
 @Autowired
 ReactiveElasticsearchOperations operations;      <.>
 
@@ -294,7 +302,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 8 on startup.
+<.> 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 set a proxy.
 <.> Optionally set a path prefix, mostly used when different clusters a behind some reverse proxy.
 <.> Set the connection timeout.
@@ -320,7 +328,7 @@ The following callbacks are provided:
 ==== Configuration of the low level Elasticsearch `Rest5Client`:
 
 This callback provides a `org.elasticsearch.client.RestClientBuilder` that can be used to configure the Elasticsearch
-`RestClient`:
+`Rest5Client`:
 ====
 [source,java]
 ----
@@ -450,11 +458,31 @@ ClientConfiguration.builder()
 == 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 `tracer` package to "trace" (see
+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/guide/en/elasticsearch/client/java-api-client/current/java-rest-low-usage-logging.html)
+https://www.elastic.co/docs/reference/elasticsearch/clients/java/transport/rest5-client/usage/logging)
 
 .Enable transport layer logging
+[tabs]
+======
+XML::
++
 [source,xml]
 ----
-<logger name="tracer" level="trace"/>
+<logger name="co.elastic.clients.transport.rest5_client.low_level.Request" 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
+----
+======

src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc

@@ -4,10 +4,11 @@
 [[new-features.6-0-0]]
 == New in Spring Data Elasticsearch 6.0
 
-* Upgarde to Spring 7
+* Upgrade to Spring 7
 * Switch to jspecify nullability annotations
-* Upgrade to Elasticsearch 9.1.1
+* 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]]

src/main/antora/modules/ROOT/pages/elasticsearch/misc.adoc

@@ -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
+* `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
 * `shards` the number of shards to use, defaults to _1_
 * `replicas` the number of replicas, defaults to _1_
 * `refreshIntervall`, defaults to _"1s"_

src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc

@@ -6,10 +6,10 @@ 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 (in development) | 6.0.x | 9.1.1 | 7.0.x
+| 2025.1 | 6.0.x | 9.2.8 | 7.0.x
 | 2025.0 | 5.5.x | 8.18.1 | 6.2.x
-| 2024.1 | 5.4.x | 8.15.5 | 6.1.x
+| 2024.1 | 5.4.xfootnote:oom[Out of maintenance] | 8.15.5 | 6.1.x
-| 2024.0 | 5.3.xfootnote:oom[Out of maintenance] | 8.13.4 | 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
 | 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

src/main/antora/resources/antora-resources/antora.yml

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

src/main/java/org/springframework/data/elasticsearch/BulkFailureException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2025 the original author or authors.
+ * Copyright 2020-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.

src/main/java/org/springframework/data/elasticsearch/ElasticsearchErrorCause.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 the original author or authors.
+ * 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.

src/main/java/org/springframework/data/elasticsearch/NoSuchIndexException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2025 the original author or authors.
+ * Copyright 2019-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.

src/main/java/org/springframework/data/elasticsearch/ResourceFailureException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/ResourceNotFoundException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 the original author or authors.
+ * 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.

src/main/java/org/springframework/data/elasticsearch/RestStatusException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/UncategorizedElasticsearchException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2025 the original author or authors.
+ * Copyright 2020-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.

src/main/java/org/springframework/data/elasticsearch/VersionConflictException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023-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.

src/main/java/org/springframework/data/elasticsearch/annotations/Alias.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-2025 the original author or authors.
+ * Copyright 2024-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.

src/main/java/org/springframework/data/elasticsearch/annotations/Aliases.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-2025 the original author or authors.
+ * Copyright 2024-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.

src/main/java/org/springframework/data/elasticsearch/annotations/CompletionContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2025 the original author or authors.
+ * Copyright 2019-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.

src/main/java/org/springframework/data/elasticsearch/annotations/CompletionField.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2025 the original author or authors.
+ * Copyright 2013-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.

src/main/java/org/springframework/data/elasticsearch/annotations/CountQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/annotations/DateFormat.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2025 the original author or authors.
+ * Copyright 2014-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.

src/main/java/org/springframework/data/elasticsearch/annotations/Document.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2025 the original author or authors.
+ * Copyright 2013-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.
@@ -107,17 +107,15 @@ 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;
 

src/main/java/org/springframework/data/elasticsearch/annotations/Dynamic.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/annotations/Field.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2025 the original author or authors.
+ * Copyright 2013-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.

src/main/java/org/springframework/data/elasticsearch/annotations/FieldElementType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-2025 the original author or authors.
+ * Copyright 2024-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.

src/main/java/org/springframework/data/elasticsearch/annotations/FieldType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2025 the original author or authors.
+ * Copyright 2013-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.

src/main/java/org/springframework/data/elasticsearch/annotations/Filter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-2025 the original author or authors.
+ * Copyright 2024-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.

src/main/java/org/springframework/data/elasticsearch/annotations/GeoPointField.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2025 the original author or authors.
+ * Copyright 2013-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.

src/main/java/org/springframework/data/elasticsearch/annotations/GeoShapeField.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2025 the original author or authors.
+ * Copyright 2017-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.

src/main/java/org/springframework/data/elasticsearch/annotations/Highlight.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2025 the original author or authors.
+ * Copyright 2020-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.

src/main/java/org/springframework/data/elasticsearch/annotations/HighlightField.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2025 the original author or authors.
+ * Copyright 2020-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.

src/main/java/org/springframework/data/elasticsearch/annotations/HighlightParameters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2025 the original author or authors.
+ * Copyright 2020-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.

src/main/java/org/springframework/data/elasticsearch/annotations/IndexOptions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2025 the original author or authors.
+ * Copyright 2019-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.

src/main/java/org/springframework/data/elasticsearch/annotations/IndexPrefixes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2025 the original author or authors.
+ * Copyright 2019-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.

src/main/java/org/springframework/data/elasticsearch/annotations/IndexedIndexName.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023-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.

src/main/java/org/springframework/data/elasticsearch/annotations/InnerField.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2025 the original author or authors.
+ * Copyright 2014-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.

src/main/java/org/springframework/data/elasticsearch/annotations/JoinTypeRelation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2025 the original author or authors.
+ * Copyright 2020-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.

src/main/java/org/springframework/data/elasticsearch/annotations/JoinTypeRelations.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2025 the original author or authors.
+ * Copyright 2020-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.

src/main/java/org/springframework/data/elasticsearch/annotations/KnnAlgorithmType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-2025 the original author or authors.
+ * Copyright 2024-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.

src/main/java/org/springframework/data/elasticsearch/annotations/KnnIndexOptions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-2025 the original author or authors.
+ * Copyright 2024-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.

src/main/java/org/springframework/data/elasticsearch/annotations/KnnSimilarity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-2025 the original author or authors.
+ * Copyright 2024-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.

src/main/java/org/springframework/data/elasticsearch/annotations/Mapping.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2025 the original author or authors.
+ * Copyright 2014-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.

src/main/java/org/springframework/data/elasticsearch/annotations/MappingAlias.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-2025 the original author or authors.
+ * Copyright 2024-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.

src/main/java/org/springframework/data/elasticsearch/annotations/MultiField.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2025 the original author or authors.
+ * Copyright 2014-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.

src/main/java/org/springframework/data/elasticsearch/annotations/NullValueType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2025 the original author or authors.
+ * Copyright 2020-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.

src/main/java/org/springframework/data/elasticsearch/annotations/Query.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2025 the original author or authors.
+ * Copyright 2013-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.

src/main/java/org/springframework/data/elasticsearch/annotations/SearchTemplateQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 the original author or authors.
+ * 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.

src/main/java/org/springframework/data/elasticsearch/annotations/Setting.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2025 the original author or authors.
+ * Copyright 2014-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.

src/main/java/org/springframework/data/elasticsearch/annotations/Similarity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2025 the original author or authors.
+ * Copyright 2019-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.

src/main/java/org/springframework/data/elasticsearch/annotations/SourceFilters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 the original author or authors.
+ * 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.

src/main/java/org/springframework/data/elasticsearch/annotations/TermVector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2025 the original author or authors.
+ * Copyright 2019-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.

src/main/java/org/springframework/data/elasticsearch/annotations/ValueConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/annotations/WriteOnlyProperty.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 the original author or authors.
+ * 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.

src/main/java/org/springframework/data/elasticsearch/annotations/WriteTypeHint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/aot/ElasticsearchAotPredicates.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023-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.
@@ -17,7 +17,7 @@ package org.springframework.data.elasticsearch.aot;
 
 import java.util.function.Predicate;
 
-import org.springframework.data.util.ReactiveWrappers;
+import org.springframework.data.core.ReactiveWrappers;
 
 /**
  * @author Peter-Josef Meisch

src/main/java/org/springframework/data/elasticsearch/aot/SpringDataElasticsearchRuntimeHints.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2025 the original author or authors.
+ * Copyright 2023-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.

src/main/java/org/springframework/data/elasticsearch/client/ClientConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2025 the original author or authors.
+ * Copyright 2018-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.

src/main/java/org/springframework/data/elasticsearch/client/ClientConfigurationBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2025 the original author or authors.
+ * Copyright 2018-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.

src/main/java/org/springframework/data/elasticsearch/client/DefaultClientConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2025 the original author or authors.
+ * Copyright 2018-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.

src/main/java/org/springframework/data/elasticsearch/client/ElasticsearchHost.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2025 the original author or authors.
+ * Copyright 2018-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.

src/main/java/org/springframework/data/elasticsearch/client/InetSocketAddressParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2025 the original author or authors.
+ * Copyright 2018-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.

src/main/java/org/springframework/data/elasticsearch/client/NoReachableHostException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2025 the original author or authors.
+ * Copyright 2018-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.

src/main/java/org/springframework/data/elasticsearch/client/UnsupportedBackendOperation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 the original author or authors.
+ * 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.

src/main/java/org/springframework/data/elasticsearch/client/UnsupportedClientOperationException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 the original author or authors.
+ * 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.

src/main/java/org/springframework/data/elasticsearch/client/elc/AbstractQueryProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-2025 the original author or authors.
+ * Copyright 2024-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/Aggregation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 the original author or authors.
+ * 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.

src/main/java/org/springframework/data/elasticsearch/client/elc/AutoCloseableElasticsearchClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/ChildTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/ClusterTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/CriteriaFilterProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/CriteriaQueryException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/CriteriaQueryProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/DocumentAdapters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchAggregation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 the original author or authors.
+ * 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.

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchAggregations.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchClientBeanDefinitionParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 the original author or authors.
+ * 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.

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchClientFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 the original author or authors.
+ * 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.

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchClients.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchExceptionTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchLegacyRestClientConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/ElasticsearchTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.

src/main/java/org/springframework/data/elasticsearch/client/elc/EntityAsMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2025 the original author or authors.
+ * Copyright 2021-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.