Consistent dependency declarations

spring-aop/spring-aop.gradle

@@ -3,12 +3,12 @@ description = "Spring AOP"
 dependencies {
 	api(project(":spring-beans"))
 	api(project(":spring-core"))
-	optional("org.aspectj:aspectjweaver")
 	optional("org.apache.commons:commons-pool2")
-	testImplementation(project(":spring-core-test"))
-	testImplementation(testFixtures(project(":spring-beans")))
-	testImplementation(testFixtures(project(":spring-core")))
+	optional("org.aspectj:aspectjweaver")
 	testFixturesImplementation(testFixtures(project(":spring-beans")))
 	testFixturesImplementation(testFixtures(project(":spring-core")))
 	testFixturesImplementation("com.google.code.findbugs:jsr305")
+	testImplementation(project(":spring-core-test"))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
 }

spring-aspects/spring-aspects.gradle

@@ -32,8 +32,8 @@ dependencies {
 	optional(project(":spring-context-support"))  // for JavaMail and JSR-107 support
 	optional(project(":spring-orm"))  // for JPA exception translation support
 	optional(project(":spring-tx"))  // for JPA, @Transactional support
-	optional("javax.cache:cache-api")  // for JCache aspect
 	optional("jakarta.transaction:jakarta.transaction-api")  // for @jakarta.transaction.Transactional support
+	optional("javax.cache:cache-api")  // for JCache aspect
 	testImplementation(project(":spring-core"))  // for CodeStyleAspect
 	testImplementation(project(":spring-test"))
 	testImplementation(testFixtures(project(":spring-context")))

spring-beans/spring-beans.gradle

@@ -5,14 +5,14 @@ apply plugin: "kotlin"
 dependencies {
 	api(project(":spring-core"))
 	optional("jakarta.inject:jakarta.inject-api")
-	optional("org.yaml:snakeyaml")
 	optional("org.apache.groovy:groovy-xml")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
-	testImplementation(testFixtures(project(":spring-core")))
-	testImplementation(project(":spring-core-test"))
-	testImplementation("jakarta.annotation:jakarta.annotation-api")
+	optional("org.yaml:snakeyaml")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
-	testFixturesImplementation("org.assertj:assertj-core")
 	testFixturesImplementation("com.google.code.findbugs:jsr305")
-}
+	testFixturesImplementation("org.assertj:assertj-core")
+	testImplementation(project(":spring-core-test"))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("jakarta.annotation:jakarta.annotation-api")
+}

spring-context-indexer/spring-context-indexer.gradle

@@ -2,8 +2,8 @@ description = "Spring Context Indexer"
 
 dependencies {
 	testImplementation(project(":spring-context"))
-	testImplementation("jakarta.inject:jakarta.inject-api")
 	testImplementation("jakarta.annotation:jakarta.annotation-api")
+	testImplementation("jakarta.inject:jakarta.inject-api")
 	testImplementation("jakarta.persistence:jakarta.persistence-api")
 	testImplementation("jakarta.transaction:jakarta.transaction-api")
 }

spring-context-support/spring-context-support.gradle

