From 46ea842b8559ad09189a3472c318c0ccab16e338 Mon Sep 17 00:00:00 2001 From: Vivien Budavolgyi Date: Thu, 18 May 2023 16:09:42 +0200 Subject: [PATCH] update testcontainers-java to 1.18.1 --- .../com/dimafeng/testcontainers/LocalStackContainer.scala | 7 ------- .../dimafeng/testcontainers/integration/VaultSpec.scala | 3 ++- project/Dependencies.scala | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/localstack/src/main/scala/com/dimafeng/testcontainers/LocalStackContainer.scala b/modules/localstack/src/main/scala/com/dimafeng/testcontainers/LocalStackContainer.scala index 28247b14..fe810dec 100644 --- a/modules/localstack/src/main/scala/com/dimafeng/testcontainers/LocalStackContainer.scala +++ b/modules/localstack/src/main/scala/com/dimafeng/testcontainers/LocalStackContainer.scala @@ -1,7 +1,5 @@ package com.dimafeng.testcontainers -import com.amazonaws.auth.AWSCredentialsProvider -import com.amazonaws.client.builder.AwsClientBuilder import org.testcontainers.containers.localstack.{LocalStackContainer => JavaLocalStackContainer} import org.testcontainers.utility.DockerImageName @@ -15,11 +13,6 @@ case class LocalStackContainer( c.withServices(services: _*) c } - - def endpointConfiguration(service: LocalStackContainer.Service): AwsClientBuilder.EndpointConfiguration = - container.getEndpointConfiguration(service) - - def defaultCredentialsProvider: AWSCredentialsProvider = container.getDefaultCredentialsProvider } object LocalStackContainer { diff --git a/modules/vault/src/test/scala/com/dimafeng/testcontainers/integration/VaultSpec.scala b/modules/vault/src/test/scala/com/dimafeng/testcontainers/integration/VaultSpec.scala index 81f5273c..7a25d72b 100644 --- a/modules/vault/src/test/scala/com/dimafeng/testcontainers/integration/VaultSpec.scala +++ b/modules/vault/src/test/scala/com/dimafeng/testcontainers/integration/VaultSpec.scala @@ -5,11 +5,12 @@ import io.restassured.RestAssured.given import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse import org.scalatest.matchers.should.Matchers import org.scalatest.flatspec.AnyFlatSpec +import org.testcontainers.utility.DockerImageName class VaultSpec extends AnyFlatSpec with ForAllTestContainer with Matchers { private val port = 8200 - override val container: VaultContainer = VaultContainer(vaultPort = Some(port)) + override val container: VaultContainer = VaultContainer(DockerImageName.parse("vault:1.1.3"), vaultPort = Some(port)) "Vault container" should "be started" in { given(). diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2d51b626..a9378e9e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,7 @@ object Dependencies { scope.map(s => modules.map(_ % s)).getOrElse(modules) } - private val testcontainersVersion = "1.17.5" + private val testcontainersVersion = "1.18.1" private val seleniumVersion = "2.53.1" private val slf4jVersion = "1.7.32" private val scalaTestVersion = "3.2.9"