From adb303e152760adfefa6019d8225983e59a6ec45 Mon Sep 17 00:00:00 2001 From: Rob Winch <362503+rwinch@users.noreply.github.com> Date: Mon, 17 Mar 2025 14:16:44 -0500 Subject: [PATCH] Add testRuntimeOnly junit-platform-launcher Closes gh-16755 --- acl/spring-security-acl.gradle | 1 + aspects/spring-security-aspects.gradle | 2 ++ buildSrc/build.gradle | 2 ++ .../test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle | 2 ++ .../resources/samples/showcase/sgbcs-core/sgbcs-core.gradle | 2 ++ cas/spring-security-cas.gradle | 2 ++ config/spring-security-config.gradle | 1 + core/spring-security-core.gradle | 1 + crypto/spring-security-crypto.gradle | 2 ++ data/spring-security-data.gradle | 2 ++ itest/context/spring-security-itest-context.gradle | 1 + .../spring-security-itest-ldap-embedded-apacheds-default.gradle | 2 ++ .../spring-security-itest-ldap-embedded-mode-apacheds.gradle | 2 ++ .../spring-security-itest-ldap-embedded-mode-unboundid.gradle | 2 ++ .../spring-security-itest-ldap-embedded-none.gradle | 2 ++ ...spring-security-itest-ldap-embedded-unboundid-default.gradle | 2 ++ itest/web/spring-security-itest-web.gradle | 1 + ldap/spring-security-ldap.gradle | 2 ++ messaging/spring-security-messaging.gradle | 1 + oauth2/oauth2-client/spring-security-oauth2-client.gradle | 1 + oauth2/oauth2-core/spring-security-oauth2-core.gradle | 2 ++ oauth2/oauth2-jose/spring-security-oauth2-jose.gradle | 2 ++ .../spring-security-oauth2-resource-server.gradle | 2 ++ rsocket/spring-security-rsocket.gradle | 2 ++ .../spring-security-saml2-service-provider.gradle | 2 ++ taglibs/spring-security-taglibs.gradle | 2 ++ test/spring-security-test.gradle | 2 ++ web/spring-security-web.gradle | 1 + 28 files changed, 48 insertions(+) diff --git a/acl/spring-security-acl.gradle b/acl/spring-security-acl.gradle index 976d8d42db..ec3d59bbe7 100644 --- a/acl/spring-security-acl.gradle +++ b/acl/spring-security-acl.gradle @@ -20,4 +20,5 @@ dependencies { testImplementation "org.springframework:spring-test" testRuntimeOnly 'org.hsqldb:hsqldb' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/aspects/spring-security-aspects.gradle b/aspects/spring-security-aspects.gradle index 4323430c3d..cffa8e5fb1 100644 --- a/aspects/spring-security-aspects.gradle +++ b/aspects/spring-security-aspects.gradle @@ -27,6 +27,8 @@ dependencies { testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" testAspect sourceSets.main.output + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } compileAspectj.ajcOptions.outxmlfile = "META-INF/aop.xml" diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index ab58495e72..48483f7438 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -95,6 +95,8 @@ dependencies { testImplementation 'org.mockito:mockito-core' testImplementation 'org.mockito:mockito-junit-jupiter' testImplementation libs.com.squareup.okhttp3.mockwebserver + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle b/buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle index 21103a8c56..900378df25 100644 --- a/buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle +++ b/buildSrc/src/test/resources/samples/showcase/sgbcs-api/sgbcs-api.gradle @@ -6,5 +6,7 @@ dependencies { implementation 'org.springframework:spring-core' testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.junit.jupiter:junit-jupiter-engine" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle b/buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle index d40d2e282a..2f854e790a 100644 --- a/buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle +++ b/buildSrc/src/test/resources/samples/showcase/sgbcs-core/sgbcs-core.gradle @@ -5,4 +5,6 @@ dependencies { optional 'ch.qos.logback:logback-classic' testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.junit.jupiter:junit-jupiter-engine" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/cas/spring-security-cas.gradle b/cas/spring-security-cas.gradle index cebebbc9be..cc5c13f604 100644 --- a/cas/spring-security-cas.gradle +++ b/cas/spring-security-cas.gradle @@ -22,4 +22,6 @@ dependencies { testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" testImplementation 'org.skyscreamer:jsonassert' + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index c517447e18..746f51ee38 100644 --- a/config/spring-security-config.gradle +++ b/config/spring-security-config.gradle @@ -115,6 +115,7 @@ dependencies { testImplementation libs.org.instancio.instancio.junit testRuntimeOnly 'org.hsqldb:hsqldb' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } def rncToXsd = tasks.named('rncToXsd', RncToXsd) diff --git a/core/spring-security-core.gradle b/core/spring-security-core.gradle index fd5857a20c..57db69789f 100644 --- a/core/spring-security-core.gradle +++ b/core/spring-security-core.gradle @@ -33,6 +33,7 @@ dependencies { testImplementation 'org.springframework:spring-test' testRuntimeOnly 'org.hsqldb:hsqldb' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } task springVersion(type: org.gradle.api.tasks.WriteProperties) { diff --git a/crypto/spring-security-crypto.gradle b/crypto/spring-security-crypto.gradle index 55aa092b80..78a8fd31d0 100644 --- a/crypto/spring-security-crypto.gradle +++ b/crypto/spring-security-crypto.gradle @@ -13,4 +13,6 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/data/spring-security-data.gradle b/data/spring-security-data.gradle index 3e915ef871..c3ed43972a 100644 --- a/data/spring-security-data.gradle +++ b/data/spring-security-data.gradle @@ -15,4 +15,6 @@ dependencies { testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + } diff --git a/itest/context/spring-security-itest-context.gradle b/itest/context/spring-security-itest-context.gradle index 15d323cc9f..c278418f74 100644 --- a/itest/context/spring-security-itest-context.gradle +++ b/itest/context/spring-security-itest-context.gradle @@ -22,6 +22,7 @@ dependencies { testRuntimeOnly project(':spring-security-config') testRuntimeOnly 'org.aspectj:aspectjweaver' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } System.setProperty('python.cachedir.skip', 'true') diff --git a/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle b/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle index 6384a03830..b48ab908a9 100644 --- a/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle +++ b/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle @@ -25,4 +25,6 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle b/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle index 6384a03830..b48ab908a9 100644 --- a/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle +++ b/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle @@ -25,4 +25,6 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle b/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle index 71f3f812c6..6f7a74ab7e 100644 --- a/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle +++ b/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle @@ -18,4 +18,6 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle b/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle index d620d50029..b2e77b3d2f 100644 --- a/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle +++ b/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle @@ -17,4 +17,6 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle b/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle index 71f3f812c6..6f7a74ab7e 100644 --- a/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle +++ b/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle @@ -18,4 +18,6 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/itest/web/spring-security-itest-web.gradle b/itest/web/spring-security-itest-web.gradle index 4a82c48b07..d8fe2583a2 100644 --- a/itest/web/spring-security-itest-web.gradle +++ b/itest/web/spring-security-itest-web.gradle @@ -25,6 +25,7 @@ dependencies { testRuntimeOnly project(':spring-security-config') testRuntimeOnly project(':spring-security-ldap') + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } integrationTest { diff --git a/ldap/spring-security-ldap.gradle b/ldap/spring-security-ldap.gradle index c4f6c082ed..bd9f52a8a9 100644 --- a/ldap/spring-security-ldap.gradle +++ b/ldap/spring-security-ldap.gradle @@ -35,6 +35,8 @@ dependencies { testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" testImplementation 'org.skyscreamer:jsonassert' + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } integrationTest { diff --git a/messaging/spring-security-messaging.gradle b/messaging/spring-security-messaging.gradle index 64435e64dd..8b63a7903f 100644 --- a/messaging/spring-security-messaging.gradle +++ b/messaging/spring-security-messaging.gradle @@ -27,4 +27,5 @@ dependencies { testImplementation "ch.qos.logback:logback-classic" testRuntimeOnly 'org.hsqldb:hsqldb' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/oauth2/oauth2-client/spring-security-oauth2-client.gradle b/oauth2/oauth2-client/spring-security-oauth2-client.gradle index 9231fc2c22..7195255323 100644 --- a/oauth2/oauth2-client/spring-security-oauth2-client.gradle +++ b/oauth2/oauth2-client/spring-security-oauth2-client.gradle @@ -33,6 +33,7 @@ dependencies { testImplementation "org.springframework:spring-test" testRuntimeOnly 'org.hsqldb:hsqldb' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' provided 'jakarta.servlet:jakarta.servlet-api' } diff --git a/oauth2/oauth2-core/spring-security-oauth2-core.gradle b/oauth2/oauth2-core/spring-security-oauth2-core.gradle index 9fb4449b52..c163adfcca 100644 --- a/oauth2/oauth2-core/spring-security-oauth2-core.gradle +++ b/oauth2/oauth2-core/spring-security-oauth2-core.gradle @@ -17,4 +17,6 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle b/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle index 3f449f18e6..0397cfafd9 100644 --- a/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle +++ b/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle @@ -23,4 +23,6 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle b/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle index 69e705766b..ddcd1318fa 100644 --- a/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle +++ b/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle @@ -26,4 +26,6 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/rsocket/spring-security-rsocket.gradle b/rsocket/spring-security-rsocket.gradle index 04950bb290..6560a2f0b6 100644 --- a/rsocket/spring-security-rsocket.gradle +++ b/rsocket/spring-security-rsocket.gradle @@ -14,4 +14,6 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle b/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle index bc6fedd828..14a60dd03d 100644 --- a/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle +++ b/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle @@ -24,4 +24,6 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/taglibs/spring-security-taglibs.gradle b/taglibs/spring-security-taglibs.gradle index 587e83ffa7..93471a698f 100644 --- a/taglibs/spring-security-taglibs.gradle +++ b/taglibs/spring-security-taglibs.gradle @@ -24,6 +24,8 @@ dependencies { testImplementation "org.mockito:mockito-core" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } configure(project.tasks.withType(Test)) { diff --git a/test/spring-security-test.gradle b/test/spring-security-test.gradle index 15d07dd367..066e454269 100644 --- a/test/spring-security-test.gradle +++ b/test/spring-security-test.gradle @@ -32,4 +32,6 @@ dependencies { testImplementation 'org.skyscreamer:jsonassert' testImplementation 'org.springframework:spring-webmvc' testImplementation 'org.springframework:spring-tx' + + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/web/spring-security-web.gradle b/web/spring-security-web.gradle index 77cf908f45..dce9dbb36d 100644 --- a/web/spring-security-web.gradle +++ b/web/spring-security-web.gradle @@ -39,4 +39,5 @@ dependencies { testImplementation 'com.squareup.okhttp3:mockwebserver' testRuntimeOnly 'org.hsqldb:hsqldb' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' }