Spring Data Elasticsearch 6.0 baseline

reta · reta · commit f8e60af32d2d · 2025-06-27T08:10:24.000-04:00
Signed-off-by: Andriy Redko &lt;drreta@gmail.com&gt;
diff --git a/README.md b/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                    | 3.0.x                  | 6.0.x                     | 1.x / 2.x / 3.x   | 2.10.x and above  | 7.0.x            | 3.5.x         |
 | 2025.0                    | 1.8.x                  | 5.5.x                     | 1.x / 2.x / 3.x   | 2.10.x and above  | 6.2.x            | 3.5.x         |
 | 2025.0                    | 1.7.x                  | 5.5.x                     | 1.x / 2.x / 3.x   | 2.10.x and above  | 6.2.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         |
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,10 +16,10 @@ dependencyResolutionManagement {
     }
 
     create("springLibs") {
-      version("spring", "6.2.8")
+      version("spring", "7.0.0-M6")
       version("spring-boot", "3.5.3")
-      library("data-commons", "org.springframework.data:spring-data-commons:3.5.1")
-      library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.1")
+      library("data-commons", "org.springframework.data:spring-data-commons:4.0.0-M3")
+      library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:6.0.0-M3")
       library("web", "org.springframework", "spring-web").versionRef("spring")
       library("webflux", "org.springframework", "spring-webflux").versionRef("spring")
       library("context", "org.springframework", "spring-context").versionRef("spring")
@@ -32,7 +32,7 @@ dependencyResolutionManagement {
       library("boot-test", "org.springframework.boot", "spring-boot-test").versionRef("spring-boot")
       library("boot-test-autoconfigure", "org.springframework.boot", "spring-boot-test-autoconfigure").versionRef("spring-boot")
       library("boot-testcontainers", "org.springframework.boot", "spring-boot-testcontainers").versionRef("spring-boot")
-      library("projectreactor", "io.projectreactor:reactor-test:3.7.7")
+      library("projectreactor", "io.projectreactor:reactor-test:3.8.0-M4")
       plugin("spring-boot", "org.springframework.boot").versionRef("spring-boot")
     }
     
@@ -77,12 +77,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/")
+    }
   }
 }
 
diff --git a/version.properties b/version.properties
@@ -1 +1 @@
-version=1.8.2
+version=3.0.0

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@ dependencyResolutionManagement {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`create("springLibs") {`
`19`		`- version("spring", "6.2.8")`
	`19`	`+ version("spring", "7.0.0-M6")`
`20`	`20`	`version("spring-boot", "3.5.3")`
`21`		`- library("data-commons", "org.springframework.data:spring-data-commons:3.5.1")`
`22`		`- library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:5.5.1")`
	`21`	`+ library("data-commons", "org.springframework.data:spring-data-commons:4.0.0-M3")`
	`22`	`+ library("data-elasticsearch", "org.springframework.data:spring-data-elasticsearch:6.0.0-M3")`
`23`	`23`	`library("web", "org.springframework", "spring-web").versionRef("spring")`
`24`	`24`	`library("webflux", "org.springframework", "spring-webflux").versionRef("spring")`
`25`	`25`	`library("context", "org.springframework", "spring-context").versionRef("spring")`
`@@ -32,7 +32,7 @@ dependencyResolutionManagement {`
`32`	`32`	`library("boot-test", "org.springframework.boot", "spring-boot-test").versionRef("spring-boot")`
`33`	`33`	`library("boot-test-autoconfigure", "org.springframework.boot", "spring-boot-test-autoconfigure").versionRef("spring-boot")`
`34`	`34`	`library("boot-testcontainers", "org.springframework.boot", "spring-boot-testcontainers").versionRef("spring-boot")`
`35`		`- library("projectreactor", "io.projectreactor:reactor-test:3.7.7")`
	`35`	`+ library("projectreactor", "io.projectreactor:reactor-test:3.8.0-M4")`
`36`	`36`	`plugin("spring-boot", "org.springframework.boot").versionRef("spring-boot")`
`37`	`37`	`}`
`38`	`38`
`@@ -77,12 +77,18 @@ pluginManagement {`
`77`	`77`	`maven {`
`78`	`78`	`url = uri("https://repo.spring.io/release/")`
`79`	`79`	`}`
	`80`	`+ maven {`
	`81`	`+ url = uri("https://repo.spring.io/milestone/")`
	`82`	`+ }`
`80`	`83`	`}`
`81`	`84`	`}`
`82`	`85`
`83`	`86`	`dependencyResolutionManagement {`
`84`	`87`	`repositories {`
`85`	`88`	`mavenCentral()`
	`89`	`+ maven {`
	`90`	`+ url = uri("https://repo.spring.io/milestone/")`
	`91`	`+ }`
`86`	`92`	`}`
`87`	`93`	`}`
`88`	`94`