Spring Boot 3.5 / Spring Data Elasticsearch 6.0 baseline

Signed-off-by: Andriy Redko <[email protected]>
Signed-off-by: Andriy Redko <[email protected]>

Author: reta

README.md

@@ -24,6 +24,7 @@ The Spring Data OpenSearch follows the release model of the Spring Data Elastics
 
 | Spring Data Release Train | Spring Data OpenSearch | Spring Data Elasticsearch | OpenSearch Server | OpenSearch Client | Spring Framework | Spring Boot   |
 |---------------------------|------------------------|---------------------------|-------------------|-------------------|------------------|---------------|
+| 2025.1                    | 2.0.x                  | 6.0.x                     | 1.x / 2.x         | 2.10.x and above  | 7.0.x            | 3.5.x         |
 | 2024.1                    | 1.6.x                  | 5.4.x                     | 1.x / 2.x         | 2.10.x and above  | 6.2.x            | 3.4.x         |
 | 2024.0                    | 1.5.x                  | 5.3.x                     | 1.x / 2.x         | 2.10.x and above  | 6.1.x            | 3.2.x / 3.3.x |
 | 2023.1 (Vaughan)          | 1.4.x                  | 5.2.x                     | 1.x / 2.x         | 2.10.x and above  | 6.1.x            | 3.2.x         |

settings.gradle.kts

@@ -14,10 +14,10 @@ dependencyResolutionManagement {
     }
 
     create("springLibs") {
-      version("spring", "6.2.2")
-      version("spring-boot", "3.4.2")
-      library("data-commons", "org.springframework.data:spring-data-commons:3.4.3")
-      library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.4.3")
+      version("spring", "7.0.0-M2")
+      version("spring-boot", "3.5.0-M2")
+      library("data-commons", "org.springframework.data:spring-data-commons:4.0.0-M1")
+      library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:6.0.0-M1")
       library("web", "org.springframework", "spring-web").versionRef("spring")
       library("context", "org.springframework", "spring-context").versionRef("spring")
       library("tx", "org.springframework", "spring-tx").versionRef("spring")
@@ -72,12 +72,18 @@ pluginManagement {
     maven {
       url = uri("https://repo.spring.io/release/")
     }
+    maven {
+      url = uri("https://repo.spring.io/milestone/")
+    }
   }
 }
 
 dependencyResolutionManagement {
   repositories {
     mavenCentral()
+    maven {
+      url = uri("https://repo.spring.io/milestone/")
+    }
   }
 }
 

spring-data-opensearch/src/test/java/org/springframework/data/elasticsearch/core/query/ElasticsearchPartQueryIntegrationTests.java

@@ -36,7 +36,7 @@
 import org.springframework.data.elasticsearch.repository.query.ElasticsearchQueryMethod;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.lang.Nullable;
 
 /**
@@ -648,7 +648,7 @@ private String getQueryString(String methodName, Class<?>[] parameterClasses, Ob
 		ElasticsearchQueryMethod queryMethod = new ElasticsearchQueryMethod(method,
 				new DefaultRepositoryMetadata(SampleRepository.class), new SpelAwareProxyProjectionFactory(),
 				operations.getElasticsearchConverter().getMappingContext());
-		ElasticsearchPartQuery partQuery = new ElasticsearchPartQuery(queryMethod, operations, QueryMethodEvaluationContextProvider.DEFAULT);
+		ElasticsearchPartQuery partQuery = new ElasticsearchPartQuery(queryMethod, operations, ValueExpressionDelegate.create());
 		Query query = partQuery.createQuery(parameters);
 		return buildQueryString(query, Book.class);
 	}

version.properties

@@ -1 +1 @@
-version=1.6.2
+version=2.0.0