Skip to content

Commit 14209bf

Browse files
authored
Upgrade Elasticsearch to 9.4.3.
Closes #3301 Closes #3298 Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>
1 parent 31eee9f commit 14209bf

5 files changed

Lines changed: 24 additions & 3 deletions

File tree

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<springdata.commons>4.2.0-SNAPSHOT</springdata.commons>
2222

2323
<!-- version of the ElasticsearchClient -->
24-
<elasticsearch-java>9.4.2</elasticsearch-java>
25-
<elasticsearch-rest-client>9.4.2</elasticsearch-rest-client>
24+
<elasticsearch-java>9.4.3</elasticsearch-java>
25+
<elasticsearch-rest-client>9.4.3</elasticsearch-rest-client>
2626

2727
<hoverfly>0.20.2</hoverfly>
2828
<log4j>2.25.4</log4j>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
[[new-features]]
22
= What's new
33

4+
[[new-features.6-2-0]]
5+
== New in Spring Data Elasticsearch 6.2
6+
7+
* Upgrade to Elasticsearch 9.4.3
8+
49
[[new-features.6-1-0]]
510
== New in Spring Data Elasticsearch 6.1
611

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ The following table shows the Elasticsearch and Spring versions that are used by
66
[cols="^,^,^,^",options="header"]
77
|===
88
| Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
9+
| 2026.1 | 6.2.x | 9.4.3 | 7.0.x
910
| 2026.0 | 6.1.x | 9.4.2 | 7.0.x
1011
| 2025.1 | 6.0.x | 9.2.2 | 7.0.x
1112
| 2025.0 | 5.5.xfootnote:oom[Out of maintenance] | 8.18.1 | 6.2.x

src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,12 @@ void shouldWriteMappingWithFieldAliases() {
280280
operations.indexOps(FieldAliasEntity.class).createWithMapping();
281281
}
282282

283+
@Test // #3298
284+
@DisplayName("should write index prefixes with default value")
285+
void shouldWriteIndexPrefixesWithDefaultValue() {
286+
operations.indexOps(TextIndexPrefixesEntity.class).createWithMapping();
287+
}
288+
283289
// region Entities
284290
@Document(indexName = "#{@indexNameProvider.indexName()}")
285291
static class Book {
@@ -931,5 +937,14 @@ private static class FieldAliasEntity {
931937
@Field(type = Text) private String otherText;
932938
}
933939

940+
@Document(indexName = "#{@indexNameProvider.indexName()}")
941+
private static class TextIndexPrefixesEntity {
942+
@Id
943+
@Nullable private String id;
944+
@Nullable
945+
// the min value is set to the default
946+
@Field(type = Text, indexPrefixes = @IndexPrefixes(maxChars = 10)) private String someText;
947+
}
948+
934949
// endregion
935950
}

src/test/resources/testcontainers-elasticsearch.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#
1616
#
1717
sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch
18-
sde.testcontainers.image-version=9.4.2
18+
sde.testcontainers.image-version=9.4.3
1919
#
2020
#
2121
# needed as we do a DELETE /* at the end of the tests, will be required from 8.0 on, produces a warning since 7.13

0 commit comments

Comments
 (0)