Merge branch '2.5.x'

Closes gh-28337

spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/build.gradle

@@ -6,12 +6,8 @@ description = "Starter for JMS messaging using Apache Artemis"
 
 dependencies {
 	api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
-	api("jakarta.jms:jakarta.jms-api")
-	api("jakarta.json:jakarta.json-api")
 	api("org.springframework:spring-jms")
 	api("org.apache.activemq:artemis-jms-client") {
 		exclude group: "commons-logging", module: "commons-logging"
-		exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_2.0_spec"
-		exclude group: "org.apache.geronimo.specs", module: "geronimo-json_1.0_spec"
 	}
 }

spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra-reactive/build.gradle

@@ -7,8 +7,6 @@ description = "Starter for using Cassandra distributed database and Spring Data
 dependencies {
 	api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
 	api("org.springframework:spring-tx")
-	api("org.springframework.data:spring-data-cassandra") {
-		exclude group: "org.slf4j", module: "jcl-over-slf4j"
-	}
+	api("org.springframework.data:spring-data-cassandra")
 	api("io.projectreactor:reactor-core")
 }

spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra/build.gradle

@@ -7,7 +7,5 @@ description = "Starter for using Cassandra distributed database and Spring Data
 dependencies {
 	api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
 	api("org.springframework:spring-tx")
-	api("org.springframework.data:spring-data-cassandra") {
-		exclude group: "org.slf4j", module: "jcl-over-slf4j"
-	}
+	api("org.springframework.data:spring-data-cassandra")
 }

spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle

@@ -8,7 +8,5 @@ dependencies {
 	api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
 	api("io.projectreactor:reactor-core")
 	api("io.reactivex:rxjava-reactive-streams")
-	api("org.springframework.data:spring-data-couchbase") {
-		exclude group: "com.couchbase.client", module: "encryption"
-	}
+	api("org.springframework.data:spring-data-couchbase")
 }

spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/build.gradle

@@ -6,7 +6,5 @@ description = "Starter for using Couchbase document-oriented database and Spring
 
 dependencies {
 	api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
-	api("org.springframework.data:spring-data-couchbase") {
-		exclude group: "com.couchbase.client", module: "encryption"
-	}
+	api("org.springframework.data:spring-data-couchbase")
 }

spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/build.gradle

@@ -15,8 +15,6 @@ dependencies {
 		exclude group: "javax.xml.bind", module: "jaxb-api"
 		exclude group: "org.jboss.spec.javax.transaction", module: "jboss-transaction-api_1.2_spec"
 	}
-	api("org.springframework.data:spring-data-jpa") {
-		exclude group: "org.aspectj", module: "aspectjrt"
-	}
+	api("org.springframework.data:spring-data-jpa")
 	api("org.springframework:spring-aspects")
 }

spring-boot-project/spring-boot-starters/spring-boot-starter-test/build.gradle

@@ -18,7 +18,5 @@ dependencies {
 	api("org.skyscreamer:jsonassert")
 	api("org.springframework:spring-core")
 	api("org.springframework:spring-test")
-	api("org.xmlunit:xmlunit-core") {
-		exclude group: "javax.xml.bind", module: "jaxb-api"
-	}
+	api("org.xmlunit:xmlunit-core")
 }