1
0
mirror of synced 2026-05-23 20:53:17 +00:00

Compare commits

...

8 Commits

Author SHA1 Message Date
Mark Paluch dde239cab6 Release version 6.0.5 (2025.1.5).
See #3257
2026-04-17 16:39:32 +02:00
Mark Paluch f34dbb1915 Prepare 6.0.5 (2025.1.5).
See #3257
2026-04-17 16:39:11 +02:00
Peter-Josef Meisch 8875fb79a8 Upgrade to Elasticsearch 9.2.8 - the missing parts (#3271)
Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>
2026-04-11 12:31:55 +02:00
Mark Paluch f6af6b6f33 Upgrade to Elasticsearch REST Client 9.2.8.
See #3269
2026-04-10 16:58:21 +02:00
Ralph Ursprung 6b3646bcc1 Make AOT hints for ELC optional.
see also opensearch-project/spring-data-opensearch#441

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
(cherry picked from commit ffdbea4dba)
2026-03-31 18:20:14 +02:00
Peter-Josef Meisch 1cccc1cbb2 Ugrade Elasticsearch to version 9.2.7.
Closes #3264

Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>
2026-03-22 17:04:39 +01:00
Mark Paluch 2c8e18ac35 After release cleanups.
See #3245
2026-03-13 11:38:31 +01:00
Mark Paluch c11146b0f2 Prepare next development iteration.
See #3245
2026-03-13 11:38:30 +01:00
5 changed files with 17 additions and 18 deletions
+5 -5
View File
@@ -5,12 +5,12 @@
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId>
<version>6.0.4</version>
<version>6.0.5</version>
<parent>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId>
<version>4.0.4</version>
<version>4.0.5</version>
</parent>
<name>Spring Data Elasticsearch</name>
@@ -18,11 +18,11 @@
<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
<properties>
<springdata.commons>4.0.4</springdata.commons>
<springdata.commons>4.0.5</springdata.commons>
<!-- version of the ElasticsearchClient -->
<elasticsearch-java>9.2.6</elasticsearch-java>
<elasticsearch-rest-client>9.2.6</elasticsearch-rest-client>
<elasticsearch-java>9.2.8</elasticsearch-java>
<elasticsearch-rest-client>9.2.8</elasticsearch-rest-client>
<hoverfly>0.20.2</hoverfly>
<log4j>2.25.1</log4j>
@@ -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.1 | 6.0.x | 9.2.6 | 7.0.x
| 2025.1 | 6.0.x | 9.2.8 | 7.0.x
| 2025.0 | 5.5.x | 8.18.1 | 6.2.x
| 2024.1 | 5.4.xfootnote:oom[Out of maintenance] | 8.15.5 | 6.1.x
| 2024.0 | 5.3.xfootnote:oom[] | 8.13.4 | 6.1.x
@@ -15,15 +15,9 @@
*/
package org.springframework.data.elasticsearch.client.elc.aot;
import co.elastic.clients.elasticsearch._types.mapping.RuntimeFieldType;
import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
import co.elastic.clients.elasticsearch.indices.IndexSettings;
import co.elastic.clients.elasticsearch.indices.PutMappingRequest;
import org.jspecify.annotations.Nullable;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.aot.hint.TypeReference;
import org.springframework.util.ClassUtils;
/**
@@ -38,10 +32,14 @@ public class ElasticsearchClientRuntimeHints implements RuntimeHintsRegistrar {
public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
hints.reflection()
.registerType(TypeReference.of(IndexSettings.class), builder -> builder.withField("_DESERIALIZER"))
.registerType(TypeReference.of(PutMappingRequest.class), builder -> builder.withField("_DESERIALIZER"))
.registerType(TypeReference.of(RuntimeFieldType.class), builder -> builder.withField("_DESERIALIZER"))
.registerType(TypeReference.of(TypeMapping.class), builder -> builder.withField("_DESERIALIZER"));
.registerTypeIfPresent(classLoader, "co.elastic.clients.elasticsearch.indices.IndexSettings",
builder -> builder.withField("_DESERIALIZER"))
.registerTypeIfPresent(classLoader, "co.elastic.clients.elasticsearch.indices.PutMappingRequest",
builder -> builder.withField("_DESERIALIZER"))
.registerTypeIfPresent(classLoader, "co.elastic.clients.elasticsearch._types.mapping.RuntimeFieldType",
builder -> builder.withField("_DESERIALIZER"))
.registerTypeIfPresent(classLoader, "co.elastic.clients.elasticsearch._types.mapping.TypeMapping",
builder -> builder.withField("_DESERIALIZER"));
if (ClassUtils.isPresent("org.apache.http.impl.auth.BasicScheme",
ElasticsearchClientRuntimeHints.class.getClassLoader())) {
+2 -1
View File
@@ -1,4 +1,4 @@
Spring Data Elasticsearch 6.0.4 (2025.1.4)
Spring Data Elasticsearch 6.0.5 (2025.1.5)
Copyright (c) [2013-2022] Pivotal Software, Inc.
This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -20,3 +20,4 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
@@ -15,7 +15,7 @@
#
#
sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch
sde.testcontainers.image-version=9.2.6
sde.testcontainers.image-version=9.2.8
#
#
# 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