Release version 5.4.4 (2024.1.4).

See #3057

.github/README.template.adoc

@@ -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[]
-

.github/workflows/ci.yml

@@ -1,29 +0,0 @@
-name: CI Build
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ 5.5.x, 'issue/5.5.x/**' ]
-
-permissions: read-all
-
-jobs:
-  build-java:
-    strategy:
-      matrix:
-        java-version: [ base, next ]
-    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@3.5.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@3.5.x
-        env:
-          TESTCONTAINERS_REUSE_ENABLE: true
-        with:
-          settings-xml: '${{ vars.SETTINGS_XML }}'

.github/workflows/codeql.yml

@@ -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

.github/workflows/project.yml

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

@@ -1,32 +0,0 @@
-name: Snapshots
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ 5.5.x, 'issue/5.5.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@3.5.x
-        with:
-          develocity-access-key: '${{ secrets.DEVELOCITY_ACCESS_KEY }}'
-      - name: Deploy to Artifactory
-        uses: spring-projects/spring-data-build/actions/maven-artifactory-deploy@3.5.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.25</version>
+		<version>0.0.22</version>
 	</extension>
 </extensions>

.mvn/jvm.config

@@ -8,7 +8,3 @@
 --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 --add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
 --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
---add-opens=java.base/java.util=ALL-UNNAMED
---add-opens=java.base/java.lang.reflect=ALL-UNNAMED
---add-opens=java.base/java.text=ALL-UNNAMED
---add-opens=java.desktop/java.awt.font=ALL-UNNAMED

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,3 @@
-#Tue Jun 02 15:00:44 CEST 2026
-distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
+#Thu Nov 07 09:47:28 CET 2024
 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.9/apache-maven-3.9.9-bin.zip

CI.adoc

@@ -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.

Jenkinsfile