@@ -12,6 +12,9 @@ dependencies {
 	optional("com.github.ben-manes.caffeine:caffeine")
 	optional("org.quartz-scheduler:quartz")
 	optional("org.freemarker:freemarker")
+	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
+	testFixturesImplementation("org.assertj:assertj-core")
+	testFixturesImplementation("org.mockito:mockito-core")
 	testImplementation(project(":spring-context"))
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-context")))
@@ -23,7 +26,4 @@ dependencies {
 	testRuntimeOnly("org.ehcache:ehcache")
 	testRuntimeOnly("org.glassfish:jakarta.el")
 	testRuntimeOnly("com.sun.mail:jakarta.mail")
-	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
-	testFixturesImplementation("org.assertj:assertj-core")
-	testFixturesImplementation("org.mockito:mockito-core")
 }

spring-context/spring-context.gradle

@@ -27,15 +27,19 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.reactivestreams:reactive-streams")
+	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
+	testFixturesImplementation(testFixtures(project(":spring-beans")))
+	testFixturesImplementation("com.google.code.findbugs:jsr305")
+	testFixturesImplementation("org.assertj:assertj-core")
 	testImplementation(project(":spring-core-test"))
 	testImplementation(testFixtures(project(":spring-aop")))
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation("io.projectreactor:reactor-core")
 	testImplementation("jakarta.inject:jakarta.inject-tck")
+	testImplementation("org.apache.commons:commons-pool2")
 	testImplementation("org.apache.groovy:groovy-jsr223")
 	testImplementation("org.apache.groovy:groovy-xml")
-	testImplementation("org.apache.commons:commons-pool2")
 	testImplementation("org.awaitility:awaitility")
 	testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	testRuntimeOnly("jakarta.xml.bind:jakarta.xml.bind-api")
@@ -44,8 +48,4 @@ dependencies {
 	testRuntimeOnly("org.glassfish.external:opendmk_jmxremote_optional_jar")
 	testRuntimeOnly("org.javamoney:moneta")
 	testRuntimeOnly("org.junit.vintage:junit-vintage-engine") // for @Inject TCK
-	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
-	testFixturesImplementation(testFixtures(project(":spring-beans")))
-	testFixturesImplementation("com.google.code.findbugs:jsr305")
-	testFixturesImplementation("org.assertj:assertj-core")
 }

spring-core-test/spring-core-test.gradle

@@ -2,8 +2,8 @@ description = "Spring Core Test"
 
 dependencies {
 	api(project(":spring-core"))
-	api("org.junit.jupiter:junit-jupiter-api")
 	api("org.assertj:assertj-core")
+	api("org.junit.jupiter:junit-jupiter-api")
 	compileOnly("org.junit.jupiter:junit-jupiter")
 	compileOnly("org.junit.platform:junit-platform-engine")
 	compileOnly("org.junit.platform:junit-platform-launcher")

spring-core/spring-core.gradle

@@ -63,37 +63,37 @@ dependencies {
 	api(project(":spring-jcl"))
 	compileOnly("io.projectreactor.tools:blockhound")
 	compileOnly("org.graalvm.sdk:graal-sdk")
+	optional("io.netty:netty-buffer")
+	optional("io.netty:netty5-buffer")
+	optional("io.projectreactor:reactor-core")
+	optional("io.reactivex.rxjava3:rxjava")
+	optional("io.smallrye.reactive:mutiny")
 	optional("net.sf.jopt-simple:jopt-simple")
 	optional("org.aspectj:aspectjweaver")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	optional("io.projectreactor:reactor-core")
-	optional("io.reactivex.rxjava3:rxjava")
-	optional("io.smallrye.reactive:mutiny")
-	optional("io.netty:netty-buffer")
-	optional("io.netty:netty5-buffer")
-	testImplementation("jakarta.annotation:jakarta.annotation-api")
-	testImplementation("jakarta.xml.bind:jakarta.xml.bind-api")
-	testImplementation("com.google.code.findbugs:jsr305")
-	testImplementation("com.fasterxml.woodstox:woodstox-core")
-	testImplementation("org.xmlunit:xmlunit-assertj")
-	testImplementation("org.xmlunit:xmlunit-matchers")
-	testImplementation("io.projectreactor:reactor-test")
-	testImplementation("io.projectreactor.tools:blockhound")
-	testImplementation("org.skyscreamer:jsonassert")
-	testImplementation("com.squareup.okhttp3:mockwebserver")
-	testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json")
-	testImplementation("com.fasterxml.jackson.core:jackson-databind")
-	testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	testFixturesImplementation("com.google.code.findbugs:jsr305")
+	testFixturesImplementation("io.projectreactor:reactor-test")
+	testFixturesImplementation("org.assertj:assertj-core")
 	testFixturesImplementation("org.junit.platform:junit-platform-launcher")
 	testFixturesImplementation("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation("org.junit.jupiter:junit-jupiter-params")
-	testFixturesImplementation("org.assertj:assertj-core")
 	testFixturesImplementation("org.xmlunit:xmlunit-assertj")
-	testFixturesImplementation("io.projectreactor:reactor-test")
+	testImplementation("com.fasterxml.jackson.core:jackson-databind")
+	testImplementation("com.fasterxml.woodstox:woodstox-core")
+	testImplementation("com.google.code.findbugs:jsr305")
+	testImplementation("com.squareup.okhttp3:mockwebserver")
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("io.projectreactor.tools:blockhound")
+	testImplementation("jakarta.annotation:jakarta.annotation-api")
+	testImplementation("jakarta.xml.bind:jakarta.xml.bind-api")
+	testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json")
+	testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
+	testImplementation("org.skyscreamer:jsonassert")
+	testImplementation("org.xmlunit:xmlunit-assertj")
+	testImplementation("org.xmlunit:xmlunit-matchers")
 }
 
 jar {

spring-jdbc/spring-jdbc.gradle

@@ -8,11 +8,11 @@ dependencies {
 	api(project(":spring-tx"))
 	optional(project(":spring-context"))  // for JndiDataSourceLookup
 	optional("jakarta.transaction:jakarta.transaction-api")
-	optional("org.hsqldb:hsqldb")
-	optional("com.h2database:h2")
 	optional("org.apache.derby:derby")
 	optional("org.apache.derby:derbyclient")
 	optional("org.apache.derby:derbytools")
+	optional("com.h2database:h2")
+	optional("org.hsqldb:hsqldb")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	testImplementation(testFixtures(project(":spring-beans")))

spring-jms/spring-jms.gradle

@@ -9,9 +9,9 @@ dependencies {
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))
 	optional(project(":spring-oxm"))
+	optional("com.fasterxml.jackson.core:jackson-databind")
 	optional("jakarta.resource:jakarta.resource-api")
 	optional("jakarta.transaction:jakarta.transaction-api")
-	optional("com.fasterxml.jackson.core:jackson-databind")
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-tx")))
 	testImplementation("jakarta.jms:jakarta.jms-api")

spring-messaging/spring-messaging.gradle

@@ -8,37 +8,37 @@ dependencies {
 	api(project(":spring-core"))
 	optional(project(":spring-context"))
 	optional(project(":spring-oxm"))
+	optional("com.fasterxml.jackson.core:jackson-databind")
+	optional("com.google.code.gson:gson")
+	optional("com.google.protobuf:protobuf-java-util")
 	optional("io.projectreactor.netty:reactor-netty-http")
 	optional("io.projectreactor.netty:reactor-netty5-http")
 	optional("io.rsocket:rsocket-core")
 	optional("io.rsocket:rsocket-transport-netty")
-	optional("com.fasterxml.jackson.core:jackson-databind")
-	optional("com.google.code.gson:gson")
 	optional("jakarta.json.bind:jakarta.json.bind-api")
 	optional("jakarta.xml.bind:jakarta.xml.bind-api")
-	optional("com.google.protobuf:protobuf-java-util")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	optional("org.jetbrains.kotlinx:kotlinx-serialization-json")
+	testImplementation(project(":spring-core-test"))
 	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("com.thoughtworks.xstream:xstream")
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("io.reactivex.rxjava3:rxjava")
 	testImplementation("jakarta.inject:jakarta.inject-tck")
 	testImplementation("jakarta.servlet:jakarta.servlet-api")
 	testImplementation("jakarta.validation:jakarta.validation-api")
-	testImplementation("com.thoughtworks.xstream:xstream")
 	testImplementation("org.apache.activemq:activemq-broker")
 	testImplementation("org.apache.activemq:activemq-kahadb-store")
 	testImplementation("org.apache.activemq:activemq-stomp")
-	testImplementation("io.projectreactor:reactor-test")
-	testImplementation("io.reactivex.rxjava3:rxjava")
 	testImplementation("org.jetbrains.kotlin:kotlin-reflect")
 	testImplementation("org.jetbrains.kotlin:kotlin-stdlib")
 	testImplementation("org.skyscreamer:jsonassert")
 	testImplementation("org.xmlunit:xmlunit-assertj")
 	testImplementation("org.xmlunit:xmlunit-matchers")
-	testImplementation(project(":spring-core-test"))
+	testRuntimeOnly(project(":spring-context"))
 	testRuntimeOnly("com.sun.activation:jakarta.activation")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
 	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
 	testRuntimeOnly("jakarta.json:jakarta.json-api")
 	testRuntimeOnly("org.eclipse:yasson")
-	testRuntimeOnly(project(":spring-context"))
 }

spring-orm/spring-orm.gradle

@@ -8,9 +8,9 @@ dependencies {
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))
 	optional(project(":spring-web"))
+	optional("jakarta.servlet:jakarta.servlet-api")
 	optional("org.eclipse.persistence:org.eclipse.persistence.jpa")
 	optional("org.hibernate:hibernate-core-jakarta")
-	optional("jakarta.servlet:jakarta.servlet-api")
 	testImplementation(project(":spring-core-test"))
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-context")))

spring-oxm/spring-oxm.gradle

@@ -17,9 +17,9 @@ sourceSets {
 dependencies {
 	api(project(":spring-beans"))
 	api(project(":spring-core"))
-	optional("jakarta.xml.bind:jakarta.xml.bind-api")
-	optional("jakarta.activation:jakarta.activation-api")
 	optional("com.thoughtworks.xstream:xstream")
+	optional("jakarta.activation:jakarta.activation-api")
+	optional("jakarta.xml.bind:jakarta.xml.bind-api")
 	testImplementation(project(":spring-context"))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation("org.codehaus.jettison:jettison") {

spring-r2dbc/spring-r2dbc.gradle

@@ -6,15 +6,15 @@ dependencies {
 	api(project(":spring-beans"))
 	api(project(":spring-core"))
 	api(project(":spring-tx"))
-	api("io.r2dbc:r2dbc-spi")
 	api("io.projectreactor:reactor-core")
+	api("io.r2dbc:r2dbc-spi")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	testImplementation(testFixtures(project(":spring-beans")))
-	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation("io.projectreactor:reactor-test")
 	testImplementation("io.r2dbc:r2dbc-h2")
 	testImplementation("io.r2dbc:r2dbc-spi-test") {

spring-test/spring-test.gradle

@@ -25,66 +25,66 @@ dependencies {
 	optional("jakarta.servlet:jakarta.servlet-api")
 	optional("jakarta.servlet.jsp:jakarta.servlet.jsp-api")
 	optional("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api")
-	optional("jakarta.xml.bind:jakarta.xml.bind-api")
 	optional("jakarta.websocket:jakarta.websocket-api")
 	optional("jakarta.websocket:jakarta.websocket-client-api")
+	optional("jakarta.xml.bind:jakarta.xml.bind-api")
 	optional("junit:junit")
-	optional("org.apache.tomcat.embed:tomcat-embed-core")
-	optional("org.junit.platform:junit-platform-launcher")  // for AOT processing
-	optional("org.junit.jupiter:junit-jupiter-api")
-	optional("org.testng:testng")
-	optional("org.aspectj:aspectjweaver")
-	optional("org.apache.groovy:groovy")
-	optional("org.hamcrest:hamcrest")
 	optional("net.sourceforge.htmlunit:htmlunit") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
+	optional("org.apache.groovy:groovy")
+	optional("org.apache.tomcat.embed:tomcat-embed-core")
+	optional("org.aspectj:aspectjweaver")
+	optional("org.hamcrest:hamcrest")
+	optional("org.jetbrains.kotlin:kotlin-reflect")
+	optional("org.jetbrains.kotlin:kotlin-stdlib")
+	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
+	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
+	optional("org.junit.jupiter:junit-jupiter-api")
+	optional("org.junit.platform:junit-platform-launcher")  // for AOT processing
 	optional("org.seleniumhq.selenium:htmlunit-driver") {
 		exclude group: "commons-logging", module: "commons-logging"
 		exclude group: "net.bytebuddy", module: "byte-buddy"
 	}
 	optional("org.seleniumhq.selenium:selenium-java") {
 		exclude group: "net.bytebuddy", module: "byte-buddy"
 	}
-	optional("org.xmlunit:xmlunit-matchers")
 	optional("org.skyscreamer:jsonassert")
-	optional("org.jetbrains.kotlin:kotlin-reflect")
-	optional("org.jetbrains.kotlin:kotlin-stdlib")
-	optional("org.jetbrains.kotlinx:kotlinx-coroutines-core")
-	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testImplementation(project(":spring-core-test"))
+	optional("org.testng:testng")
+	optional("org.xmlunit:xmlunit-matchers")
 	testImplementation(project(":spring-context-support"))
+	testImplementation(project(":spring-core-test"))
 	testImplementation(project(":spring-oxm"))
 	testImplementation(testFixtures(project(":spring-beans")))
 	testImplementation(testFixtures(project(":spring-context")))
 	testImplementation(testFixtures(project(":spring-core")))
 	testImplementation(testFixtures(project(":spring-tx")))
 	testImplementation(testFixtures(project(":spring-web")))
+	testImplementation("com.fasterxml.jackson.core:jackson-databind")
+	testImplementation("com.rometools:rome")
+	testImplementation("com.thoughtworks.xstream:xstream")
 	testImplementation("de.bechte.junit:junit-hierarchicalcontextrunner")
+	testImplementation("io.projectreactor.netty:reactor-netty-http")
 	testImplementation("jakarta.annotation:jakarta.annotation-api")
 	testImplementation("jakarta.ejb:jakarta.ejb-api")
 	testImplementation("jakarta.interceptor:jakarta.interceptor-api")
 	testImplementation("jakarta.mail:jakarta.mail-api")
 	testImplementation("jakarta.validation:jakarta.validation-api")
 	testImplementation("javax.cache:cache-api")
-	testImplementation("org.hibernate:hibernate-core-jakarta")
-	testImplementation("org.hibernate:hibernate-validator")
-	testImplementation("org.junit.platform:junit-platform-testkit")
-	testImplementation("com.fasterxml.jackson.core:jackson-databind")
-	testImplementation("com.thoughtworks.xstream:xstream")
-	testImplementation("com.rometools:rome")
-	testImplementation("org.hsqldb:hsqldb")
 	testImplementation("org.apache.httpcomponents:httpclient") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
-	testImplementation("io.projectreactor.netty:reactor-netty-http")
+	testImplementation("org.hibernate:hibernate-core-jakarta")
+	testImplementation("org.hibernate:hibernate-validator")
+	testImplementation("org.hsqldb:hsqldb")
+	testImplementation("org.junit.platform:junit-platform-testkit")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
+	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
+	testRuntimeOnly("org.glassfish:jakarta.el")
+	testRuntimeOnly("org.junit.support:testng-engine")
 	testRuntimeOnly("org.junit.vintage:junit-vintage-engine") {
 		exclude group: "junit", module: "junit"
 	}
-	testRuntimeOnly("org.junit.support:testng-engine")
-	testRuntimeOnly("org.glassfish:jakarta.el")
-	testRuntimeOnly("com.sun.xml.bind:jaxb-core")
-	testRuntimeOnly("com.sun.xml.bind:jaxb-impl")
 }
 
 // Prevent xml-apis from being used so that the corresponding XML APIs from