Merge branch '6.3.x' into 6.4.x

rwinch · rwinch · commit 05116eabbd3a · 2025-03-17T14:18:49.000-05:00
- adb303e Add testRuntimeOnly junit-platform-launcher Closes gh-16756
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -126,6 +126,7 @@ dependencies {
 	testImplementation libs.org.eclipse.jetty.jetty.servlet
 
 	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
@@ -40,6 +40,7 @@ dependencies {
 	testImplementation 'io.mockk:mockk'
 
 	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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -39,8 +39,10 @@ dependencies {
 	testImplementation "org.mockito:mockito-junit-jupiter"
 	testImplementation "org.springframework:spring-test"
 	testImplementation 'org.skyscreamer:jsonassert'
+
 	unboundid7 libs.com.unboundid.unboundid.ldapsdk7
 
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 integrationTest {
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -116,6 +116,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'
 }
 
 jar {
diff --git 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
@@ -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
@@ -65,4 +65,5 @@ dependencies {
 	testImplementation 'com.squareup.okhttp3:mockwebserver'
 
 	testRuntimeOnly 'org.hsqldb:hsqldb'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,5 @@ dependencies {`
`20`	`20`	`testImplementation "org.springframework:spring-test"`
`21`	`21`
`22`	`22`	`testRuntimeOnly 'org.hsqldb:hsqldb'`
	`23`	`+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ dependencies {`
`27`	`27`	`testImplementation "org.mockito:mockito-junit-jupiter"`
`28`	`28`	`testImplementation "org.springframework:spring-test"`
`29`	`29`	`testAspect sourceSets.main.output`
	`30`	`+`
	`31`	`+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`compileAspectj.ajcOptions.outxmlfile = "META-INF/aop.xml"`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ dependencies {`
`95`	`95`	`testImplementation 'org.mockito:mockito-core'`
`96`	`96`	`testImplementation 'org.mockito:mockito-junit-jupiter'`
`97`	`97`	`testImplementation libs.com.squareup.okhttp3.mockwebserver`
	`98`	`+`
	`99`	`+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'`
`98`	`100`	`}`
`99`	`101`
`100`	`102`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,7 @@ dependencies {`
`6`	`6`	`implementation 'org.springframework:spring-core'`
`7`	`7`	`testImplementation "org.junit.jupiter:junit-jupiter-api"`
`8`	`8`	`testImplementation "org.junit.jupiter:junit-jupiter-engine"`
	`9`	`+`
	`10`	`+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'`
`9`	`11`	`}`
`10`	`12`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,6 @@ dependencies {`
`5`	`5`	`optional 'ch.qos.logback:logback-classic'`
`6`	`6`	`testImplementation "org.junit.jupiter:junit-jupiter-api"`
`7`	`7`	`testImplementation "org.junit.jupiter:junit-jupiter-engine"`
	`8`	`+`
	`9`	`+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,6 @@ dependencies {`
`22`	`22`	`testImplementation "org.mockito:mockito-junit-jupiter"`
`23`	`23`	`testImplementation "org.springframework:spring-test"`
`24`	`24`	`testImplementation 'org.skyscreamer:jsonassert'`
	`25`	`+`
	`26`	`+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'`
`25`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ dependencies {`
`126`	`126`	`testImplementation libs.org.eclipse.jetty.jetty.servlet`
`127`	`127`
`128`	`128`	`testRuntimeOnly 'org.hsqldb:hsqldb'`
	`129`	`+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'`
`129`	`130`	`}`
`130`	`131`
`131`	`132`	`def rncToXsd = tasks.named('rncToXsd', RncToXsd)`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ dependencies {`
`40`	`40`	`testImplementation 'io.mockk:mockk'`
`41`	`41`
`42`	`42`	`testRuntimeOnly 'org.hsqldb:hsqldb'`
	`43`	`+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`task springVersion(type: org.gradle.api.tasks.WriteProperties) {`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,6 @@ dependencies {`
`13`	`13`	`testImplementation "org.mockito:mockito-core"`
`14`	`14`	`testImplementation "org.mockito:mockito-junit-jupiter"`
`15`	`15`	`testImplementation "org.springframework:spring-test"`
	`16`	`+`
	`17`	`+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,6 @@ dependencies {`
`15`	`15`	`testImplementation "org.mockito:mockito-junit-jupiter"`
`16`	`16`	`testImplementation "org.springframework:spring-test"`
`17`	`17`
	`18`	`+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'`
	`19`	`+`
`18`	`20`	`}`