Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix mockito 4.7.0 merge 

Issue gh-11748
This commit is contained in:
Rob Winch 2022-08-23 16:10:24 -05:00
parent 26f8f2ce2d
commit 232838bf50
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dependencies/spring-security-dependencies.gradle vendored
View File

@ -57,13 +57,7 @@ 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"