From d6ff58bb7f2b42ef0eb1236e2fe1102f3253ebb5 Mon Sep 17 00:00:00 2001 From: Steve Riesenberg Date: Tue, 12 Sep 2023 12:19:56 -0500 Subject: [PATCH] Update Mockito to 5.5.0 Closes gh-13810 --- config/spring-security-config.gradle | 1 - core/spring-security-core.gradle | 1 - dependencies/spring-security-dependencies.gradle | 2 +- .../spring-security-saml2-service-provider.gradle | 1 - test/spring-security-test.gradle | 1 - web/spring-security-web.gradle | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index cd0a11b1a5..05dbc07057 100644 --- a/config/spring-security-config.gradle +++ b/config/spring-security-config.gradle @@ -80,7 +80,6 @@ dependencies { testImplementation "org.hibernate.orm:hibernate-core" testImplementation 'org.hsqldb:hsqldb' testImplementation 'org.mockito:mockito-core' - testImplementation "org.mockito:mockito-inline" testImplementation('org.seleniumhq.selenium:htmlunit-driver') { exclude group: 'commons-logging', module: 'commons-logging' exclude group: 'xml-apis', module: 'xml-apis' diff --git a/core/spring-security-core.gradle b/core/spring-security-core.gradle index fcedeea906..57040811c0 100644 --- a/core/spring-security-core.gradle +++ b/core/spring-security-core.gradle @@ -27,7 +27,6 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter-params" testImplementation "org.junit.jupiter:junit-jupiter-engine" testImplementation "org.mockito:mockito-core" - testImplementation 'org.mockito:mockito-inline' testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" testImplementation 'org.skyscreamer:jsonassert' diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index 1094018384..d1e86820c8 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -11,7 +11,7 @@ dependencies { api platform("io.projectreactor:reactor-bom:$reactorVersion") api platform("io.rsocket:rsocket-bom:1.1.4") api platform("org.junit:junit-bom:5.10.0") - api platform("org.mockito:mockito-bom:4.11.0") + api platform("org.mockito:mockito-bom:5.5.0") api platform("org.springframework.data:spring-data-bom:$springDataVersion") api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinDependencyVersion") api platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3") 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 e00593c149..bc6fedd828 100644 --- a/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle +++ b/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle @@ -22,7 +22,6 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter-params" testImplementation "org.junit.jupiter:junit-jupiter-engine" testImplementation "org.mockito:mockito-core" - testImplementation "org.mockito:mockito-inline" testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" } diff --git a/test/spring-security-test.gradle b/test/spring-security-test.gradle index 92b3868438..15d07dd367 100644 --- a/test/spring-security-test.gradle +++ b/test/spring-security-test.gradle @@ -27,7 +27,6 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter-params" testImplementation "org.junit.jupiter:junit-jupiter-engine" testImplementation "org.mockito:mockito-core" - testImplementation 'org.mockito:mockito-inline' testImplementation "org.mockito:mockito-junit-jupiter" testImplementation "org.springframework:spring-test" testImplementation 'org.skyscreamer:jsonassert' diff --git a/web/spring-security-web.gradle b/web/spring-security-web.gradle index c0ee717cf0..cf405549c2 100644 --- a/web/spring-security-web.gradle +++ b/web/spring-security-web.gradle @@ -26,7 +26,6 @@ dependencies { testImplementation 'jakarta.websocket:jakarta.websocket-client-api' testImplementation 'org.hamcrest:hamcrest' testImplementation 'org.mockito:mockito-core' - testImplementation 'org.mockito:mockito-inline' testImplementation 'org.skyscreamer:jsonassert' testImplementation 'org.springframework:spring-webflux' testImplementation 'org.synchronoss.cloud:nio-multipart-parser'