Upgrade to Infinispan 15.0.0.Final

Closes spring-projectsgh-40017
making · Mar 19, 2024 · c2adcd7 · c2adcd7
1 parent 53f8504
commit c2adcd7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle
@@ -106,17 +106,11 @@ dependencies {
 	optional("org.hibernate.orm:hibernate-core")
 	optional("org.hibernate.orm:hibernate-jcache")
 	optional("org.hibernate.validator:hibernate-validator")
-	optional("org.infinispan:infinispan-commons-jakarta")
+	optional("org.infinispan:infinispan-commons")
 	optional("org.infinispan:infinispan-component-annotations")
-	optional("org.infinispan:infinispan-core-jakarta")
-	optional("org.infinispan:infinispan-jcache") {
-		exclude group: "org.infinispan", module: "infinispan-commons"
-		exclude group: "org.infinispan", module: "infinispan-core"
-	}
-	optional("org.infinispan:infinispan-spring5-embedded") {
-		exclude group: "org.infinispan", module: "infinispan-commons"
-		exclude group: "org.infinispan", module: "infinispan-core"
-	}
+	optional("org.infinispan:infinispan-core")
+	optional("org.infinispan:infinispan-jcache")
+	optional("org.infinispan:infinispan-spring6-embedded")
 	optional("org.influxdb:influxdb-java")
 	optional("org.jooq:jooq") {
 		exclude group: "javax.xml.bind", module: "jaxb-api"

diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -602,7 +602,7 @@ bom {
 			]
 		}
 	}
-	library("Infinispan", "14.0.26.Final") {
+	library("Infinispan", "15.0.0.Final") {
 		group("org.infinispan") {
 			imports = [
 				"infinispan-bom"

diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle
@@ -43,18 +43,10 @@ dependencies {
 
 	infinispan(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
 	infinispan("javax.cache:cache-api")
-	infinispan("org.infinispan:infinispan-commons-jakarta")
+	infinispan("org.infinispan:infinispan-commons")
 	infinispan("org.infinispan:infinispan-component-annotations")
-	infinispan("org.infinispan:infinispan-core-jakarta")
+	infinispan("org.infinispan:infinispan-core")
 	infinispan("org.infinispan:infinispan-jcache")
-	modules {
-		module("org.inifinispan:infinispan-commons") {
-			replacedBy("org.infinispan:infinispan-commons-jakarta", "Java EE 9 baseline")
-		}
-		module("org.inifinispan:infinispan-core") {
-			replacedBy("org.infinispan:infinispan-core-jakarta", "Java EE 9 baseline")
-		}
-	}
 
 	redisTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent")))
 	redisTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis"))