@@ -0,0 +1,132 @@
+def p = [:]
+node {
+		checkout scm
+		p = readProperties interpolate: true, file: 'ci/pipeline.properties'
+}
+
+pipeline {
+	agent none
+
+	triggers {
+		pollSCM 'H/10 * * * *'
+		upstream(upstreamProjects: "spring-data-commons/3.4.x", threshold: hudson.model.Result.SUCCESS)
+	}
+
+	options {
+		disableConcurrentBuilds()
+		buildDiscarder(logRotator(numToKeepStr: '14'))
+	}
+
+	stages {
+		stage("test: baseline (main)") {
+			when {
+				beforeAgent(true)
+				anyOf {
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			agent {
+				label 'data'
+			}
+			options { timeout(time: 30, unit: 'MINUTES') }
+
+			environment {
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
+			}
+
+			steps {
+				script {
+					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+							sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/verify.sh"
+							sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
+						}
+					}
+				}
+			}
+		}
+
+		stage("Test other configurations") {
+			when {
+				beforeAgent(true)
+				allOf {
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			parallel {
+				stage("test: baseline (next)") {
+					agent {
+						label 'data'
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
+					}
+					steps {
+						script {
+							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+								docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+									sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/verify.sh"
+									sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		stage('Release to artifactory') {
+			when {
+				beforeAgent(true)
+				anyOf {
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
+					not { triggeredBy 'UpstreamCause' }
+				}
+			}
+			agent {
+				label 'data'
+			}
+			options { timeout(time: 20, unit: 'MINUTES') }
+			environment {
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
+			}
+			steps {
+				script {
+					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+								sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
+									"./mvnw -s settings.xml -Pci,artifactory " +
+									"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
+									"-Dartifactory.server=${p['artifactory.url']} " +
+									"-Dartifactory.username=${ARTIFACTORY_USR} " +
+									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+									"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
+									"-Dartifactory.build-name=spring-data-elasticsearch " +
+									"-Dartifactory.build-number=spring-data-elasticsearch-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
+									"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch " +
+									"-Dmaven.test.skip=true clean deploy -U -B"
+						}
+					}
+				}
+			}
+		}
+	}
+
+	post {
+		changed {
+			script {
+				emailext(
+						subject: "[${currentBuild.fullDisplayName}] ${currentBuild.currentResult}",
+						mimeType: 'text/html',
+						recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']],
+						body: "<a href=\"${env.BUILD_URL}\">${currentBuild.fullDisplayName} is reported as ${currentBuild.currentResult}</a>")
+			}
+		}
+	}
+}

README.adoc

@@ -1,4 +1,4 @@
-= Spring Data for Elasticsearch image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Elasticsearch"]
+= Spring Data for Elasticsearch image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-elasticsearch%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-elasticsearch/] https://gitter.im/spring-projects/spring-data[image:https://badges.gitter.im/spring-projects/spring-data.svg[Gitter]] image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data Elasticsearch"]
 
 The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
 
@@ -62,7 +62,7 @@ public class MyService {
 
 === Using the RestClient
 
-Please check the https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#elasticsearch.clients.configuration[official documentation].
+Please check the [official documentation](https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#elasticsearch.clients.configuration).
 
 === Maven configuration
 
@@ -168,7 +168,7 @@ Building the documentation builds also the project without running tests.
  $ ./mvnw clean install -Pantora
 ----
 
-The generated documentation is available from `target/site/index.html`.
+The generated documentation is available from `target/antora/site/index.html`.
 
 == Examples
 

SECURITY.adoc

@@ -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.

ci/clean.sh

@@ -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

ci/pipeline.properties

@@ -0,0 +1,36 @@
+# Java versions
+java.main.tag=17.0.13_11-jdk-focal
+java.next.tag=23.0.1_11-jdk-noble
+
+# Docker container images - standard
+docker.java.main.image=library/eclipse-temurin:${java.main.tag}
+docker.java.next.image=library/eclipse-temurin:${java.next.tag}
+
+# Supported versions of MongoDB
+docker.mongodb.4.4.version=4.4.25
+docker.mongodb.5.0.version=5.0.21
+docker.mongodb.6.0.version=6.0.10
+docker.mongodb.7.0.version=7.0.2
+docker.mongodb.8.0.version=8.0.0
+
+# Supported versions of Redis
+docker.redis.6.version=6.2.13
+docker.redis.7.version=7.2.4
+
+# Supported versions of Cassandra
+docker.cassandra.3.version=3.11.16
+
+# Docker environment settings
+docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
+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

@@ -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

pom.xml

@@ -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>5.5.12</version>
+	<version>5.4.4</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.5.12</version>
+		<version>3.4.4</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -18,10 +18,10 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
 	<properties>
-		<springdata.commons>3.5.12</springdata.commons>
+		<springdata.commons>3.4.4</springdata.commons>
 
 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>8.18.8</elasticsearch-java>
+		<elasticsearch-java>8.15.5</elasticsearch-java>
 
 		<hoverfly>0.19.0</hoverfly>
 		<log4j>2.23.1</log4j>
@@ -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>
@@ -82,9 +73,15 @@
 	<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>
+		<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git
+		</developerConnection>
 	</scm>
 
+	<ciManagement>
+		<system>Bamboo</system>
+		<url>https://build.spring.io/browse/SPRINGDATAES</url>
+	</ciManagement>
+
 	<issueManagement>
 		<system>GitHub</system>
 		<url>https://github.com/spring-projects/spring-data-elasticsearch/issues</url>
@@ -135,18 +132,6 @@
 			</exclusions>
 		</dependency>
 
-		<dependency>
-			<groupId>org.elasticsearch.client</groupId>
-			<artifactId>elasticsearch-rest-client</artifactId>
-			<version>${elasticsearch-java}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
 		<!-- Jackson JSON Mapper -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>

settings.xml

@@ -0,0 +1,29 @@
+<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, 3.2.x ]
       start_path: src/main/antora
 asciidoc:
   attributes:

src/main/antora/antora.yml

@@ -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

src/main/antora/modules/ROOT/nav.adoc

@@ -11,7 +11,6 @@
 *** xref:migration-guides/migration-guide-5.1-5.2.adoc[]
 *** xref:migration-guides/migration-guide-5.2-5.3.adoc[]
 *** xref:migration-guides/migration-guide-5.3-5.4.adoc[]
-*** xref:migration-guides/migration-guide-5.4-5.5.adoc[]
 
 
 * xref:elasticsearch.adoc[]

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

@@ -1,12 +1,9 @@
 [[new-features]]
 = What's new
 
-[[new-features.5-5-0]]
-== New in Spring Data Elasticsearch 5.5
-
-* Upgrade to Elasticsearch 8.18.1.
-* Add support for the `@SearchTemplateQuery` annotation on repository methods.
-* Scripted field properties of type collection can be populated from scripts returning arrays.
+[[new-features.5-4-1]]
+== New in Spring Data Elasticsearch 5.4.1
+* Upgrade to Elasticsearch 8.15.5.
 
 [[new-features.5-4-0]]
 == New in Spring Data Elasticsearch 5.4

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

@@ -365,8 +365,6 @@ operations.putScript(                            <.>
 
 To use a search template in a search query, Spring Data Elasticsearch provides the `SearchTemplateQuery`, an implementation of the `org.springframework.data.elasticsearch.core.query.Query` interface.
 
-NOTE: Although `SearchTemplateQuery` is an implementation of the `Query` interface, not all of the functionality provided by the base class is available for a `SearchTemplateQuery` like setting a `Pageable` or a `Sort`. Values for this functionality must be added to the stored script like shown in the following example for paging parameters. If these values are set on the `Query` object, they will be ignored.
-
 In the following code, we will add a call using a search template query to a custom repository implementation (see
 xref:repositories/custom-implementations.adoc[]) as an example how this can be integrated into a repository call.
 
@@ -451,3 +449,4 @@ var query = Query.findAll().addSort(Sort.by(order));
 About the filter query: It is not possible to use a `CriteriaQuery` here, as this query would be converted into a Elasticsearch nested query which does not work in the filter context. So only `StringQuery` or `NativeQuery` can be used here. When using one of these, like the term query above, the Elasticsearch field names must be used, so take care, when these are redefined with the `@Field(name="...")` definition.
 
 For the definition of the order path and the nested paths, the Java entity property names should be used.
+

src/main/antora/modules/ROOT/pages/elasticsearch/repositories/elasticsearch-repository-queries.adoc

@@ -10,9 +10,7 @@ The Elasticsearch module supports all basic query building feature as string que
 === Declared queries
 
 Deriving the query from the method name is not always sufficient and/or may result in unreadable method names.
-In this case one might make use of the `@Query` annotation (see xref:elasticsearch/repositories/elasticsearch-repository-queries.adoc#elasticsearch.query-methods.at-query[Using the @Query Annotation] ).
-
-Another possibility is the use of a search-template, (see xref:elasticsearch/repositories/elasticsearch-repository-queries.adoc#elasticsearch.query-methods.at-searchtemplate-query[Using the @SearchTemplateQuery Annotation] ).
+In this case one might make use of the `@Query` annotation (see xref:elasticsearch/repositories/elasticsearch-repository-queries.adoc#elasticsearch.query-methods.at-query[Using @Query Annotation] ).
 
 [[elasticsearch.query-methods.criterions]]
 == Query creation
@@ -314,13 +312,11 @@ Repository methods can be defined to have the following return types for returni
 * `SearchPage<T>`
 
 [[elasticsearch.query-methods.at-query]]
-== Using the @Query Annotation
+== Using @Query Annotation
 
 .Declare query on the method using the `@Query` annotation.
 ====
-The arguments passed to the method can be inserted into placeholders in the query string.
-The placeholders are of the form `?0`, `?1`, `?2` etc. for the first, second, third parameter and so on.
-
+The arguments passed to the method can be inserted into placeholders in the query string. The placeholders are of the form `?0`, `?1`, `?2` etc. for the first, second, third parameter and so on.
 [source,java]
 ----
 interface BookRepository extends ElasticsearchRepository<Book, String> {
@@ -345,20 +341,15 @@ It will be sent to Easticsearch as value of the query element; if for example th
 }
 ----
 ====
-
 .`@Query` annotation on a method taking a Collection argument
 ====
 A repository method such as
-
 [source,java]
 ----
 @Query("{\"ids\": {\"values\": ?0 }}")
 List<SampleEntity> getByIds(Collection<String> ids);
 ----
-
-would make an https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-query.html[IDs query] to return all the matching documents.
-So calling the method with a `List` of `["id1", "id2", "id3"]` would produce the query body
-
+would make an https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-ids-query.html[IDs query] to return all the matching documents. So calling the method with a `List` of `["id1", "id2", "id3"]` would produce the query body
 [source,json]
 ----
 {
@@ -376,7 +367,8 @@ 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]
 ----
@@ -419,7 +411,6 @@ If for example the function is called with the parameter _John_, it would produc
 .accessing parameter property.
 ====
 Supposing that we have the following class as query parameter type:
-
 [source,java]
 ----
 public record QueryParameter(String value) {
@@ -453,9 +444,7 @@ We can pass `new QueryParameter("John")` as the parameter now, and it will produ
 
 .accessing bean property.
 ====
-{spring-framework-docs}/core/expressions/language-ref/bean-references.html[Bean property] is also supported to access.
-Given that there is a bean named `queryParameter` of type `QueryParameter`, we can access the bean with symbol `@` rather than `#`, and there is no need to declare a parameter of type `QueryParameter` in the query method:
-
+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]
 ----
 interface BookRepository extends ElasticsearchRepository<Book, String> {
@@ -504,7 +493,6 @@ interface BookRepository extends ElasticsearchRepository<Book, String> {
 NOTE: collection values should not be quoted when declaring the elasticsearch json query.
 
 A collection of `names` like `List.of("name1", "name2")` will produce the following terms query:
-
 [source,json]
 ----
 {
@@ -523,7 +511,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]
 ----
@@ -544,7 +532,6 @@ interface BookRepository extends ElasticsearchRepository<Book, String> {
     Page<Book> findByName(Collection<QueryParameter> parameters, Pageable pageable);
 }
 ----
-
 This will extract all the `value` property values as a new `Collection` from `QueryParameter` collection, thus takes the same effect as above.
 ====
 
@@ -573,20 +560,3 @@ interface BookRepository extends ElasticsearchRepository<Book, String> {
 ----
 
 ====
-
-[[elasticsearch.query-methods.at-searchtemplate-query]]
-== Using the @SearchTemplateQuery Annotation
-
-When using Elasticsearch search templates - (see xref:elasticsearch/misc.adoc#elasticsearch.misc.searchtemplates [Search Template support]) it is possible to specify that a repository method should use a template by adding the `@SearchTemplateQuery` annotation to that method.
-
-Let's assume that there is a search template stored with the name "book-by-title" and this template need a parameter named "title", then a repository method using that search template can be defined like this:
-
-[source,java]
-----
-interface BookRepository extends ElasticsearchRepository<Book, String> {
-    @SearchTemplateQuery(id = "book-by-title")
-    SearchHits<Book> findByTitle(String title);
-}
-----
-
-The parameters of the repository method are sent to the seacrh template as key/value pairs where the key is the parameter name and the value is taken from the actual value when the method is invoked.

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

@@ -6,10 +6,9 @@ The following table shows the Elasticsearch and Spring versions that are used by
 [cols="^,^,^,^",options="header"]
 |===
 | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
-| 2025.0 | 5.5.x | 8.18.8 | 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
+| 2024.1  | 5.4.x | 8.15.5 | 6.2.x
+| 2024.0  | 5.3.1 | 8.13.4 | 6.1.x
+| 2023.1 (Vaughan) | 5.2.xfootnote:oom[Out of maintenance] | 8.11.1 | 6.1.x
 | 2023.0 (Ullmann) | 5.1.xfootnote:oom[] | 8.7.1 | 6.0.x
 | 2022.0 (Turing) | 5.0.xfootnote:oom[] | 8.5.3 | 6.0.x
 | 2021.2 (Raj) | 4.4.xfootnote:oom[] | 7.17.3 | 5.3.x

src/main/antora/modules/ROOT/pages/migration-guides/migration-guide-5.4-5.5.adoc

@@ -1,30 +0,0 @@
-[[elasticsearch-migration-guide-5.4-5.5]]
-= Upgrading from 5.4.x to 5.5.x
-
-This section describes breaking changes from version 5.4.x to 5.5.x and how removed features can be replaced by new introduced features.
-
-[[elasticsearch-migration-guide-5.4-5.5.breaking-changes]]
-== Breaking Changes
-
-[[elasticsearch-migration-guide-5.4-5.5.deprecations]]
-== Deprecations
-
-Some classes that probably are not used by a library user have been renamed, the classes with the old names are still there, but are deprecated:
-
-|===
-|old name|new name
-
-|ElasticsearchPartQuery|RepositoryPartQuery
-|ElasticsearchStringQuery|RepositoryStringQuery
-|ReactiveElasticsearchStringQuery|ReactiveRepositoryStringQuery
-|===
-
-=== Removals
-
-The following methods that had been deprecated since release 5.3 have been removed:
-```
-DocumentOperations.delete(Query, Class<?>)
-DocumentOperations.delete(Query, Class<?>, IndexCoordinates)
-ReactiveDocumentOperations.delete(Query, Class<?>)
-ReactiveDocumentOperations.delete(Query, Class<?>, IndexCoordinates)
-```

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

@@ -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

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -1,42 +0,0 @@
-/*
- * Copyright 2025-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import org.springframework.data.annotation.QueryAnnotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to mark a repository method as a search template method. The annotation defines the search template id,
- * the parameters for the search template are taken from the method's arguments.
- *
- * @author P.J. Meisch (pj.meisch@sothawo.com)
- * @since 5.5
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
-@Documented
-@QueryAnnotation
-public @interface SearchTemplateQuery {
-    /**
-     * The id of the search template. Must not be empt or null.
-     */
-    String id();
-}

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-present the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@ package org.springframework.data.elasticsearch.client.elc;
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.transport.ElasticsearchTransport;
 
-import java.io.IOException;
-
 import org.elasticsearch.client.RestClient;
 import org.springframework.util.Assert;
 
@@ -38,10 +36,7 @@ public class AutoCloseableElasticsearchClient extends ElasticsearchClient implem
 	}
 
 	@Override
-	public void close() throws IOException {
-		// since Elasticsearch 8.16 the ElasticsearchClient implements (through ApiClient) the Closeable interface and
-		// handles closing of the underlying transport. We now just call the base class, but keep this as we
-		// have been implementing AutoCloseable since 4.4 and won't change that to a mere Closeable
-		super.close();
+	public void close() throws Exception {
+		transport.close();
 	}
 }

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.

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

@@ -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.
@@ -329,7 +329,7 @@ public final class ElasticsearchClients {
 		Assert.notNull(jsonpMapper, "jsonpMapper must not be null");
 
 		TransportOptions.Builder transportOptionsBuilder = transportOptions != null ? transportOptions.toBuilder()
-				: new RestClientOptions(RequestOptions.DEFAULT, false).toBuilder();
+				: new RestClientOptions(RequestOptions.DEFAULT).toBuilder();
 
 		RestClientOptions.Builder restClientOptionsBuilder = getRestClientOptionsBuilder(transportOptions);
 

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

@@ -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.
@@ -135,6 +135,6 @@ public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurat
 	 * @return the options that should be added to every request. Must not be {@literal null}
 	 */
 	public TransportOptions transportOptions() {
-		return new RestClientOptions(RequestOptions.DEFAULT, false);
+		return new RestClientOptions(RequestOptions.DEFAULT);
 	}
 }

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

@@ -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.

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

@@ -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.
@@ -181,6 +181,19 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
 		return delete(query, clazz, getIndexCoordinatesFor(clazz));
 	}
 
+	@Override
+	public ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index) {
+
+		Assert.notNull(query, "query must not be null");
+
+		DeleteByQueryRequest request = requestConverter.documentDeleteByQueryRequest(query, routingResolver.getRouting(),
+				clazz, index, getRefreshPolicy());
+
+		DeleteByQueryResponse response = execute(client -> client.deleteByQuery(request));
+
+		return responseConverter.byQueryResponse(response);
+	}
+
 	@Override
 	public ByQueryResponse delete(DeleteQuery query, Class<?> clazz, IndexCoordinates index) {
 		Assert.notNull(query, "query must not be null");