From fe877e13ffc0ba34a4fa0d6eb57cfcf8fd7cebeb Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Tue, 7 Oct 2025 09:18:09 +0200
Subject: [PATCH 1/2] HSEARCH-5498 Upgrade Elasticsearch client to 9.1.5

---
 bom/platform-common/pom.xml | 2 +-
 build/parents/build/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bom/platform-common/pom.xml b/bom/platform-common/pom.xml
index 9582ab47d81..deaaa92d9b9 100644
--- a/bom/platform-common/pom.xml
+++ b/bom/platform-common/pom.xml
@@ -19,7 +19,7 @@
 
         <!-- These versions will be checked against the ones resolved by Maven for the project in the enforcer rule -->
         <version.bom.org.hibernate.orm>7.1.2.Final</version.bom.org.hibernate.orm>
-        <version.bom.org.elasticsearch.client>9.1.4</version.bom.org.elasticsearch.client>
+        <version.bom.org.elasticsearch.client>9.1.5</version.bom.org.elasticsearch.client>
         <version.bom.software.amazon.awssdk>2.34.1</version.bom.software.amazon.awssdk>
         <version.bom.io.smallrye>3.3.1</version.bom.io.smallrye>
         <version.bom.org.jboss.logging.processor>3.0.4.Final</version.bom.org.jboss.logging.processor>
diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml
index 8872cb2f3fa..e86d94e216d 100644
--- a/build/parents/build/pom.xml
+++ b/build/parents/build/pom.xml
@@ -49,7 +49,7 @@
         <!-- >>> Elasticsearch -->
         <!-- The version of the Elasticsearch client used by Hibernate Search, independently of the version of the remote cluster -->
         <!-- Use the latest open-source version here. Currently, low-level clients are open-source even in 8.5+ -->
-        <version.org.elasticsearch.client>9.1.4</version.org.elasticsearch.client>
+        <version.org.elasticsearch.client>9.1.5</version.org.elasticsearch.client>
         <!-- Various HTTP client versions that our own Elasticsearch client implementations depend on -->
         <version.org.apache.httpcomponents.httpclient>4.5.14</version.org.apache.httpcomponents.httpclient>
         <version.org.apache.httpcomponents.httpcore>4.4.16</version.org.apache.httpcomponents.httpcore>

From 2a714ccbb928c72ae175227dd666ed39139bf600 Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Tue, 7 Oct 2025 09:19:55 +0200
Subject: [PATCH 2/2] HSEARCH-5499 Test against the latest Elasticsearch 9.1.5

---
 Jenkinsfile                                       | 2 +-
 build/container/search-backend/elastic.Dockerfile | 2 +-
 ci/dependency-update/Jenkinsfile                  | 2 +-
 pom.xml                                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9758a5e3825..59b526b75a5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -262,7 +262,7 @@ stage('Configure') {
 					new LocalElasticsearchBuildEnvironment(version: '8.18.7', condition: TestCondition.ON_DEMAND),
 					new LocalElasticsearchBuildEnvironment(version: '8.19.4', condition: TestCondition.AFTER_MERGE),
 					new LocalElasticsearchBuildEnvironment(version: '9.0.7', condition: TestCondition.ON_DEMAND),
-					new LocalElasticsearchBuildEnvironment(version: '9.1.4', condition: TestCondition.BEFORE_MERGE, isDefault: true),
+					new LocalElasticsearchBuildEnvironment(version: '9.1.5', condition: TestCondition.BEFORE_MERGE, isDefault: true),
 					// IMPORTANT: Make sure to update the documentation for any newly supported Elasticsearch versions
 					//            See version.org.elasticsearch.compatible.expected.text
 					//            and version.org.elasticsearch.compatible.regularly-tested.text in POMs.
diff --git a/build/container/search-backend/elastic.Dockerfile b/build/container/search-backend/elastic.Dockerfile
index a295492aebe..b198b915e4f 100644
--- a/build/container/search-backend/elastic.Dockerfile
+++ b/build/container/search-backend/elastic.Dockerfile
@@ -5,4 +5,4 @@
 #  * update `version.org.elasticsearch.latest` property in a POM file.
 #  * update the tags for 'elasticsearch-current' and 'elasticsearch-next' builds in ci/dependency-update/Jenkinsfile
 #
-FROM docker.io/elastic/elasticsearch:9.1.4
+FROM docker.io/elastic/elasticsearch:9.1.5
diff --git a/ci/dependency-update/Jenkinsfile b/ci/dependency-update/Jenkinsfile
index 3791d555d6f..72355a0fcc5 100644
--- a/ci/dependency-update/Jenkinsfile
+++ b/ci/dependency-update/Jenkinsfile
@@ -53,7 +53,7 @@ Map settings() {
 					updateProperties: [],
 					onlyRunTestDependingOn: ['hibernate-search-backend-elasticsearch'],
 					// We want to use the snapshot version of an image from the ES registry since that's where they are publishing their snapshots.
-					additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.1.5-SNAPSHOT',
+					additionalMavenArgs: '-Dtest.lucene.skip=true -Dtest.elasticsearch.run.elastic.image.name=docker.elastic.co/elasticsearch/elasticsearch -Dtest.elasticsearch.run.elastic.image.tag=9.1.6-SNAPSHOT',
 					// This job won't change the versions in the pom. We are passing the latest Elasticsearch version through an additional maven argument `-D`
 					skipSourceModifiedCheck: true
 			]
diff --git a/pom.xml b/pom.xml
index 37ee0a396e7..9724ece6b4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -389,7 +389,7 @@
 
         <!-- Container images for various integration tests -->
         <!-- The latest version of Elasticsearch tested against by default -->
-        <version.org.elasticsearch.latest>9.1.4</version.org.elasticsearch.latest>
+        <version.org.elasticsearch.latest>9.1.5</version.org.elasticsearch.latest>
         <test.elasticsearch.version></test.elasticsearch.version>
         <test.elasticsearch.distribution>elastic</test.elasticsearch.distribution>