From d250a5155a4470be31a3c9a0e9e64c2fe694f309 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 2 Aug 2023 00:56:50 +0200 Subject: [PATCH] Consistent dependency declarations --- spring-aop/spring-aop.gradle | 8 +-- spring-aspects/spring-aspects.gradle | 2 +- spring-beans/spring-beans.gradle | 12 ++-- .../spring-context-indexer.gradle | 2 +- .../spring-context-support.gradle | 6 +- spring-context/spring-context.gradle | 10 +-- spring-core-test/spring-core-test.gradle | 2 +- spring-core/spring-core.gradle | 40 ++++++------ spring-jdbc/spring-jdbc.gradle | 4 +- spring-jms/spring-jms.gradle | 2 +- spring-messaging/spring-messaging.gradle | 16 ++--- spring-orm/spring-orm.gradle | 2 +- spring-oxm/spring-oxm.gradle | 4 +- spring-r2dbc/spring-r2dbc.gradle | 4 +- spring-test/spring-test.gradle | 52 +++++++-------- spring-tx/spring-tx.gradle | 8 +-- spring-web/spring-web.gradle | 64 +++++++++---------- spring-webflux/spring-webflux.gradle | 42 ++++++------ spring-webmvc/spring-webmvc.gradle | 34 +++++----- spring-websocket/spring-websocket.gradle | 10 +-- 20 files changed, 162 insertions(+), 162 deletions(-) diff --git a/spring-aop/spring-aop.gradle b/spring-aop/spring-aop.gradle index 8040138847..461d933be4 100644 --- a/spring-aop/spring-aop.gradle +++ b/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"))) } diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle index b9ebcf86e0..f6922f0387 100644 --- a/spring-aspects/spring-aspects.gradle +++ b/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"))) diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle index 93af8f50c7..fdd14304bd 100644 --- a/spring-beans/spring-beans.gradle +++ b/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") -} \ No newline at end of file + testFixturesImplementation("org.assertj:assertj-core") + testImplementation(project(":spring-core-test")) + testImplementation(testFixtures(project(":spring-core"))) + testImplementation("jakarta.annotation:jakarta.annotation-api") +} diff --git a/spring-context-indexer/spring-context-indexer.gradle b/spring-context-indexer/spring-context-indexer.gradle index 40d69a2267..a0f311ee6d 100644 --- a/spring-context-indexer/spring-context-indexer.gradle +++ b/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") } diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle index 160f802898..715b922b68 100644 --- a/spring-context-support/spring-context-support.gradle +++ b/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") } diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle index 081a7e12ba..49bd23ea22 100644 --- a/spring-context/spring-context.gradle +++ b/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") } diff --git a/spring-core-test/spring-core-test.gradle b/spring-core-test/spring-core-test.gradle index f99d419849..55f2a8b8f4 100644 --- a/spring-core-test/spring-core-test.gradle +++ b/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") diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle index 494db8b44f..a96bd47ebc 100644 --- a/spring-core/spring-core.gradle +++ b/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 { diff --git a/spring-jdbc/spring-jdbc.gradle b/spring-jdbc/spring-jdbc.gradle index 7cd5b9eea7..417e1dab5a 100644 --- a/spring-jdbc/spring-jdbc.gradle +++ b/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"))) diff --git a/spring-jms/spring-jms.gradle b/spring-jms/spring-jms.gradle index 6757f90eca..8765036146 100644 --- a/spring-jms/spring-jms.gradle +++ b/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") diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle index ea6016ef14..6f50cf5989 100644 --- a/spring-messaging/spring-messaging.gradle +++ b/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")) } diff --git a/spring-orm/spring-orm.gradle b/spring-orm/spring-orm.gradle index c2c5a4afc9..d8b718b9f7 100644 --- a/spring-orm/spring-orm.gradle +++ b/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"))) diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle index 0778059690..456a8dbcc7 100644 --- a/spring-oxm/spring-oxm.gradle +++ b/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") { diff --git a/spring-r2dbc/spring-r2dbc.gradle b/spring-r2dbc/spring-r2dbc.gradle index 75611a947e..21b864e523 100644 --- a/spring-r2dbc/spring-r2dbc.gradle +++ b/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") { diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index fd54a7a795..3de24caf76 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -25,20 +25,23 @@ 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" @@ -46,45 +49,42 @@ dependencies { 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 diff --git a/spring-tx/spring-tx.gradle b/spring-tx/spring-tx.gradle index 17c9ce146a..6db53d15a7 100644 --- a/spring-tx/spring-tx.gradle +++ b/spring-tx/spring-tx.gradle @@ -7,12 +7,12 @@ dependencies { api(project(":spring-core")) optional(project(":spring-aop")) optional(project(":spring-context")) // for JCA, @EnableTransactionManagement + optional("io.projectreactor:reactor-core") + optional("io.vavr:vavr") optional("jakarta.ejb:jakarta.ejb-api") optional("jakarta.interceptor:jakarta.interceptor-api") optional("jakarta.resource:jakarta.resource-api") optional("jakarta.transaction:jakarta.transaction-api") - optional("io.projectreactor:reactor-core") - optional("io.vavr:vavr") optional("org.jetbrains.kotlin:kotlin-reflect") optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.jetbrains.kotlinx:kotlinx-coroutines-core") @@ -21,8 +21,8 @@ dependencies { testImplementation(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-context"))) testImplementation(testFixtures(project(":spring-core"))) - testImplementation("org.aspectj:aspectjweaver") testImplementation("org.apache.groovy:groovy") - testImplementation("jakarta.persistence:jakarta.persistence-api") + testImplementation("org.aspectj:aspectjweaver") testImplementation("io.projectreactor:reactor-test") + testImplementation("jakarta.persistence:jakarta.persistence-api") } diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 50b88bd1f0..10a4f0aaaa 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -11,13 +11,17 @@ dependencies { optional(project(":spring-aop")) optional(project(":spring-context")) optional(project(":spring-oxm")) - optional("jakarta.servlet:jakarta.servlet-api") - optional("jakarta.servlet.jsp:jakarta.servlet.jsp-api") - optional("jakarta.el:jakarta.el-api") - optional("jakarta.faces:jakarta.faces-api") - optional("jakarta.json.bind:jakarta.json.bind-api") - optional("jakarta.validation:jakarta.validation-api") - optional("jakarta.xml.bind:jakarta.xml.bind-api") + optional("com.fasterxml:aalto-xml") + optional("com.fasterxml.jackson.core:jackson-databind") + optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor") + optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile") + optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml") + optional("com.fasterxml.woodstox:woodstox-core") + optional("com.google.code.gson:gson") + optional("com.google.protobuf:protobuf-java-util") + optional("com.googlecode.protobuf-java-format:protobuf-java-format") + optional("com.rometools:rome") + optional("com.squareup.okhttp3:okhttp") optional("io.reactivex.rxjava3:rxjava") optional("io.netty:netty-buffer") optional("io.netty:netty-handler") @@ -30,6 +34,14 @@ dependencies { optional("io.projectreactor.netty:reactor-netty-http") optional("io.projectreactor.netty:reactor-netty5-http") optional("io.undertow:undertow-core") + optional("jakarta.el:jakarta.el-api") + optional("jakarta.faces:jakarta.faces-api") + optional("jakarta.json.bind:jakarta.json.bind-api") + optional("jakarta.servlet:jakarta.servlet-api") + optional("jakarta.servlet.jsp:jakarta.servlet.jsp-api") + optional("jakarta.validation:jakarta.validation-api") + optional("jakarta.xml.bind:jakarta.xml.bind-api") + optional("org.apache.groovy:groovy") optional("org.apache.httpcomponents.client5:httpclient5") optional("org.apache.httpcomponents.core5:httpcore5-reactive") optional("org.apache.tomcat.embed:tomcat-embed-core") @@ -47,55 +59,43 @@ dependencies { exclude group: "org.eclipse.jetty", module: "jetty-server" exclude group: "org.eclipse.jetty", module: "jetty-servlet" } - optional("com.squareup.okhttp3:okhttp") - optional("com.fasterxml.woodstox:woodstox-core") - optional("com.fasterxml:aalto-xml") - optional("com.fasterxml.jackson.core:jackson-databind") - optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml") - optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile") - optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor") - optional("com.google.code.gson:gson") - optional("com.google.protobuf:protobuf-java-util") - optional("com.googlecode.protobuf-java-format:protobuf-java-format") - optional("com.rometools:rome") - optional("org.apache.groovy:groovy") optional("org.jetbrains.kotlin:kotlin-reflect") optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") optional("org.jetbrains.kotlinx:kotlinx-serialization-cbor") optional("org.jetbrains.kotlinx:kotlinx-serialization-json") optional("org.jetbrains.kotlinx:kotlinx-serialization-protobuf") + testFixturesApi("jakarta.servlet:jakarta.servlet-api") + testFixturesApi("org.junit.jupiter:junit-jupiter-api") + testFixturesApi("org.junit.jupiter:junit-jupiter-params") + testFixturesImplementation("io.projectreactor:reactor-test") + testFixturesImplementation("org.assertj:assertj-core") + testFixturesImplementation("org.bouncycastle:bcpkix-jdk18on") { + because("needed by Netty's SelfSignedCertificate on JDK 15+") + } + testFixturesImplementation("org.eclipse.jetty.websocket:websocket-jetty-server") testImplementation(project(":spring-core-test")) testImplementation(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-context"))) testImplementation(testFixtures(project(":spring-core"))) - testImplementation("io.projectreactor:reactor-test") testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8") testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin") + testImplementation("com.squareup.okhttp3:mockwebserver") + testImplementation("io.micrometer:micrometer-observation-test") + testImplementation("io.projectreactor:reactor-test") + testImplementation("io.projectreactor.tools:blockhound") testImplementation("org.apache.tomcat:tomcat-util") testImplementation("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.eclipse.jetty:jetty-server") testImplementation("org.eclipse.jetty:jetty-servlet") - testImplementation("com.squareup.okhttp3:mockwebserver") testImplementation("org.jetbrains.kotlin:kotlin-reflect") testImplementation("org.skyscreamer:jsonassert") testImplementation("org.xmlunit:xmlunit-assertj") testImplementation("org.xmlunit:xmlunit-matchers") - testImplementation("io.projectreactor.tools:blockhound") - testImplementation("io.micrometer:micrometer-observation-test") testRuntimeOnly("com.sun.mail:jakarta.mail") testRuntimeOnly("com.sun.xml.bind:jaxb-core") testRuntimeOnly("com.sun.xml.bind:jaxb-impl") testRuntimeOnly("jakarta.json:jakarta.json-api") testRuntimeOnly("org.eclipse:yasson") - testFixturesApi("jakarta.servlet:jakarta.servlet-api") - testFixturesApi("org.junit.jupiter:junit-jupiter-api") - testFixturesApi("org.junit.jupiter:junit-jupiter-params") - testFixturesImplementation("io.projectreactor:reactor-test") - testFixturesImplementation("org.assertj:assertj-core") - testFixturesImplementation("org.bouncycastle:bcpkix-jdk18on") { - because("needed by Netty's SelfSignedCertificate on JDK 15+") - } - testFixturesImplementation("org.eclipse.jetty.websocket:websocket-jetty-server") } diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index 77cbf81f29..2fc429ffdb 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -10,58 +10,58 @@ dependencies { api("io.projectreactor:reactor-core") optional(project(":spring-context")) optional(project(":spring-context-support")) // for FreeMarker support - optional("jakarta.servlet:jakarta.servlet-api") - optional("jakarta.websocket:jakarta.websocket-api") - optional("jakarta.websocket:jakarta.websocket-client-api") - optional("org.webjars:webjars-locator-core") - optional("org.freemarker:freemarker") optional("com.fasterxml.jackson.core:jackson-databind") optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile") + optional("com.google.protobuf:protobuf-java-util") optional("io.projectreactor.netty:reactor-netty-http") optional("io.projectreactor.netty:reactor-netty5-http") + optional("io.undertow:undertow-websockets-jsr") + optional("jakarta.servlet:jakarta.servlet-api") + optional("jakarta.websocket:jakarta.websocket-api") + optional("jakarta.websocket:jakarta.websocket-client-api") optional("org.apache.tomcat:tomcat-websocket") { exclude group: "org.apache.tomcat", module: "tomcat-servlet-api" exclude group: "org.apache.tomcat", module: "tomcat-websocket-api" } + optional("org.eclipse.jetty.websocket:websocket-jetty-client") optional("org.eclipse.jetty.websocket:websocket-jetty-server") { exclude group: "jakarta.servlet", module: "jakarta.servlet-api" } - optional("org.eclipse.jetty.websocket:websocket-jetty-client") - optional("io.undertow:undertow-websockets-jsr") + optional("org.freemarker:freemarker") optional("org.jetbrains.kotlin:kotlin-reflect") optional("org.jetbrains.kotlin:kotlin-stdlib") - optional("com.google.protobuf:protobuf-java-util") optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") + optional("org.webjars:webjars-locator-core") testImplementation(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-web"))) - testImplementation("jakarta.xml.bind:jakarta.xml.bind-api") testImplementation("com.fasterxml:aalto-xml") - testImplementation("org.hibernate:hibernate-validator") - testImplementation("jakarta.validation:jakarta.validation-api") - testImplementation("io.reactivex.rxjava3:rxjava") - testImplementation("io.projectreactor:reactor-test") + testImplementation("com.squareup.okhttp3:mockwebserver") testImplementation("io.micrometer:micrometer-observation-test") + testImplementation("io.projectreactor:reactor-test") + testImplementation("io.reactivex.rxjava3:rxjava") testImplementation("io.undertow:undertow-core") + testImplementation("jakarta.xml.bind:jakarta.xml.bind-api") + testImplementation("jakarta.validation:jakarta.validation-api") testImplementation("org.apache.httpcomponents.client5:httpclient5") testImplementation("org.apache.httpcomponents.core5:httpcore5-reactive") - testImplementation("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.apache.tomcat:tomcat-util") + testImplementation("org.apache.tomcat.embed:tomcat-embed-core") + testImplementation("org.eclipse.jetty:jetty-reactive-httpclient") testImplementation("org.eclipse.jetty:jetty-server") testImplementation("org.eclipse.jetty:jetty-servlet") - testImplementation("org.eclipse.jetty:jetty-reactive-httpclient") - testImplementation("com.squareup.okhttp3:mockwebserver") + testImplementation("org.hibernate:hibernate-validator") testImplementation("org.jetbrains.kotlin:kotlin-script-runtime") testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json") - testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jsr223") - testRuntimeOnly("org.jruby:jruby") - testRuntimeOnly("org.python:jython-standalone") - testRuntimeOnly("org.webjars:underscorejs") - testRuntimeOnly("org.glassfish:jakarta.el") testRuntimeOnly("com.sun.xml.bind:jaxb-core") testRuntimeOnly("com.sun.xml.bind:jaxb-impl") testRuntimeOnly("com.sun.activation:jakarta.activation") testRuntimeOnly("io.netty:netty5-buffer") + testRuntimeOnly("org.glassfish:jakarta.el") + testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jsr223") + testRuntimeOnly("org.jruby:jruby") + testRuntimeOnly("org.python:jython-standalone") + testRuntimeOnly("org.webjars:underscorejs") } test { diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index 3e751d2e5b..f51f5eb53a 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -38,18 +38,15 @@ dependencies { optional("org.reactivestreams:reactive-streams") optional("org.webjars:webjars-locator-core") testImplementation(testFixtures(project(":spring-beans"))) - testImplementation(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-context"))) + testImplementation(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-web"))) - testImplementation("jakarta.servlet:jakarta.servlet-api") - testImplementation("org.eclipse.jetty:jetty-servlet") { - exclude group: "jakarta.servlet", module: "jakarta.servlet-api" - } - testImplementation("org.eclipse.jetty:jetty-server") { - exclude group: "jakarta.servlet", module: "jakarta.servlet-api" - } testImplementation("commons-io:commons-io") - testImplementation("org.mozilla:rhino") + testImplementation("io.projectreactor:reactor-core") + testImplementation("io.reactivex.rxjava3:rxjava") + testImplementation("jakarta.servlet:jakarta.servlet-api") + testImplementation("jakarta.validation:jakarta.validation-api") + testImplementation("jaxen:jaxen") testImplementation("org.dom4j:dom4j") { exclude group: "javax.xml.bind", module: "jaxb-api" exclude group: "jaxen", module: "jaxen" @@ -57,22 +54,25 @@ dependencies { exclude group: "pull-parser", module: "pull-parser" exclude group: "xpp3", module: "xpp3" } - testImplementation("io.projectreactor:reactor-core") - testImplementation("io.reactivex.rxjava3:rxjava") - testImplementation("jakarta.validation:jakarta.validation-api") - testImplementation("jaxen:jaxen") + testImplementation("org.eclipse.jetty:jetty-server") { + exclude group: "jakarta.servlet", module: "jakarta.servlet-api" + } + testImplementation("org.eclipse.jetty:jetty-servlet") { + exclude group: "jakarta.servlet", module: "jakarta.servlet-api" + } testImplementation("org.hibernate:hibernate-validator") testImplementation("org.jetbrains.kotlin:kotlin-script-runtime") + testImplementation("org.mozilla:rhino") testImplementation("org.skyscreamer:jsonassert") testImplementation("org.xmlunit:xmlunit-assertj") testImplementation("org.xmlunit:xmlunit-matchers") + testRuntimeOnly("com.sun.activation:jakarta.activation") + testRuntimeOnly("com.sun.xml.bind:jaxb-core") + testRuntimeOnly("com.sun.xml.bind:jaxb-impl") testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5") + testRuntimeOnly("org.glassfish:jakarta.el") testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jsr223") testRuntimeOnly("org.jruby:jruby") testRuntimeOnly("org.python:jython-standalone") testRuntimeOnly("org.webjars:underscorejs") - testRuntimeOnly("org.glassfish:jakarta.el") - testRuntimeOnly("com.sun.xml.bind:jaxb-core") - testRuntimeOnly("com.sun.xml.bind:jaxb-impl") - testRuntimeOnly("com.sun.activation:jakarta.activation") } diff --git a/spring-websocket/spring-websocket.gradle b/spring-websocket/spring-websocket.gradle index 333a9a5c98..20f466748e 100644 --- a/spring-websocket/spring-websocket.gradle +++ b/spring-websocket/spring-websocket.gradle @@ -6,6 +6,9 @@ dependencies { api(project(":spring-web")) optional(project(":spring-messaging")) optional(project(":spring-webmvc")) + optional("com.fasterxml.jackson.core:jackson-databind") + optional("io.undertow:undertow-servlet") + optional("io.undertow:undertow-websockets-jsr") optional("jakarta.servlet:jakarta.servlet-api") optional("jakarta.websocket:jakarta.websocket-api") optional("jakarta.websocket:jakarta.websocket-client-api") @@ -13,7 +16,6 @@ dependencies { exclude group: "org.apache.tomcat", module: "tomcat-servlet-api" exclude group: "org.apache.tomcat", module: "tomcat-websocket-api" } - optional("org.glassfish.tyrus:tyrus-container-servlet") optional("org.eclipse.jetty:jetty-webapp") { exclude group: "jakarta.servlet", module: "jakarta.servlet-api" } @@ -22,12 +24,10 @@ dependencies { } optional("org.eclipse.jetty.websocket:websocket-jetty-client") optional("org.eclipse.jetty:jetty-client") - optional("io.undertow:undertow-servlet") - optional("io.undertow:undertow-websockets-jsr") - optional("com.fasterxml.jackson.core:jackson-databind") + optional("org.glassfish.tyrus:tyrus-container-servlet") testImplementation(testFixtures(project(":spring-core"))) testImplementation(testFixtures(project(":spring-web"))) + testImplementation("io.projectreactor.netty:reactor-netty-http") testImplementation("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.apache.tomcat.embed:tomcat-embed-websocket") - testImplementation("io.projectreactor.netty:reactor-netty-http") }