1
0
mirror of synced 2026-07-05 17:50:00 +00:00

Compare commits

...

4 Commits

Author SHA1 Message Date
Peter-Josef Meisch 06d57b8a55 Update Elasticsearch to 9.4.3.
Signed-off-by: Peter-Josef Meisch <pj.meisch@sothawo.com>
2026-07-03 22:06:04 +02:00
Mark Paluch 17cb07b0c0 Use property to easier configure Spring Framework reference docs location.
See spring-projects/spring-data-build#2886
2026-06-17 16:40:41 +02:00
Christoph Strobl f29c836e33 Prepare next development iteration.
See #3277
2026-06-09 10:50:10 +02:00
Christoph Strobl cea2c282fe After release cleanups.
See #3277
2026-06-09 10:50:10 +02:00
7 changed files with 33 additions and 16 deletions
+3 -3
View File
@@ -3,7 +3,7 @@ name: CI Build
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [ main, 'issue/**' ] branches: [ 6.1.x, 'issue/6.1.x/**' ]
permissions: read-all permissions: read-all
@@ -17,12 +17,12 @@ jobs:
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v6
- name: Setup Java and Maven - name: Setup Java and Maven
uses: spring-projects/spring-data-build/actions/setup-maven@main uses: spring-projects/spring-data-build/actions/setup-maven@4.1.x
with: with:
java-version: ${{ matrix.java-version }} java-version: ${{ matrix.java-version }}
develocity-access-key: '${{ secrets.DEVELOCITY_ACCESS_KEY }}' develocity-access-key: '${{ secrets.DEVELOCITY_ACCESS_KEY }}'
- name: Build - name: Build
uses: spring-projects/spring-data-build/actions/maven-build@main uses: spring-projects/spring-data-build/actions/maven-build@4.1.x
env: env:
TESTCONTAINERS_REUSE_ENABLE: true TESTCONTAINERS_REUSE_ENABLE: true
with: with:
+3 -3
View File
@@ -3,7 +3,7 @@ name: Snapshots
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [ main, 'issue/**' ] branches: [ 6.1.x, 'issue/6.1.x/**' ]
permissions: read-all permissions: read-all
@@ -15,11 +15,11 @@ jobs:
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v6
- name: Setup Java and Maven - name: Setup Java and Maven
uses: spring-projects/spring-data-build/actions/setup-maven@main uses: spring-projects/spring-data-build/actions/setup-maven@4.1.x
with: with:
develocity-access-key: '${{ secrets.DEVELOCITY_ACCESS_KEY }}' develocity-access-key: '${{ secrets.DEVELOCITY_ACCESS_KEY }}'
- name: Deploy to Artifactory - name: Deploy to Artifactory
uses: spring-projects/spring-data-build/actions/maven-artifactory-deploy@main uses: spring-projects/spring-data-build/actions/maven-artifactory-deploy@4.1.x
env: env:
TESTCONTAINERS_REUSE_ENABLE: true TESTCONTAINERS_REUSE_ENABLE: true
with: with:
+19 -7
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>6.1.0</version> <version>6.1.1-SNAPSHOT</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>4.1.0</version> <version>4.1.1-SNAPSHOT</version>
</parent> </parent>
<name>Spring Data Elasticsearch</name> <name>Spring Data Elasticsearch</name>
@@ -18,11 +18,11 @@
<url>https://github.com/spring-projects/spring-data-elasticsearch</url> <url>https://github.com/spring-projects/spring-data-elasticsearch</url>
<properties> <properties>
<springdata.commons>4.1.0</springdata.commons> <springdata.commons>4.1.1-SNAPSHOT</springdata.commons>
<!-- version of the ElasticsearchClient --> <!-- version of the ElasticsearchClient -->
<elasticsearch-java>9.4.2</elasticsearch-java> <elasticsearch-java>9.4.3</elasticsearch-java>
<elasticsearch-rest-client>9.4.2</elasticsearch-rest-client> <elasticsearch-rest-client>9.4.3</elasticsearch-rest-client>
<hoverfly>0.20.2</hoverfly> <hoverfly>0.20.2</hoverfly>
<log4j>2.25.4</log4j> <log4j>2.25.4</log4j>
@@ -498,8 +498,20 @@
</profiles> </profiles>
<repositories> <repositories>
<repository>
<id>spring-snapshot</id>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>spring-milestone</id>
<url>https://repo.spring.io/milestone</url>
</repository>
</repositories> </repositories>
</project> </project>
@@ -1,6 +1,11 @@
[[new-features]] [[new-features]]
= What's new = What's new
[[new-features.6-1-1]]
== New in Spring Data Elasticsearch 6.1.1
* Upgrade to Elasticsearch 9.4.3
[[new-features.6-1-0]] [[new-features.6-1-0]]
== New in Spring Data Elasticsearch 6.1 == New in Spring Data Elasticsearch 6.1
@@ -6,7 +6,7 @@ The following table shows the Elasticsearch and Spring versions that are used by
[cols="^,^,^,^",options="header"] [cols="^,^,^,^",options="header"]
|=== |===
| Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
| 2026.0 | 6.1.x | 9.4.2 | 7.0.x | 2026.0 | 6.1.x | 9.4.3 | 7.0.x
| 2025.1 | 6.0.x | 9.2.2 | 7.0.x | 2025.1 | 6.0.x | 9.2.2 | 7.0.x
| 2025.0 | 5.5.xfootnote:oom[Out of maintenance] | 8.18.1 | 6.2.x | 2025.0 | 5.5.xfootnote:oom[Out of maintenance] | 8.18.1 | 6.2.x
| 2024.1 | 5.4.xfootnote:oom[] | 8.15.5 | 6.1.x | 2024.1 | 5.4.xfootnote:oom[] | 8.15.5 | 6.1.x
@@ -13,7 +13,7 @@ asciidoc:
include-xml-namespaces: false include-xml-namespaces: false
spring-data-commons-docs-url: '${documentation.baseurl}/spring-data/commons/reference/${springdata.commons.short}' spring-data-commons-docs-url: '${documentation.baseurl}/spring-data/commons/reference/${springdata.commons.short}'
spring-data-commons-javadoc-base: '{spring-data-commons-docs-url}/api/java' spring-data-commons-javadoc-base: '{spring-data-commons-docs-url}/api/java'
springdocsurl: '${documentation.baseurl}/spring-framework/reference/{springversionshort}' springdocsurl: '${documentation.spring-reference-url}/{springversionshort}'
spring-framework-docs: '{springdocsurl}' spring-framework-docs: '{springdocsurl}'
springjavadocurl: '${documentation.spring-javadoc-url}' springjavadocurl: '${documentation.spring-javadoc-url}'
spring-framework-javadoc: '{springjavadocurl}' spring-framework-javadoc: '{springjavadocurl}'
@@ -15,7 +15,7 @@
# #
# #
sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch sde.testcontainers.image-name=docker.elastic.co/elasticsearch/elasticsearch
sde.testcontainers.image-version=9.4.2 sde.testcontainers.image-version=9.4.3
# #
# #
# 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 # 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