1
0
mirror of synced 2026-07-06 10:10:01 +00:00

Compare commits

..

13 Commits

Author SHA1 Message Date
Mark Paluch 8a688dbcb4 Release version 5.5.13 (2025.0.13).
See #3297
2026-06-24 09:34:50 +02:00
Christoph Strobl f5a9e1149a Prepare next development iteration.
See #3275
2026-06-09 10:50:10 +02:00
Christoph Strobl ec1186119a Release version 5.5.12 (2025.0.12).
See #3275
2026-06-09 10:50:10 +02:00
Mark Paluch f2e00278cb Upgrade to Maven Wrapper 3.9.16.
See #3293
2026-06-02 14:57:30 +02:00
Mark Paluch c300d462ac Refine GitHub Actions workflows.
See #3275
2026-06-02 09:21:52 +02:00
Mark Paluch 216e90f4a7 After release cleanups.
See #3256
2026-04-17 15:00:35 +02:00
Mark Paluch d58e5a7173 Prepare next development iteration.
See #3256
2026-04-17 15:00:34 +02:00
Mark Paluch e4be6d82d5 Release version 5.5.11 (2025.0.11).
See #3256
2026-04-17 14:57:41 +02:00
Mark Paluch 08ea0bb6d9 Prepare 5.5.11 (2025.0.11).
See #3256
2026-04-17 14:57:18 +02:00
Ralph Ursprung aeda13f920 make AOT hints for ELC optional 2026-04-14 18:26:37 +02:00
Ralph Ursprung 270a5e2fca 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)
(cherry picked from commit 6b3646bcc1)
2026-04-13 18:05:33 +02:00
Mark Paluch de0eadc72b After release cleanups.
See #3246
2026-03-13 11:05:52 +01:00
Mark Paluch 33bf5d505d Prepare next development iteration.
See #3246
2026-03-13 11:05:51 +01:00
8 changed files with 34 additions and 55 deletions
+2
View File
@@ -25,3 +25,5 @@ jobs:
uses: spring-projects/spring-data-build/actions/maven-build@3.5.x uses: spring-projects/spring-data-build/actions/maven-build@3.5.x
env: env:
TESTCONTAINERS_REUSE_ENABLE: true TESTCONTAINERS_REUSE_ENABLE: true
with:
settings-xml: '${{ vars.SETTINGS_XML }}'
+3 -3
View File
@@ -18,7 +18,7 @@ permissions:
jobs: jobs:
Inbox: Inbox:
runs-on: ubuntu-latest 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 ') if: vars.PROJECT_CARDS_ENABLED == 'true' && 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: steps:
- name: Create or Update Issue Card - name: Create or Update Issue Card
uses: actions/add-to-project@v1.0.2 uses: actions/add-to-project@v1.0.2
@@ -27,7 +27,7 @@ jobs:
github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }} github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }}
Pull-Request: Pull-Request:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request != null if: vars.PROJECT_CARDS_ENABLED == 'true' && github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request != null
steps: steps:
- name: Create or Update Pull Request Card - name: Create or Update Pull Request Card
uses: actions/add-to-project@v1.0.2 uses: actions/add-to-project@v1.0.2
@@ -36,7 +36,7 @@ jobs:
github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }} github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }}
Feedback-Provided: Feedback-Provided:
runs-on: ubuntu-latest 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') if: vars.PROJECT_CARDS_ENABLED == 'true' && 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: steps:
- name: Update Project Card - name: Update Project Card
uses: actions/add-to-project@v1.0.2 uses: actions/add-to-project@v1.0.2
+4
View File
@@ -26,3 +26,7 @@ jobs:
build-name: 'spring-data-elasticsearch' build-name: 'spring-data-elasticsearch'
username: '${{ secrets.ARTIFACTORY_USERNAME }}' username: '${{ secrets.ARTIFACTORY_USERNAME }}'
password: '${{ secrets.ARTIFACTORY_PASSWORD }}' password: '${{ secrets.ARTIFACTORY_PASSWORD }}'
context-url: '${{ vars.ARTIFACTORY_CONTEXT_URL }}'
repository: '${{ vars.ARTIFACTORY_REPOSITORY }}'
project: '${{ vars.ARTIFACTORY_PROJECT }}'
settings-xml: '${{ vars.SETTINGS_XML }}'
+2 -2
View File
@@ -1,3 +1,3 @@
#Thu Jul 17 14:00:55 CEST 2025 #Tue Jun 02 15:00:44 CEST 2026
distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
wrapperUrl=https\://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar 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.11/apache-maven-3.9.11-bin.zip
+4 -5
View File
@@ -5,12 +5,12 @@
<groupId>org.springframework.data</groupId> <groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId> <artifactId>spring-data-elasticsearch</artifactId>
<version>5.5.10</version> <version>5.5.13</version>
<parent> <parent>
<groupId>org.springframework.data.build</groupId> <groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId> <artifactId>spring-data-parent</artifactId>
<version>3.5.10</version> <version>3.5.13</version>
</parent> </parent>
<name>Spring Data Elasticsearch</name> <name>Spring Data Elasticsearch</name>
@@ -18,7 +18,7 @@
<url>https://github.com/spring-projects/spring-data-elasticsearch</url> <url>https://github.com/spring-projects/spring-data-elasticsearch</url>
<properties> <properties>
<springdata.commons>3.5.10</springdata.commons> <springdata.commons>3.5.13</springdata.commons>
<!-- version of the ElasticsearchClient --> <!-- version of the ElasticsearchClient -->
<elasticsearch-java>8.18.8</elasticsearch-java> <elasticsearch-java>8.18.8</elasticsearch-java>
@@ -82,8 +82,7 @@
<scm> <scm>
<url>https://github.com/spring-projects/spring-data-elasticsearch</url> <url>https://github.com/spring-projects/spring-data-elasticsearch</url>
<connection>scm:git:git://github.com/spring-projects/spring-data-elasticsearch.git</connection> <connection>scm:git:git://github.com/spring-projects/spring-data-elasticsearch.git</connection>
<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git <developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git</developerConnection>
</developerConnection>
</scm> </scm>
<issueManagement> <issueManagement>
-29
View File
@@ -1,29 +0,0 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
https://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>spring-plugins-release</id>
<username>${env.ARTIFACTORY_USR}</username>
<password>${env.ARTIFACTORY_PSW}</password>
</server>
<server>
<id>spring-libs-snapshot</id>
<username>${env.ARTIFACTORY_USR}</username>
<password>${env.ARTIFACTORY_PSW}</password>
</server>
<server>
<id>spring-libs-milestone</id>
<username>${env.ARTIFACTORY_USR}</username>
<password>${env.ARTIFACTORY_PSW}</password>
</server>
<server>
<id>spring-libs-release</id>
<username>${env.ARTIFACTORY_USR}</username>
<password>${env.ARTIFACTORY_PSW}</password>
</server>
</servers>
</settings>
@@ -15,15 +15,12 @@
*/ */
package org.springframework.data.elasticsearch.client.elc.aot; 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.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar; import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.aot.hint.TypeReference;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
/** /**
* runtime hints for the Elasticsearch client libraries, as these do not provide any of their own. * runtime hints for the Elasticsearch client libraries, as these do not provide any of their own.
@@ -37,17 +34,22 @@ public class ElasticsearchClientRuntimeHints implements RuntimeHintsRegistrar {
public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) { public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
hints.reflection() hints.reflection()
.registerType(TypeReference.of(IndexSettings.class), builder -> builder.withField("_DESERIALIZER")) // .registerTypeIfPresent(classLoader, "co.elastic.clients.elasticsearch.indices.IndexSettings",
.registerType(TypeReference.of(PutMappingRequest.class), builder -> builder.withField("_DESERIALIZER")) // builder -> builder.withField("_DESERIALIZER"))
.registerType(TypeReference.of(RuntimeFieldType.class), builder -> builder.withField("_DESERIALIZER"))// .registerTypeIfPresent(classLoader, "co.elastic.clients.elasticsearch.indices.PutMappingRequest",
.registerType(TypeReference.of(TypeMapping.class), builder -> builder.withField("_DESERIALIZER")) // 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"));
hints.serialization() // if (ClassUtils.isPresent("org.apache.http.impl.auth.BasicScheme", classLoader)) {
.registerType(org.apache.http.impl.auth.BasicScheme.class) // hints.serialization() //
.registerType(org.apache.http.impl.auth.RFC2617Scheme.class) // .registerType(org.apache.http.impl.auth.BasicScheme.class) //
.registerType(java.util.HashMap.class) // .registerType(org.apache.http.impl.auth.RFC2617Scheme.class) //
; .registerType(java.util.HashMap.class) //
;
}
hints.resources() // hints.resources() //
.registerPattern("co/elastic/clients/version.properties") // .registerPattern("co/elastic/clients/version.properties") //
+2 -1
View File
@@ -1,4 +1,4 @@
Spring Data Elasticsearch 5.5.10 (2025.0.10) Spring Data Elasticsearch 5.5.13 (2025.0.13)
Copyright (c) [2013-2022] Pivotal Software, Inc. Copyright (c) [2013-2022] Pivotal Software, Inc.
This product is licensed to you under the Apache License, Version 2.0 (the "License"). This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -37,5 +37,6 @@ conditions of the subcomponent's license, as noted in the LICENSE file.