diff --git a/pom.xml b/pom.xml index 9accaf6..7c5bf14 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5 + 3.2.3 @@ -46,11 +46,11 @@ UTF-8 3.2.1 3.2.0 - 3.2.1 + 3.2.5 3.11.0 3.0.0-M5 0.1.4 - 3.1.5 + 3.2.3 6.2.4.RELEASE 2.10.1 32.0.0-jre @@ -62,7 +62,8 @@ 0.10.2 6.2.0 3.5.1 - 3.0.0-beta-10 + + 3.3.1 3.3.0 10.12.1 0.8.10 @@ -72,13 +73,14 @@ 2.0.1.Final - 5.5.5 - 1.9.20 - 1.17.6 - 5.13.2 - 2.2.4 - 2.14.2 - 0.39.1 + 5.8.0 + 1.9.22 + 1.8.0 + 1.19.6 + 5.15.0 + 2.3.8 + 2.16.1 + 0.44.0 @@ -193,8 +195,8 @@ test - com.github.tomakehurst - wiremock + org.wiremock + wiremock-standalone ${wiremock.version} test @@ -236,7 +238,7 @@ org.jetbrains.kotlinx kotlinx-coroutines-core-jvm - 1.6.4 + ${kotlinx-coroutines-core-jvm.version} test diff --git a/src/test/kotlin/org/prebid/cache/functional/testcontainers/ContainerDependencies.kt b/src/test/kotlin/org/prebid/cache/functional/testcontainers/ContainerDependencies.kt index 2496e54..87e2f72 100644 --- a/src/test/kotlin/org/prebid/cache/functional/testcontainers/ContainerDependencies.kt +++ b/src/test/kotlin/org/prebid/cache/functional/testcontainers/ContainerDependencies.kt @@ -5,6 +5,7 @@ import org.prebid.cache.functional.testcontainers.container.RedisContainer import org.prebid.cache.functional.testcontainers.container.WebCacheContainer import org.testcontainers.containers.Network import org.testcontainers.lifecycle.Startables +import org.testcontainers.utility.DockerImageName abstract class ContainerDependencies { @@ -12,7 +13,7 @@ abstract class ContainerDependencies { private const val redisImageName = "redis:6.2.6-alpine" private const val aerospikeImageName = "aerospike:ce-5.7.0.11" private const val prebidCacheImageName = "prebid-cache:latest" - private const val mockServerImageVersion = "5.13.2" + private const val mockServerImageVersion = "mockserver/mockserver:5.15.0" private val launchContainers = System.getProperty("launchContainers")?.toBoolean() ?: true @@ -20,7 +21,7 @@ abstract class ContainerDependencies { val redisContainer: RedisContainer = RedisContainer(redisImageName).withNetwork(network) val aerospikeContainer: AerospikeContainer = AerospikeContainer(aerospikeImageName).withNetwork(network) val webCacheContainer: WebCacheContainer = - WebCacheContainer(mockServerImageVersion).withNetwork(network) as WebCacheContainer + WebCacheContainer(DockerImageName.parse(mockServerImageVersion)).withNetwork(network) as WebCacheContainer val prebidCacheContainerPool = PrebidCacheContainerPool(prebidCacheImageName) fun startCacheServerContainers() { diff --git a/src/test/kotlin/org/prebid/cache/functional/testcontainers/container/WebCacheContainer.kt b/src/test/kotlin/org/prebid/cache/functional/testcontainers/container/WebCacheContainer.kt index 8299e3a..99da3c1 100644 --- a/src/test/kotlin/org/prebid/cache/functional/testcontainers/container/WebCacheContainer.kt +++ b/src/test/kotlin/org/prebid/cache/functional/testcontainers/container/WebCacheContainer.kt @@ -1,8 +1,9 @@ package org.prebid.cache.functional.testcontainers.container import org.testcontainers.containers.MockServerContainer +import org.testcontainers.utility.DockerImageName -class WebCacheContainer(mockServerImageVersion: String) : MockServerContainer(mockServerImageVersion) { +class WebCacheContainer(dockerImageName: DockerImageName) : MockServerContainer(dockerImageName) { fun getContainerHost(): String = networkAliases.first()