Release version 5.5.6 (2025.0.6).

See #3185
Prepare 5.5.6 (2025.0.6).
2026-05-23 04:33:17 +00:00 · 2025-11-14 11:30:08 +01:00 · 2025-11-14 11:29:46 +01:00 · 2025-11-14 10:43:24 +01:00 · 2025-10-17 11:39:06 +02:00 · 2025-10-17 11:39:05 +02:00
636 changed files with 6691 additions and 1874 deletions
@@ -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
@@ -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: 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: 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: 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 }}
@@ -30,7 +30,7 @@ target
 build/
 node_modules
 node
-package.json
 package-lock.json

-.mvn/.gradle-enterprise
+.mvn/.develocity
+/src/test/resources/testcontainers-local.properties
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extensions>
 	<extension>
-		<groupId>com.gradle</groupId>
-		<artifactId>gradle-enterprise-maven-extension</artifactId>
-		<version>1.19.2</version>
-	</extension>
-	<extension>
-		<groupId>com.gradle</groupId>
-		<artifactId>common-custom-user-data-maven-extension</artifactId>
-		<version>1.12.4</version>
+		<groupId>io.spring.develocity.conventions</groupId>
+		<artifactId>develocity-conventions-maven-extension</artifactId>
+		<version>0.0.22</version>
 	</extension>
 </extensions>
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<gradleEnterprise
-		xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
-	<server>
-		<url>https://ge.spring.io</url>
-	</server>
-	<buildScan>
-		<backgroundBuildScanUpload>false</backgroundBuildScanUpload>
-		<captureGoalInputFiles>true</captureGoalInputFiles>
-		<publishIfAuthenticated>true</publishIfAuthenticated>
-		<obfuscation>
-			<ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
-		</obfuscation>
-	</buildScan>
-	<buildCache>
-		<local>
-			<enabled>true</enabled>
-		</local>
-		<remote>
-			<server>
-				<credentials>
-					<username>${env.GRADLE_ENTERPRISE_CACHE_USERNAME}</username>
-					<password>${env.GRADLE_ENTERPRISE_CACHE_PASSWORD}</password>
-				</credentials>
-			</server>
-			<enabled>true</enabled>
-			<storeEnabled>#{env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null and env['GRADLE_ENTERPRISE_CACHE_PASSWORD'] != null}</storeEnabled>
-		</remote>
-	</buildCache>
-</gradleEnterprise>
@@ -0,0 +1,14 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--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
@@ -1,3 +1,3 @@
-#Thu Dec 14 08:40:44 CET 2023
+#Thu Jul 17 14:00:55 CEST 2025
 wrapperUrl=https\://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
-distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
@@ -9,7 +9,7 @@ pipeline {

 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/main", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/3.5.x", threshold: hudson.model.Result.SUCCESS)
 	}

 	options {
@@ -33,15 +33,16 @@ pipeline {

 			environment {
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-				DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
 				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}

 			steps {
 				script {
-					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"
+					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"
+						}
 					}
 				}
 			}
@@ -63,14 +64,15 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES') }
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-						DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
 						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
-							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-								sh "PROFILE=none JENKINS_USER_NAME=${p['jenkins.user.name']} ci/verify.sh"
-								sh "JENKINS_USER_NAME=${p['jenkins.user.name']} ci/clean.sh"
+							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"
+								}
 							}
 						}
 					}
@@ -92,24 +94,24 @@ pipeline {
 			options { timeout(time: 20, unit: 'MINUTES') }
 			environment {
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-				DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
 				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}
 			steps {
 				script {
-					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
-							sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
-								"DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR} " +
-								"DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW} " +
-								"GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY} " +
-								"./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root " +
-								"-Dartifactory.server=${p['artifactory.url']} " +
-								"-Dartifactory.username=${ARTIFACTORY_USR} " +
-								"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-								"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
-								"-Dartifactory.build-name=spring-data-elasticsearch " +
-								"-Dartifactory.build-number=spring-data-elasticsearch-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
-								"-Dmaven.test.skip=true clean deploy -U -B"
+					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"
+						}
 					}
 				}
 			}
