Merge branch 'refs/heads/develop' into feature/owl

# Conflicts:
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.jar
#	hideout-core/build.gradle.kts
#	hideout-worker/gradle/wrapper/gradle-wrapper.properties
#	hideout-worker/gradlew
#	hideout-worker/gradlew.bat
#	owl/owl-broker/owl-broker-mongodb/build.gradle.kts
This commit is contained in:
2024-05-11 23:02:19 +09:00
14 changed files with 200 additions and 174 deletions
+3 -3
View File
@@ -241,16 +241,16 @@ dependencies {
testImplementation("io.ktor:ktor-client-mock:$ktor_version")
testImplementation("com.h2database:h2:$h2_version")
testImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1")
testImplementation("org.mockito:mockito-inline:5.2.0")
testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.6")
testImplementation("nl.jqno.equalsverifier:equalsverifier:3.16.1")
testImplementation("com.jparams:to-string-verifier:1.4.8")
intTestImplementation("org.springframework.boot:spring-boot-starter-test")
intTestImplementation("org.springframework.security:spring-security-test")
intTestImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
intTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version")
intTestImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
intTestImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1")
intTestImplementation("com.h2database:h2:$h2_version")
e2eTestImplementation("org.springframework.boot:spring-boot-starter-test")