Skip to content

Upgrade to Elasticsearch 8.17.4. #3085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 31, 2025
Merged

Upgrade to Elasticsearch 8.17.4. #3085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<springdata.commons>3.5.0-SNAPSHOT</springdata.commons>

<!-- version of the ElasticsearchClient -->
<elasticsearch-java>8.17.2</elasticsearch-java>
<elasticsearch-java>8.17.4</elasticsearch-java>

<hoverfly>0.19.0</hoverfly>
<log4j>2.23.1</log4j>
Expand Down
2 changes: 1 addition & 1 deletion src/main/antora/modules/ROOT/pages/elasticsearch/elasticsearch-new.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[[new-features.5-5-0]]
== New in Spring Data Elasticsearch 5.5

* Upgrade to Elasticsearch 8.17.2.
* Upgrade to Elasticsearch 8.17.4.
* Add support for the `@SearchTemplateQuery` annotation on repository methods.
* Scripted field properties of type collection can be populated from scripts returning arrays.

Expand Down
2 changes: 1 addition & 1 deletion src/main/antora/modules/ROOT/pages/elasticsearch/versions.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The following table shows the Elasticsearch and Spring versions that are used by
[cols="^,^,^,^",options="header"]
|===
| Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
| 2025.0 (in development) | 5.5.x | 8.17.2 | 6.2.x
| 2025.0 (in development) | 5.5.x | 8.17.4 | 6.2.x
| 2024.1 | 5.4.x | 8.15.5 | 6.1.x
| 2024.0 | 5.3.x | 8.13.4 | 6.1.x
| 2023.1 (Vaughan) | 5.2.xfootnote:oom[Out of maintenance] | 8.11.1 | 6.1.x
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/springframework/data/elasticsearch/client/elc/ResponseConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@ public ReindexResponse reindexResponse(co.elastic.clients.elasticsearch.core.Rei
private ReindexResponse.Failure reindexResponseFailureOf(BulkIndexByScrollFailure failure) {
return ReindexResponse.Failure.builder() //
.withIndex(failure.index()) //
.withType(failure.type()) //
.withId(failure.id()) //
.withStatus(failure.status())//
.withErrorCause(toErrorCause(failure.cause())) //
Expand All @@ -411,7 +410,6 @@ private ReindexResponse.Failure reindexResponseFailureOf(BulkIndexByScrollFailur
private ByQueryResponse.Failure byQueryResponseFailureOf(BulkIndexByScrollFailure failure) {
return ByQueryResponse.Failure.builder() //
.withIndex(failure.index()) //
.withType(failure.type()) //
.withId(failure.id()) //
.withStatus(failure.status())//
.withErrorCause(toErrorCause(failure.cause())).build();
Expand Down
17 changes: 2 additions & 15 deletions src/main/java/org/springframework/data/elasticsearch/core/query/ByQueryResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ public static ByQueryResponseBuilder builder() {
public static class Failure {

@Nullable private final String index;
@Nullable private final String type;
@Nullable private final String id;
@Nullable private final Exception cause;
@Nullable private final Integer status;
Expand All @@ -176,11 +175,10 @@ public static class Failure {
@Nullable private final Boolean aborted;
@Nullable private final ElasticsearchErrorCause elasticsearchErrorCause;

private Failure(@Nullable String index, @Nullable String type, @Nullable String id, @Nullable Exception cause,
private Failure(@Nullable String index, @Nullable String id, @Nullable Exception cause,
@Nullable Integer status, @Nullable Long seqNo, @Nullable Long term, @Nullable Boolean aborted,
@Nullable ElasticsearchErrorCause elasticsearchErrorCause) {
this.index = index;
this.type = type;
this.id = id;
this.cause = cause;
this.status = status;
Expand All @@ -195,11 +193,6 @@ public String getIndex() {
return index;
}

@Nullable
public String getType() {
return type;
}

@Nullable
public String getId() {
return id;
Expand Down Expand Up @@ -250,7 +243,6 @@ public static FailureBuilder builder() {
*/
public static final class FailureBuilder {
@Nullable private String index;
@Nullable private String type;
@Nullable private String id;
@Nullable private Exception cause;
@Nullable private Integer status;
Expand All @@ -266,11 +258,6 @@ public FailureBuilder withIndex(String index) {
return this;
}

public FailureBuilder withType(String type) {
this.type = type;
return this;
}

public FailureBuilder withId(String id) {
this.id = id;
return this;
Expand Down Expand Up @@ -307,7 +294,7 @@ public FailureBuilder withErrorCause(ElasticsearchErrorCause elasticsearchErrorC
}

public Failure build() {
return new Failure(index, type, id, cause, status, seqNo, term, aborted, elasticsearchErrorCause);
return new Failure(index, id, cause, status, seqNo, term, aborted, elasticsearchErrorCause);
}
}
}
Expand Down
17 changes: 2 additions & 15 deletions src/main/java/org/springframework/data/elasticsearch/core/reindex/ReindexResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ public static ReindexResponseBuilder builder() {
public static class Failure {

@Nullable private final String index;
@Nullable private final String type;
@Nullable private final String id;
@Nullable private final Exception cause;
@Nullable private final Integer status;
Expand All @@ -196,11 +195,10 @@ public static class Failure {
@Nullable private final Boolean aborted;
@Nullable private final ElasticsearchErrorCause elasticsearchErrorCause;

private Failure(@Nullable String index, @Nullable String type, @Nullable String id, @Nullable Exception cause,
private Failure(@Nullable String index, @Nullable String id, @Nullable Exception cause,
@Nullable Integer status, @Nullable Long seqNo, @Nullable Long term, @Nullable Boolean aborted,
@Nullable ElasticsearchErrorCause elasticsearchErrorCause) {
this.index = index;
this.type = type;
this.id = id;
this.cause = cause;
this.status = status;
Expand All @@ -215,11 +213,6 @@ public String getIndex() {
return index;
}

@Nullable
public String getType() {
return type;
}

@Nullable
public String getId() {
return id;
Expand Down Expand Up @@ -269,7 +262,6 @@ public static Failure.FailureBuilder builder() {
*/
public static final class FailureBuilder {
@Nullable private String index;
@Nullable private String type;
@Nullable private String id;
@Nullable private Exception cause;
@Nullable private Integer status;
Expand All @@ -285,11 +277,6 @@ public Failure.FailureBuilder withIndex(String index) {
return this;
}

public Failure.FailureBuilder withType(String type) {
this.type = type;
return this;
}

public Failure.FailureBuilder withId(String id) {
this.id = id;
return this;
Expand Down Expand Up @@ -326,7 +313,7 @@ public Failure.FailureBuilder withErrorCause(@Nullable ElasticsearchErrorCause e
}

public Failure build() {
return new Failure(index, type, id, cause, status, seqNo, term, aborted, elasticsearchErrorCause);
return new Failure(index, id, cause, status, seqNo, term, aborted, elasticsearchErrorCause);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/testcontainers-elasticsearch.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
#
sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch
sde.testcontainers.image-version=8.17.2
sde.testcontainers.image-version=8.17.4
#
#
# 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
Expand Down