1
0
mirror of synced 2026-05-22 21:33:16 +00:00

Merge branch '5.8.x'

Closes gh-11749
This commit is contained in:
Rob Winch
2022-08-23 16:03:50 -05:00
46 changed files with 179 additions and 177 deletions
+8
View File
@@ -11,6 +11,7 @@ dependencies {
api platform("io.projectreactor:reactor-bom:2022.0.0-M4")
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:2022.0.0-M5")
api platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion")
api platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4")
@@ -54,9 +55,16 @@ dependencies {
api "org.hibernate.orm:hibernate-core:6.1.1.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"
<<<<<<< HEAD
=======
api "org.openid4java:openid4java-nodeps:0.9.6"
=======
>>>>>>> 8e018fd921 (Update to mockito 4.7.0)
>>>>>>> 5.8.x
api "org.opensaml:opensaml-core:$openSamlVersion"
api "org.opensaml:opensaml-saml-api:$openSamlVersion"
api "org.opensaml:opensaml-saml-impl:$openSamlVersion"