@@ -62,7 +62,7 @@ public class MyService {

 === Using the RestClient

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

 === 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/antora/site/index.html`.
+The generated documentation is available from `target/site/index.html`.

 == Examples

@@ -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.
@@ -2,12 +2,7 @@

 set -euo pipefail

-export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
-export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
 export JENKINS_USER=${JENKINS_USER_NAME}

-# The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
-export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
-
 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
+  ./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
@@ -1,22 +1,20 @@
 # Java versions
-java.main.tag=17.0.9_9-jdk-focal
-java.next.tag=21.0.1_12-jdk-jammy
+java.main.tag=17.0.15_6-jdk-focal
+java.next.tag=24.0.1_9-jdk-noble

 # Docker container images - standard
-docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
-docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
+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.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
-
-# Supported versions of Cassandra
-docker.cassandra.3.version=3.11.16
+docker.redis.7.version=7.2.4
+docker.valkey.8.version=8.1.1

 # Docker environment settings
 docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
@@ -25,9 +23,10 @@ docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -
 # 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.cache.credentials=gradle_enterprise_cache_user
 develocity.access-key=gradle_enterprise_secret_access_key
 jenkins.user.name=spring-builds+jenkins
@@ -3,15 +3,8 @@
 set -euo pipefail

 mkdir -p /tmp/jenkins-home/.m2/spring-data-elasticsearch
-chown -R 1001:1001 .
-
-export DEVELOCITY_CACHE_USERNAME=${DEVELOCITY_CACHE_USR}
-export DEVELOCITY_CACHE_PASSWORD=${DEVELOCITY_CACHE_PSW}
 export JENKINS_USER=${JENKINS_USER_NAME}

-# The environment variable to configure access key is still GRADLE_ENTERPRISE_ACCESS_KEY
-export GRADLE_ENTERPRISE_ACCESS_KEY=${DEVELOCITY_ACCESS_KEY}
-
 MAVEN_OPTS="-Duser.name=${JENKINS_USER} -Duser.home=/tmp/jenkins-home" \
  ./mvnw -s settings.xml \
-  -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch
+  -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root
@@ -0,0 +1,10 @@
+{
+    "dependencies": {
+        "antora": "3.2.0-alpha.6",
+        "@antora/atlas-extension": "1.0.0-alpha.2",
+        "@antora/collector-extension": "1.0.0-alpha.7",
+        "@asciidoctor/tabs": "1.0.0-beta.6",
+        "@springio/antora-extensions": "1.13.0",
+        "@springio/asciidoctor-extensions": "1.0.0-alpha.11"
+    }
+}
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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.3.0</version>
+	<version>5.5.6</version>

 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.3.0</version>
+		<version>3.5.6</version>
 	</parent>

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

 	<properties>
-		<springdata.commons>3.3.0</springdata.commons>
+		<springdata.commons>3.5.6</springdata.commons>

 		<!-- version of the ElasticsearchClient	-->
-		<elasticsearch-java>8.13.2</elasticsearch-java>
+		<elasticsearch-java>8.18.8</elasticsearch-java>

-		<blockhound-junit>1.0.8.RELEASE</blockhound-junit>
-		<hoverfly>0.14.4</hoverfly>
-		<log4j>2.18.0</log4j>
-		<jsonassert>1.5.1</jsonassert>
-		<testcontainers>1.18.0</testcontainers>
-		<wiremock>2.35.1</wiremock>
+		<hoverfly>0.19.0</hoverfly>
+		<log4j>2.23.1</log4j>
+		<jsonassert>1.5.3</jsonassert>
+		<testcontainers>1.20.0</testcontainers>
+		<wiremock>3.9.1</wiremock>

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

@@ -42,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>
@@ -78,11 +86,6 @@
 		</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>
@@ -132,9 +135,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
 		<dependency>
 			<groupId>org.elasticsearch.client</groupId>
-			<artifactId>elasticsearch-rest-client</artifactId> <!-- is Apache 2-->
+			<artifactId>elasticsearch-rest-client</artifactId>
 			<version>${elasticsearch-java}</version>
 			<exclusions>
 				<exclusion>
@@ -248,13 +252,6 @@
 			<scope>test</scope>
 		</dependency>

-		<dependency>
-			<groupId>io.projectreactor.tools</groupId>
-			<artifactId>blockhound-junit-platform</artifactId>
-			<version>${blockhound-junit}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.skyscreamer</groupId>
 			<artifactId>jsonassert</artifactId>
@@ -263,8 +260,8 @@
 		</dependency>

 		<dependency>
-			<groupId>com.github.tomakehurst</groupId>
-			<artifactId>wiremock-jre8</artifactId>
+			<groupId>org.wiremock</groupId>
+			<artifactId>wiremock</artifactId>
 			<version>${wiremock}</version>
 			<scope>test</scope>
 			<exclusions>
@@ -443,25 +440,6 @@
 			</build>
 		</profile>

-		<profile>
-			<id>jdk13+</id>
-			<!-- on jDK13+, Blockhound needs this JVM flag set -->
-			<activation>
-				<jdk>[13,)</jdk>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<argLine>-XX:+AllowRedefinitionToAddDeleteMethods</argLine>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
 		<profile>
 			<id>antora-process-resources</id>
 			<build>
@@ -479,7 +457,7 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>io.spring.maven.antora</groupId>
+						<groupId>org.antora</groupId>
 						<artifactId>antora-maven-plugin</artifactId>
 					</plugin>
 				</plugins>
@@ -3,8 +3,7 @@
 # The purpose of this Antora playbook is to build the docs in the current branch.
 antora:
  extensions:
-    - '@antora/collector-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
      root_component_name: 'data-elasticsearch'
 site:
  title: Spring Data Elasticsearch
@@ -18,17 +17,16 @@ 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.2.x ]
+      branches: [ main, 3.4.x, 3.3.x ]
      start_path: src/main/antora
 asciidoc:
  attributes:
-    page-pagination: ''
    hide-uri-scheme: '@'
    tabs-sync-option: '@'
-    chomp: 'all'
  extensions:
    - '@asciidoctor/tabs'
    - '@springio/asciidoctor-extensions'
+    - '@springio/asciidoctor-extensions/javadoc-extension'
  sourcemap: true
 urls:
  latest_version_segment: ''
@@ -38,5 +36,5 @@ runtime:
    format: pretty
 ui:
  bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.3.5/ui-bundle.zip
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.16/ui-bundle.zip
    snapshot: true
@@ -10,3 +10,8 @@ ext:
        local: true
      scan:
        dir: target/classes/
+    - run:
+        command: ./mvnw package -Pdistribute
+        local: true
+      scan:
+        dir: target/antora
@@ -9,6 +9,9 @@
 *** xref:migration-guides/migration-guide-4.4-5.0.adoc[]
 *** xref:migration-guides/migration-guide-5.0-5.1.adoc[]
 *** 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[]
@@ -39,4 +42,5 @@
 ** xref:repositories/query-keywords-reference.adoc[]
 ** xref:repositories/query-return-types-reference.adoc[]

-* https://github.com/spring-projects/spring-data-commons/wiki[Wiki]
+* xref:attachment$api/java/index.html[Javadoc,role=link-external,window=_blank]
+* https://github.com/spring-projects/spring-data-commons/wiki[Wiki,role=link-external,window=_blank]
@@ -31,7 +31,7 @@ public class MyClientConfig extends ElasticsearchConfiguration {
 <.> for a detailed description of the builder methods see xref:elasticsearch/clients.adoc#elasticsearch.clients.configuration[Client Configuration]
 ====

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


 The following beans can then be injected in other Spring components:
@@ -52,13 +52,13 @@ RestClient restClient;                   <.>
 JsonpMapper jsonpMapper;                 <.>
 ----

-<.> an implementation of `ElasticsearchOperations`
+<.> an implementation of javadoc:org.springframework.data.elasticsearch.core.ElasticsearchOperations[]
 <.> the `co.elastic.clients.elasticsearch.ElasticsearchClient` that is used.
 <.> the low level `RestClient` from the Elasticsearch libraries
 <.> the `JsonpMapper` user by the Elasticsearch `Transport`
 ====

-Basically one should just use the `ElasticsearchOperations` to interact with the Elasticsearch cluster.
+Basically one should just use the javadoc:org.springframework.data.elasticsearch.core.ElasticsearchOperations[] to interact with the Elasticsearch cluster.
 When using repositories, this instance is used under the hood as well.

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

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

 The following beans can then be injected in other Spring components:

@@ -108,20 +108,20 @@ JsonpMapper jsonpMapper;                         <.>

 the following can be injected:

-<.> an implementation of `ReactiveElasticsearchOperations`
+<.> an implementation of javadoc:org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations[]
 <.> the `org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchClient` that is used.
 This is a reactive implementation based on the Elasticsearch client implementation.
 <.> the low level `RestClient` from the Elasticsearch libraries
 <.> the `JsonpMapper` user by the Elasticsearch `Transport`
 ====

-Basically one should just use the `ReactiveElasticsearchOperations` to interact with the Elasticsearch cluster.
+Basically one should just use the javadoc:org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations[] to interact with the Elasticsearch cluster.
 When using repositories, this instance is used under the hood as well.

 [[elasticsearch.clients.configuration]]
 == Client Configuration

-Client behaviour can be changed via the `ClientConfiguration` that allows to set options for SSL, connect and socket timeouts, headers and other parameters.
+Client behaviour can be changed via the javadoc:org.springframework.data.elasticsearch.client.ClientConfiguration[] that allows to set options for SSL, connect and socket timeouts, headers and other parameters.

 .Client Configuration
 ====
@@ -178,7 +178,7 @@ If this is used in the reactive setup, the supplier function *must not* block!
 [[elasticsearch.clients.configuration.callbacks]]
 === Client configuration callbacks

-The `ClientConfiguration` class offers the most common parameters to configure the client.
+The javadoc:org.springframework.data.elasticsearch.client.ClientConfiguration[] class offers the most common parameters to configure the client.
 In the case this is not enough, the user can add callback functions by using the `withClientConfigurer(ClientConfigurationCallback<?>)` method.

 The following callbacks are provided:
@@ -1,6 +1,21 @@
 [[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-0]]
+== New in Spring Data Elasticsearch 5.4
+
+* Upgrade to Elasticsearch 8.15.3.
+* Allow to customize the mapped type name for `@InnerField` and `@Field` annotations.
+* Support for Elasticsearch SQL.
+* Add support for retrieving request executionDuration.
+
 [[new-features.5-3-0]]
 == New in Spring Data Elasticsearch 5.3

@@ -365,6 +365,8 @@ 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.

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

 For the definition of the order path and the nested paths, the Java entity property names should be used.
-
@@ -10,7 +10,9 @@ 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 @Query 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 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] ).

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

 [[elasticsearch.query-methods.at-query]]
-== Using @Query Annotation
+== Using the @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> {
@@ -341,15 +345,20 @@ 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]
 ----
 {
@@ -367,8 +376,7 @@ would make an https://www.elastic.co/guide/en/elasticsearch/reference/current/qu

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

 [source,java]
 ----
@@ -411,6 +419,7 @@ 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) {
@@ -444,7 +453,9 @@ We can pass `new QueryParameter("John")` as the parameter now, and it will produ

 .accessing bean property.
 ====
-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:
+{spring-framework-docs}/core/expressions/language-ref/bean-references.html[Bean property] is also supported to access.
+Given that there is a bean named `queryParameter` of type `QueryParameter`, we can access the bean with symbol `@` rather than `#`, and there is no need to declare a parameter of type `QueryParameter` in the query method:
+
 [source,java]
 ----
 interface BookRepository extends ElasticsearchRepository<Book, String> {
@@ -493,6 +504,7 @@ 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]
 ----
 {
@@ -511,7 +523,7 @@ A collection of `names` like `List.of("name1", "name2")` will produce the follow

 .access property in the `Collection` param.
 ====
-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`:
+{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`:

 [source,java]
 ----
@@ -532,6 +544,7 @@ 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.
 ====

@@ -560,3 +573,20 @@ 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.
@@ -3,10 +3,10 @@

 Spring Data Elasticsearch uses several interfaces to define the operations that can be called against an Elasticsearch index (for a description of the reactive interfaces see xref:elasticsearch/reactive-template.adoc[]).

-* `IndexOperations` defines actions on index level like creating or deleting an index.
-* `DocumentOperations` defines actions to store, update and retrieve entities based on their id.
-* `SearchOperations` define the actions to search for multiple entities using queries
-* `ElasticsearchOperations` combines the `DocumentOperations` and `SearchOperations` interfaces.
+* javadoc:org.springframework.data.elasticsearch.core.IndexOperations[] defines actions on index level like creating or deleting an index.
+* javadoc:org.springframework.data.elasticsearch.core.DocumentOperations[] defines actions to store, update and retrieve entities based on their id.
+* javadoc:org.springframework.data.elasticsearch.core.SearchOperations[] define the actions to search for multiple entities using queries
+* javadoc:org.springframework.data.elasticsearch.core.ElasticsearchOperations[] combines the `DocumentOperations` and `SearchOperations` interfaces.

 These interfaces correspond to the structuring of the https://www.elastic.co/guide/en/elasticsearch/reference/current/rest-apis.html[Elasticsearch API].

@@ -81,7 +81,7 @@ When a document is retrieved with the methods of the  `DocumentOperations` inter
 When searching with the methods of the `SearchOperations` interface, additional information is available for each entity, for example the _score_ or the _sortValues_ of the found entity.

 In order to return this information, each entity is wrapped in a `SearchHit` object that contains this entity-specific additional information.
-These `SearchHit` objects themselves are returned within a `SearchHits` object which additionally contains informations about the whole search like the _maxScore_ or requested aggregations.
+These `SearchHit` objects themselves are returned within a `SearchHits` object which additionally contains informations about the whole search like the _maxScore_ or requested aggregations or the execution duration it took to complete the request.
 The following classes and interfaces are now available:

 .SearchHit<T>
@@ -6,10 +6,12 @@ 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
-| 2024.0 (?) | 5.3.x | 8.13.2 | ?
-| 2023.1 (Vaughan) | 5.2.x | 8.11.1 | 6.1.x
-| 2023.0 (Ullmann) | 5.1.x | 8.7.1 | 6.0.x
-| 2022.0 (Turing) | 5.0.xfootnote:oom[Out of maintenance] | 8.5.3 | 6.0.x
+| 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
+| 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
 | 2021.1 (Q) | 4.3.xfootnote:oom[] | 7.15.2 | 5.3.x
 | 2021.0 (Pascal) | 4.2.xfootnote:oom[] | 7.12.0 | 5.3.x
@@ -6,10 +6,16 @@ This section describes breaking changes from version 5.2.x to 5.3.x and how remo
 [[elasticsearch-migration-guide-5.2-5.3.breaking-changes]]
 == Breaking Changes

+During the parameter replacement in `@Query` annotated repository methods previous versions wrote the String `"null"` into the query that was sent to Elasticsearch when the actual parameter value was `null`.
+As Elasticsearch does not store `null` values, this behaviour could lead to problems, for example whent the fields to be searched contains the string `"null"`.
+In Version 5.3 a `null` value in a parameter will cause a `ConversionException` to be thrown.
+If you are using `"null"` as the
+`null_value` defined in a field mapping, then pass that string into the query instead of a Java `null`.

 [[elasticsearch-migration-guide-5.2-5.3.deprecations]]
 == Deprecations

 === Removals
+
 The deprecated classes `org.springframework.data.elasticsearch.ELCQueries`
- and `org.springframework.data.elasticsearch.client.elc.QueryBuilders` have been removed, use `org.springframework.data.elasticsearch.client.elc.Queries` instead.
+and `org.springframework.data.elasticsearch.client.elc.QueryBuilders` have been removed, use `org.springframework.data.elasticsearch.client.elc.Queries` instead.
@@ -0,0 +1,23 @@
+[[elasticsearch-migration-guide-5.3-5.4]]
+= Upgrading from 5.3.x to 5.4.x
+
+This section describes breaking changes from version 5.3.x to 5.4.x and how removed features can be replaced by new introduced features.
+
+[[elasticsearch-migration-guide-5.3-5.4.breaking-changes]]
+== Breaking Changes
+
+[[elasticsearch-migration-guide-5.3-5.4.breaking-changes.knn-search]]
+=== knn search
+The `withKnnQuery` method in `NativeQueryBuilder` has been replaced with `withKnnSearches` to build a `NativeQuery` with knn search.
+
+`KnnQuery` and `KnnSearch` are two different classes in elasticsearch java client and are used for different queries, with different parameters supported:
+
+- `KnnSearch`: is https://www.elastic.co/guide/en/elasticsearch/reference/8.13/search-search.html#search-api-knn[the top level `knn` query] in the elasticsearch request;
+- `KnnQuery`: is https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-knn-query.html[the `knn` query inside `query` clause];
+
+If `KnnQuery` is still preferable, please be sure to construct it inside `query` clause manually, by means of `withQuery(co.elastic.clients.elasticsearch._types.query_dsl.Query query)` clause in `NativeQueryBuilder`.
+
+[[elasticsearch-migration-guide-5.3-5.4.deprecations]]
+== Deprecations
+
+=== Removals
@@ -0,0 +1,30 @@
+[[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)
+```
@@ -3,19 +3,20 @@ prerelease: ${antora-component.prerelease}

 asciidoc:
  attributes:
-    copyright-year: ${current.year}
-    version: ${project.version}
-    springversionshort: ${spring.short}
-    springversion: ${spring}
    attribute-missing: 'warn'
-    commons: ${springdata.commons.docs}
+    chomp: 'all'
+    version: '${project.version}'
+    copyright-year: '${current.year}'
+    springversionshort: '${spring.short}'
+    springversion: '${spring}'
+    commons: '${springdata.commons.docs}'
    include-xml-namespaces: false
-    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-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-framework-docs: '{springdocsurl}'
+    springjavadocurl: '${documentation.spring-javadoc-url}'
    spring-framework-javadoc: '{springjavadocurl}'
-    springhateoasversion: ${spring-hateoas}
-    releasetrainversion: ${releasetrain}
+    springhateoasversion: '${spring-hateoas}'
+    releasetrainversion: '${releasetrain}'
    store: Elasticsearch
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 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.
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ * 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 java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.core.annotation.AliasFor;
+
+/**
+ * Identifies an alias for the index.
+ *
+ * @author Youssef Aouichaoui
+ * @since 5.4
+ */
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE })
+@Repeatable(Aliases.class)
+public @interface Alias {
+	/**
+	 * @return Index alias name. Alias for {@link #alias}.
+	 */
+	@AliasFor("alias")
+	String value() default "";
+
+	/**
+	 * @return Index alias name. Alias for {@link #value}.
+	 */
+	@AliasFor("value")
+	String alias() default "";
+
+	/**
+	 * @return Query used to limit documents the alias can access.
+	 */
+	Filter filter() default @Filter;
+
+	/**
+	 * @return Used to route indexing operations to a specific shard.
+	 */
+	String indexRouting() default "";
+
+	/**
+	 * @return Used to route indexing and search operations to a specific shard.
+	 */
+	String routing() default "";
+
+	/**
+	 * @return Used to route search operations to a specific shard.
+	 */
+	String searchRouting() default "";
+
+	/**
+	 * @return Is the alias hidden?
+	 */
+	boolean isHidden() default false;
+
+	/**
+	 * @return Is it the 'write index' for the alias?
+	 */
+	boolean isWriteIndex() default false;
+}
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ * 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 java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Container annotation that aggregates several {@link Alias} annotations.
+ *
+ * @author Youssef Aouichaoui
+ * @see Alias
+ * @since 5.4
+ */
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE })
+public @interface Aliases {
+	Alias[] value();
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 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.
@@ -100,6 +100,13 @@ public @interface Document {
 	 */
 	boolean storeVersionInSource() default true;

+	/**
+	 * Aliases for the index.
+	 *
+	 * @since 5.4
+	 */
+	Alias[] aliases() default {};
+
 	/**
 	 * @since 4.3
 	 */
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 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.
@@ -37,6 +37,8 @@ import org.springframework.core.annotation.AliasFor;
 * @author Brian Kimmig
 * @author Morgan Lutz
 * @author Sascha Woo
+ * @author Haibo Liu
+ * @author Andriy Redko
 */
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE, ElementType.METHOD })
@@ -128,6 +130,10 @@ public @interface Field {
 	boolean norms() default true;

 	/**
+	 * NOte that null_value setting are not supported in Elasticsearch for all types. For example setting a null_value on
+	 * a field with type text will throw an exception in the server when the mapping is written to Elasticsearch. Alas,
+	 * the Elasticsearch documentation does not specify on which types it is allowed on which it is not.
+	 *
 	 * @since 4.0
 	 */
 	String nullValue() default "";
@@ -195,6 +201,27 @@ public @interface Field {
 	 */
 	int dims() default -1;

+	/**
+	 * to be used in combination with {@link FieldType#Dense_Vector}
+	 *
+	 * @since 5.4
+	 */
+	String elementType() default FieldElementType.DEFAULT;
+
+	/**
+	 * to be used in combination with {@link FieldType#Dense_Vector}
+	 *
+	 * @since 5.4
+	 */
+	KnnSimilarity knnSimilarity() default KnnSimilarity.DEFAULT;
+
+	/**
+	 * to be used in combination with {@link FieldType#Dense_Vector}
+	 *
+	 * @since 5.4
+	 */
+	KnnIndexOptions[] knnIndexOptions() default {};
+
 	/**
 	 * Controls how Elasticsearch dynamically adds fields to the inner object within the document.<br>
 	 * To be used in combination with {@link FieldType#Object} or {@link FieldType#Nested}
@@ -218,4 +245,11 @@ public @interface Field {
 	 * @since 5.1
 	 */
 	boolean storeEmptyValue() default true;
+
+	/**
+	 * overrides the field type in the mapping which otherwise will be taken from corresponding {@link FieldType}
+	 *
+	 * @since 5.4
+	 */
+	String mappedTypeName() default "";
 }
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ * 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;
+
+/**
+ * @author Haibo Liu
+ * @since 5.4
+ */
+public final class FieldElementType {
+	public final static String DEFAULT = "";
+	public final static String FLOAT = "float";
+	public final static String BYTE = "byte";
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 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.
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ * 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.core.annotation.AliasFor;
+
+/**
+ * Query used to limit documents.
+ *
+ * @author Youssef Aouichaoui
+ * @since 5.4
+ */
+public @interface Filter {
+	/**
+	 * @return Query used to limit documents. Alias for {@link #query}.
+	 */
+	@AliasFor("query")
+	String value() default "";
+
+	/**
+	 * @return Query used to limit documents. Alias for {@link #value}.
+	 */
+	@AliasFor("value")
+	String query() default "";
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 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.
@@ -29,6 +29,8 @@ import java.lang.annotation.Target;
 * @author Aleksei Arsenev
 * @author Brian Kimmig
 * @author Morgan Lutz
+ * @author Haibo Liu
+ * @author Andriy Redko
 */
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.ANNOTATION_TYPE)
@@ -149,4 +151,32 @@ public @interface InnerField {
 	 * @since 4.2
 	 */
 	int dims() default -1;
+
+	/**
+	 * to be used in combination with {@link FieldType#Dense_Vector}
+	 *
+	 * @since 5.4
+	 */
+	String elementType() default FieldElementType.DEFAULT;
+
+	/**
+	 * to be used in combination with {@link FieldType#Dense_Vector}
+	 *
+	 * @since 5.4
+	 */
+	KnnSimilarity knnSimilarity() default KnnSimilarity.DEFAULT;
+
+	/**
+	 * to be used in combination with {@link FieldType#Dense_Vector}
+	 *
+	 * @since 5.4
+	 */
+	KnnIndexOptions[] knnIndexOptions() default {};
+
+	/**
+	 * overrides the field type in the mapping which otherwise will be taken from corresponding {@link FieldType}
+	 *
+	 * @since 5.4
+	 */
+	String mappedTypeName() default "";
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 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.
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ * 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;
+
+/**
+ * @author Haibo Liu
+ * @since 5.4
+ */
+public enum KnnAlgorithmType {
+	HNSW("hnsw"),
+	INT8_HNSW("int8_hnsw"),
+	FLAT("flat"),
+	INT8_FLAT("int8_flat"),
+	DEFAULT("");
+
+	private final String type;
+
+	KnnAlgorithmType(String type) {
+		this.type = type;
+	}
+
+	public String getType() {
+		return type;
+	}
+}
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ * 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;
+
+/**
+ * @author Haibo Liu
+ * @since 5.4
+ */
+public @interface KnnIndexOptions {
+
+	KnnAlgorithmType type() default KnnAlgorithmType.DEFAULT;
+
+	/**
+	 * Only applicable to {@link KnnAlgorithmType#HNSW} and {@link KnnAlgorithmType#INT8_HNSW} index types.
+	 */
+	int m() default -1;
+
+	/**
+	 * Only applicable to {@link KnnAlgorithmType#HNSW} and {@link KnnAlgorithmType#INT8_HNSW} index types.
+	 */
+	int efConstruction() default -1;
+
+	/**
+	 * Only applicable to {@link KnnAlgorithmType#INT8_HNSW} and {@link KnnAlgorithmType#INT8_FLAT} index types.
+	 */
+	float confidenceInterval() default -1F;
+}
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ * 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;
+
+/**
+ * @author Haibo Liu
+ * @since 5.4
+ */
+public enum KnnSimilarity {
+	L2_NORM("l2_norm"),
+	DOT_PRODUCT("dot_product"),
+	COSINE("cosine"),
+	MAX_INNER_PRODUCT("max_inner_product"),
+	DEFAULT("");
+
+	private final String similarity;
+
+	KnnSimilarity(String similarity) {
+		this.similarity = similarity;
+	}
+
+	public String getSimilarity() {
+		return similarity;
+	}
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 the original author or authors.
+ * Copyright 2024-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 the original author or authors.
+ * Copyright 2020-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 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.
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+import org.springframework.data.annotation.QueryAnnotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to mark a repository method as a search template method. The annotation defines the search template id,
+ * the parameters for the search template are taken from the method's arguments.
+ *
+ * @author P.J. Meisch (pj.meisch@sothawo.com)
+ * @since 5.5
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
+@Documented
+@QueryAnnotation
+public @interface SearchTemplateQuery {
+    /**
+     * The id of the search template. Must not be empt or null.
+     */
+    String id();
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 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.
@@ -41,7 +41,7 @@ public @interface ValueConverter {
 	 * Defines the class implementing the {@link PropertyValueConverter} interface. If this is a normal class, it must
 	 * provide a default constructor with no arguments. If this is an enum and thus implementing a singleton by enum it
 	 * must only have one enum value.
-	 * 
+	 *
 	 * @return the class to use for conversion
 	 */
 	Class<? extends PropertyValueConverter> value();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 the original author or authors.
+ * Copyright 2024-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 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,6 +18,8 @@ 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;

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

 	@Override
-	public void close() throws Exception {
-		transport.close();
+	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();
 	}
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 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.
@@ -127,7 +127,7 @@ class CriteriaQueryProcessor extends AbstractQueryProcessor {
 			mustQueries.add(Query.of(qb -> qb.matchAll(m -> m)));
 		}

-        return new Query.Builder().bool(boolQueryBuilder -> {
+		return new Query.Builder().bool(boolQueryBuilder -> {

 			if (!shouldQueries.isEmpty()) {
 				boolQueryBuilder.should(shouldQueries);
@@ -249,49 +249,54 @@ class CriteriaQueryProcessor extends AbstractQueryProcessor {
 				queryBuilder.queryString(queryStringQuery(fieldName, Objects.requireNonNull(value).toString(), boost));
 				break;
 			case LESS:
-				queryBuilder //
-						.range(rb -> rb //
-								.field(fieldName) //
-								.lt(JsonData.of(value)) //
-								.boost(boost)); //
+				queryBuilder
+						.range(rb -> rb
+								.untyped(ut -> ut
+										.field(fieldName)
+										.lt(JsonData.of(value))
+										.boost(boost)));
 				break;
 			case LESS_EQUAL:
-				queryBuilder //
-						.range(rb -> rb //
-								.field(fieldName) //
-								.lte(JsonData.of(value)) //
-								.boost(boost)); //
+				queryBuilder
+						.range(rb -> rb
+								.untyped(ut -> ut
+										.field(fieldName)
+										.lte(JsonData.of(value))
+										.boost(boost)));
 				break;
 			case GREATER:
-				queryBuilder //
-						.range(rb -> rb //
-								.field(fieldName) //
-								.gt(JsonData.of(value)) //
-								.boost(boost)); //
+				queryBuilder
+						.range(rb -> rb
+								.untyped(ut -> ut
+										.field(fieldName)
+										.gt(JsonData.of(value))
+										.boost(boost)));
 				break;
 			case GREATER_EQUAL:
-				queryBuilder //
-						.range(rb -> rb //
-								.field(fieldName) //
-								.gte(JsonData.of(value)) //
-								.boost(boost)); //
+				queryBuilder
+						.range(rb -> rb
+								.untyped(ut -> ut
+										.field(fieldName)
+										.gte(JsonData.of(value))
+										.boost(boost)));
 				break;
 			case BETWEEN:
 				Object[] ranges = (Object[]) value;
 				Assert.notNull(value, "value for a between condition must not be null");
-				queryBuilder //
-						.range(rb -> {
-							rb.field(fieldName);
-							if (ranges[0] != null) {
-								rb.gte(JsonData.of(ranges[0]));
-							}
+				queryBuilder
+						.range(rb -> rb
+								.untyped(ut -> {
+									ut.field(fieldName);
+									if (ranges[0] != null) {
+										ut.gte(JsonData.of(ranges[0]));
+									}

-							if (ranges[1] != null) {
-								rb.lte(JsonData.of(ranges[1]));
-							}
-							rb.boost(boost); //
-							return rb;
-						}); //
+									if (ranges[1] != null) {
+										ut.lte(JsonData.of(ranges[1]));
+									}
+									ut.boost(boost); //
+									return ut;
+								}));

 				break;
 			case FUZZY:
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 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.
@@ -50,6 +50,7 @@ import org.springframework.util.Assert;
 *
 * @author Peter-Josef Meisch
 * @author Haibo Liu
+ * @author Mohamed El Harrougui
 * @since 4.4
 */
 final class DocumentAdapters {
@@ -74,7 +75,7 @@ final class DocumentAdapters {
 		Map<String, SearchDocumentResponse> innerHits = new LinkedHashMap<>();
 		hit.innerHits().forEach((name, innerHitsResult) -> {
 			// noinspection ReturnOfNull
-			innerHits.put(name, SearchDocumentResponseBuilder.from(innerHitsResult.hits(), null, null, null, null, null,
+			innerHits.put(name, SearchDocumentResponseBuilder.from(innerHitsResult.hits(), null, null, null, 0, null, null,
 					searchDocument -> null, jsonpMapper));
 		});

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 the original author or authors.
+ * Copyright 2021-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-2025 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 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).toBuilder();
+				: new RestClientOptions(RequestOptions.DEFAULT, false).toBuilder();

 		RestClientOptions.Builder restClientOptionsBuilder = getRestClientOptionsBuilder(transportOptions);

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 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);
+		return new RestClientOptions(RequestOptions.DEFAULT, false);
 	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mark Paluch	3e2b114c5d	Release version 5.5.6 (2025.0.6). See #3185	2025-11-14 11:30:08 +01:00
Mark Paluch	6662e29aa5	Prepare 5.5.6 (2025.0.6). See #3185	2025-11-14 11:29:46 +01:00
Mark Paluch	0b9cfca28f	Update Update security documentation. See #3185	2025-11-14 10:43:24 +01:00
Christoph Strobl	f985e1efe5	After release cleanups. See #3170	2025-10-17 11:39:06 +02:00
Christoph Strobl	8f6fca5b43	Prepare next development iteration. See #3170	2025-10-17 11:39:05 +02:00
Christoph Strobl	0471b54d3b	Release version 5.5.5 (2025.0.5). See #3170	2025-10-17 11:34:13 +02:00
Christoph Strobl	1302c14920	Prepare 5.5.5 (2025.0.5). See #3170	2025-10-17 11:33:06 +02:00
Peter-Josef Meisch	66894a5b0e	Upgrade to Elasticsearch 8.18.8. Original Pull Request #3183 Closes #3181 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-10-17 00:09:34 +02:00
Peter-Josef Meisch	00c99852fa	Fix string comparison in TypeUtils. Original Pull Request #3177 Closes #3176 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `0e1a97a27a`)	2025-10-03 10:51:43 +02:00
Mark Paluch	4152378d32	Update GitHub Actions. See #3170	2025-09-23 10:51:47 +02:00
Peter-Josef Meisch	3fca4e8be3	Adjust test to slower performance of build machines in Jenkins Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `5529af8f76`)	2025-09-20 20:42:54 +02:00
Peter-Josef Meisch	91f3393abc	Speedup Criteria hashcode calculation Original Pull Request #3172 Closes #3083 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `c0dd082f4e`)	2025-09-20 19:52:33 +02:00
Christoph Strobl	eee009fc18	After release cleanups. See #3153	2025-09-12 11:45:34 +02:00
Christoph Strobl	e394464724	Prepare next development iteration. See #3153	2025-09-12 11:45:33 +02:00
Christoph Strobl	47815a69fb	Release version 5.5.4 (2025.0.4). See #3153	2025-09-12 11:41:39 +02:00
Christoph Strobl	01ca42fd2e	Prepare 5.5.4 (2025.0.4). See #3153	2025-09-12 11:41:09 +02:00
Mark Paluch	604c88b6a4	Polishing. Update project metadata, add PJ as project lead (long overdue). See #3154	2025-09-12 11:39:50 +02:00
Peter-Josef Meisch	ed05313b17	Upgrade to Elasticsearch 8.18.6. Original Pull Request #3164 Closes #3160 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-08-31 17:05:14 +02:00
Mark Paluch	822843a93a	Refine version properties for documentation build. See spring-projects/spring-data-build#2638	2025-08-18 09:16:40 +02:00
Mark Paluch	7f7731acdc	After release cleanups. See #3134	2025-08-15 10:04:17 +02:00
Mark Paluch	a0ee571cc7	Prepare next development iteration. See #3134	2025-08-15 10:04:16 +02:00
Mark Paluch	5bbccbf9d0	Release version 5.5.3 (2025.0.3). See #3134	2025-08-15 10:01:35 +02:00
Mark Paluch	19af94f87e	Prepare 5.5.3 (2025.0.3). See #3134	2025-08-15 10:01:14 +02:00
Mark Paluch	71a3e24096	Polishing. Use documentation variables for references, reorder antora keys. See #3135	2025-08-14 17:28:01 +02:00
Peter-Josef Meisch	23eacd4d4b	Upgrade to Elasticsearch 8.18.5. Original Pull Request #3151 Closes #3149 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-08-12 18:39:04 +02:00
Mark Paluch	56bda34666	After release cleanups. See #3120	2025-07-18 10:30:34 +02:00
Mark Paluch	76ba2324a2	Prepare next development iteration. See #3120	2025-07-18 10:30:33 +02:00
Mark Paluch	4c217fa9c4	Release version 5.5.2 (2025.0.2). See #3120	2025-07-18 10:27:59 +02:00
Mark Paluch	003213d4b0	Prepare 5.5.2 (2025.0.2). See #3120	2025-07-18 10:27:38 +02:00
Mark Paluch	85d52014dc	Upgrade to Maven Wrapper 3.9.11. See #3131	2025-07-17 14:00:55 +02:00
Peter-Josef Meisch	786e0928ed	Fix the calculation of the requested number of documents. Original Pull Request #3128 Closes #3127 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com> (cherry picked from commit `12ddb74fae`)	2025-07-15 18:41:17 +02:00
Mark Paluch	ef6f091d6b	After release cleanups. See #3114	2025-06-13 13:42:19 +02:00
Mark Paluch	9ff829a829	Prepare next development iteration. See #3114	2025-06-13 13:42:18 +02:00
Mark Paluch	30f32b6bbe	Release version 5.5.1 (2025.0.1). See #3114	2025-06-13 13:39:35 +02:00
Mark Paluch	8ce113a083	Prepare 5.5.1 (2025.0.1). See #3114	2025-06-13 13:39:14 +02:00
Mark Paluch	262781c0a0	After release cleanups. See #3096	2025-05-16 11:31:36 +02:00
Mark Paluch	ffe8293365	Prepare next development iteration. See #3096	2025-05-16 11:31:35 +02:00
Mark Paluch	62a34cf09c	Release version 5.5 GA (2025.0.0). See #3096	2025-05-16 11:28:31 +02:00
Mark Paluch	cc5f149c5a	Prepare 5.5 GA (2025.0.0). See #3096	2025-05-16 11:28:10 +02:00
Peter-Josef Meisch	0728c8e4aa	Update versions doc for the next release Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-05-15 17:39:17 +02:00
Peter-Josef Meisch	ebbe242a72	Fix missing return value in ByQueryResponse. Original Pull Request #3109 Closes #3108 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-05-14 13:53:58 +02:00
Mark Paluch	0ce9a1c400	Update CI Properties. See #3096	2025-05-12 09:33:06 +02:00
Mark Paluch	22763d17a7	Update CI Properties. See #3096	2025-05-12 09:00:23 +02:00
Mark Paluch	9870de1e77	Update CI Properties. See #3096	2025-05-12 08:56:22 +02:00
Mark Paluch	8c9d9ae1e7	Update CI Properties. See #3096	2025-05-12 08:55:54 +02:00
Peter-Josef Meisch	945179e4eb	Fix handling of page size and max results in search request preparation. Original Pull Request #3106 Closes #3089 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-05-10 21:21:17 +02:00
Peter-Josef Meisch	ea38ef1d41	Upgrade Elasticsearch libraries to 8.18.1. Original Pull Request #3105 Closes #3103 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-05-09 20:35:30 +02:00
Mark Paluch	acbfba94ac	Exclude `commons-logging` dependency. `elasticsearch-rest-client` pulls in `commons-logging` and we don't want that to happen as it conflicts with our dependency setup. Closes #3104	2025-05-09 12:10:07 +02:00
Peter-Josef Meisch	5a0f556a3b	Upgrade Elasticsearch dependencies to 8.18.0 Original Pull request #3101 Adjust to changes in Elasticsearch. Closes #3100 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-05-02 10:21:24 +02:00
Peter-Josef Meisch	a07ac3c93d	Fix code not terminating on repository saving an empty flux. Original Pull Request #3099 Closes: #3039 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-04-26 10:40:31 +02:00
Mark Paluch	9d025dd469	After release cleanups. See #3079	2025-04-22 11:41:58 +02:00
Mark Paluch	925921f174	Prepare next development iteration. See #3079	2025-04-22 11:41:58 +02:00
Mark Paluch	2f0a259045	Release version 5.5 RC1 (2025.0.0). See #3079	2025-04-22 11:41:58 +02:00
Mark Paluch	9ffcb092db	Prepare 5.5 RC1 (2025.0.0). See #3079	2025-04-22 11:41:58 +02:00
Peter-Josef Meisch	0e5af90581	Fix implementation of equlas/hashcode for Criteria class. Original Pull Request: #3088 Closes: #3083 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-04-05 20:44:01 +02:00
Peter-Josef Meisch	95059b3282	Upgrade to Elasticsearch 8.17.4. Original Pull Request: #3085 Closes #3084 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-03-31 16:36:42 +02:00
Peter-Josef Meisch	1ae6301c2f	Fix cutting of unknown properties in property paths for search. Original Pull Request #3082 Closes #3081 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-03-24 21:44:53 +01:00
Peter-Josef Meisch	2366f67bba	Enable scripted fields and runtime fields of collection type. Original Pull Request #3080 Closes #3076 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-03-18 20:24:02 +01:00
Mark Paluch	6f424318ec	After release cleanups. See #3058	2025-03-14 09:33:43 +01:00
Mark Paluch	300fe2ac8b	Prepare next development iteration. See #3058	2025-03-14 09:33:42 +01:00
Mark Paluch	1fdee7399f	Release version 5.5 M2 (2025.0.0). See #3058	2025-03-14 09:31:05 +01:00
Mark Paluch	ace17b9751	Prepare 5.5 M2 (2025.0.0). See #3058	2025-03-14 09:30:46 +01:00
Peter-Josef Meisch	42383624ea	Fix mapping of property names in sort parameters. Original Pull Request #3074 Closes #3072 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-03-09 12:31:59 +01:00
Hope Kim	35e7b45f1a	Fix syntax errors in link formatting in adoc files. Original Pull Request: #3070 Closes #3071 Signed-off-by: esperar <s22043@gsm.hs.kr>	2025-03-04 19:25:25 +01:00
Volodymyr	89f60f2356	Fix typo. Original Pull Request #3069 Closes: #3068 Signed-off-by: Dgray16 <vova235@gmail.com>	2025-03-02 09:45:59 +01:00
Peter-Josef Meisch	fa979249fc	Remove deprecated methods. Original Pull Request #3067 Closes #3066 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-02-23 12:37:26 +01:00
정보교 (Bogus Jung)	8b43af2d33	optimize capacity & add assert messages in GeoJson. Original Pull Request #3064 Closes #3063 Signed-off-by: 정보교 (Bogus Jung) <bogusjung0317@gmail.com>	2025-02-21 14:24:58 +01:00
Peter-Josef Meisch	64f88ae9ac	Add testcontainers-local.properties handling. Original Pull Request #3062 Closes #3061 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-02-19 20:14:16 +01:00
Mark Paluch	15f086359d	After release cleanups. See #3005	2025-02-14 12:25:09 +01:00
Mark Paluch	78ea67b6a6	Prepare next development iteration. See #3005	2025-02-14 12:25:08 +01:00
Mark Paluch	6d0825b121	Release version 5.5 M1 (2025.0.0). See #3005	2025-02-14 12:22:37 +01:00
Mark Paluch	846344891d	Prepare 5.5 M1 (2025.0.0). See #3005	2025-02-14 12:22:19 +01:00
Peter-Josef Meisch	f9f64e6b39	Upgrade to Elasticsearch 8.17.2. Closes #3054 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-02-12 07:54:06 +01:00
Mark Paluch	7fe4d8e1a4	Update CI Properties. See #3005	2025-02-11 15:23:14 +01:00
Peter-Josef Meisch	bd87dae1a3	Upgrade to Elasticsearch 8.17.1. Original Pull Request #3053 Closes #3052 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-02-11 12:47:00 +01:00
Peter-Josef Meisch	ea62cf0abd	Adopt to deprecation removals in Commons. Original Pull Request #3051 Closes #3050 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-02-09 20:20:01 +01:00
Peter-Josef Meisch	cb77b328ae	Add repository method support for search templates. Original Pull Request #3049 Closes #2997 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-02-08 12:17:42 +01:00
Peter-Josef Meisch	5568c7bbc4	Add IndexQuery.builder() method. Original Pull Request: #3041 Closes #3030 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>	2025-01-11 13:21:55 +01:00
Peter-Josef Meisch	03591326d7	Update copyright comment to 2025. Original Pull Request #3031 Closes #3030	2025-01-02 19:12:45 +01:00
Peter-Josef Meisch	a94b74c877	Upgrade to Elasticsearch 8.17.0. (#3027 ) Closes #3026	2024-12-15 19:16:38 +01:00
Alfonso	944e7e81dd	fix: use scripted field name to populate entity. Original Pull Request: #3023 Closes: #3022	2024-12-14 18:04:06 +01:00
Peter-Josef Meisch	5f297f1dc3	Upgrade to Elasticsearch 8.16.1. Original Pull Request #3019 Closes #3017	2024-12-01 13:49:43 +01:00
Peter-Josef Meisch	028239fbdb	Add optional fetchSource flag to the SourceFilter. Original Pull Request #3014 Closes #3009	2024-11-28 15:37:19 +01:00
Peter-Josef Meisch	01d2d24916	Update versions documentation. Original Pull Request #3013 Closes #3012	2024-11-24 10:43:11 +01:00
Mark Paluch	4f159d5de5	After release cleanups. See #2990	2024-11-15 14:13:09 +01:00
Mark Paluch	00f13ac3e9	Prepare next development iteration. See #2990	2024-11-15 14:13:08 +01:00
Mark Paluch	6f3941b43b	Release version 5.4 GA (2024.1.0). See #2990	2024-11-15 14:10:52 +01:00
Mark Paluch	bfd3c35d93	Prepare 5.4 GA (2024.1.0). See #2990	2024-11-15 14:10:37 +01:00
Mark Paluch	f5b29cb524	Update CI Properties. See #2990	2024-11-15 10:39:50 +01:00
Peter-Josef Meisch	7f5bfffc34	fix geohash conversion Original Pull Request #3002 Closes #3001	2024-11-08 18:55:15 +01:00
Mark Paluch	61176940cb	Upgrade to Maven Wrapper 3.9.9. See #2998	2024-11-07 09:47:28 +01:00
Peter-Josef Meisch	24618ecfbe	Upgrade dependency to elasticsearch 8.15.3. Original Pull Request #2994 Closes #2993	2024-10-29 11:37:38 +01:00
Peter-Josef Meisch	3e2c67a39f	Update elasticsearch-new.adoc	2024-10-22 06:13:44 +02:00
El-Harrougui MOHAMED	d2ab03e6a4	Add support for retrieving request executionDuration. Original Pull Request #2991 Closes #2986	2024-10-22 06:11:57 +02:00
Mark Paluch	172933af8e	After release cleanups. See #2982	2024-10-18 12:49:41 +02:00
Mark Paluch	378dcabe19	Prepare next development iteration. See #2982	2024-10-18 12:49:40 +02:00
Mark Paluch	893c9cbf92	Release version 5.4 RC1 (2024.1.0). See #2982	2024-10-18 12:47:01 +02:00
Mark Paluch	3157c62198	Prepare 5.4 RC1 (2024.1.0). See #2982	2024-10-18 12:46:44 +02:00
Maryanto	fe8c2b13b0	Add count methods to ELC's ReactiveElasticsearchClient. Original Pull Request #2985 Closes #2749	2024-10-17 17:13:28 +02:00
Mark Paluch	98716a871b	Consistently run all CI steps with the same user. See #2982	2024-10-09 09:27:13 +02:00
Jens Schauder	d55947b81e	After release cleanups. See #2914	2024-09-13 12:42:28 +02:00
Jens Schauder	6cb5f92928	Prepare next development iteration. See #2914	2024-09-13 12:42:27 +02:00
Jens Schauder	b4ab1f28cd	Release version 5.4 M1 (2024.1.0). See #2914	2024-09-13 12:39:33 +02:00
Jens Schauder	aab66c9595	Prepare 5.4 M1 (2024.1.0). See #2914	2024-09-13 12:39:15 +02:00
Peter-Josef Meisch	d06c122fd5	Remove Blockhound Original Pull Request #2978 Closes #2977	2024-09-04 18:10:20 +02:00
HAN SEUNGWOO	b1b232d354	Set refresh on DeleteByQueryRequest by DeleteQuery. Original Pull Request #2976 Closes #2973	2024-09-03 20:09:26 +02:00
Peter-Josef Meisch	555b570246	Add excludeFromSource handling to multifield. Original Pull Request #2975 Closes #2971	2024-08-31 21:18:35 +02:00
Peter-Josef Meisch	81eb167981	Upgrade to Elasticsearch 8.15.0. Ortiginal Pull Request #2974 Closes #2963	2024-08-30 21:31:07 +02:00
Peter-Josef Meisch	6ad98bf500	Polishing	2024-08-19 20:14:13 +02:00
Aouichaoui Youssef	9149c1bc2e	Allow for `null` and `empty` parameters in the MultiField annotation. Original Pull Request #2960 Closes #2952	2024-08-19 20:06:56 +02:00
Mark Paluch	d079a59cb4	Upgrade to Maven Wrapper 3.9.8. See #2958	2024-08-08 10:22:09 +02:00
Mark Paluch	7a7145e5b1	Update CI properties. See #2914	2024-08-08 10:20:12 +02:00
Peter-Josef Meisch	dbf932cb20	Polishing	2024-08-06 20:39:02 +02:00
Aouichaoui Youssef	738ee54a25	Support for SQL. Original Pull Request: #2949 Closes: #2683	2024-08-06 20:32:26 +02:00
Peter-Josef Meisch	03992ba722	Polishing	2024-08-06 18:15:57 +02:00
Andriy Redko	06de217ceb	Allow to customize the mapped type name for @InnerField and @Field annotations. Original Pull request: #2950 Closes #2942	2024-08-06 18:04:37 +02:00
Peter-Josef Meisch	eba8eec6c3	Upgrade to Elasticsearch 8.14.3. Original Pull Request #2953 Closes #2947	2024-08-04 11:46:04 +02:00
Eric Haag	3fc19bbe8c	Migrate build to Spring Develocity Conventions extension. * Migrate build to Spring Develocity Conventions extension. * Adopt Develocity environment variables. Closes #2944	2024-08-01 14:53:14 +02:00
Mark Paluch	8f8600727c	Bundle Javadoc with Antora documentation site. Closes #2948.	2024-07-31 14:53:15 +02:00
Peter-Josef Meisch	95e028a1e9	Dependency updates and cleanup. Original Pull Request #2946 Closes #2945	2024-07-30 06:56:32 +02:00
Peter-Josef Meisch	dd156b9e29	Enable use of search_after with field_collapse. Original Pull Request #2937 Closes #2935	2024-07-06 09:08:27 +02:00
Peter-Josef Meisch	8d0ecf2aa3	Update migration-guide-5.2-5.3.adoc	2024-07-04 21:02:41 +02:00
Mark Paluch	4cc80abcd8	Switch to Broadcom docker proxy. Closes #2934	2024-06-20 11:20:58 +02:00
Peter-Josef Meisch	eca6a7ec77	Upgrade to Elasticsearch-8.14.1. Original Pull Request #2930 Closes #2929	2024-06-13 23:34:55 +02:00
puppylpg	d9d1b73dad	Fix missing element_type when using elasticsearch-java 8.14.x Original Pull Request #2928 Closes #2927	2024-06-12 18:27:43 +02:00
Peter-Josef Meisch	d101eebc6d	Upgrade to Elasticsearch-8.14.0. Original Pull Request #2926 Closes #2924	2024-06-11 21:24:57 +02:00
Peter-Josef Meisch	4ef5af1f2d	Update dependencies. Original Pull Request #2923 Closes #2922	2024-06-01 15:26:45 +02:00
Peter-Josef Meisch	fade919be6	Polishing.	2024-05-28 20:57:27 +02:00
puppylpg	687b014e70	Add knn search parameter and remove knn query. Original Pull Rrequest #2920 Closes #2919	2024-05-28 20:52:47 +02:00
Peter-Josef Meisch	9d139299b2	Add documentation for migration 5.3 to 5.4	2024-05-27 19:38:00 +02:00
Peter-Josef Meisch	161439ae22	Polishing	2024-05-26 20:31:42 +02:00
Aouichaoui Youssef	fbe54e485b	Add support for index aliases. Original Pull Request #2905 Closes #2599	2024-05-26 20:16:21 +02:00
Peter-Josef Meisch	86e0e660be	Upgrade to Elasticsearch 8.13.4. Original Pull Request #2918 Closes #2915	2024-05-19 11:48:34 +02:00
Peter-Josef Meisch	5ebe9f4492	Update version document.	2024-05-18 19:15:02 +02:00
Peter-Josef Meisch	e997b39f68	Fix max dim value for dense vector. Closes #2911	2024-05-18 18:11:43 +02:00
Mark Paluch	41e32576e3	After release cleanups. See #2896	2024-05-17 11:51:34 +02:00
Mark Paluch	82c4ea1391	Prepare next development iteration. See #2896	2024-05-17 11:51:33 +02:00