From ebf180833ee4a42ab0bbcb84b5f02aa8bbebd923 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Fri, 19 Aug 2022 16:08:26 -0500 Subject: [PATCH] Update to mockito 4.7.0 Closes gh-11748 --- dependencies/spring-security-dependencies.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index a2a5e58e6b..c46a345483 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -11,6 +11,7 @@ dependencies { api platform("io.projectreactor:reactor-bom:2020.0.21") api platform("io.rsocket:rsocket-bom:1.1.2") api platform("org.junit:junit-bom:5.9.0-RC1") + api platform("org.mockito:mockito-bom:4.7.0") api platform("org.springframework.data:spring-data-bom:2021.2.2") api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion") api platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4") @@ -56,10 +57,13 @@ dependencies { api "org.hibernate:hibernate-entitymanager:5.6.10.Final" api "org.hsqldb:hsqldb:2.6.1" api "org.jasig.cas.client:cas-client-core:3.6.4" +<<<<<<< HEAD api "org.mockito:mockito-core:3.12.4" api "org.mockito:mockito-inline:3.12.4" api "org.mockito:mockito-junit-jupiter:3.12.4" api "org.openid4java:openid4java-nodeps:0.9.6" +======= +>>>>>>> 8e018fd921 (Update to mockito 4.7.0) api "org.opensaml:opensaml-core:$openSamlVersion" api "org.opensaml:opensaml-saml-api:$openSamlVersion" api "org.opensaml:opensaml-saml-impl:$openSamlVersion"