From ca6fd3ce1b215f80871cee77b74653cec69edc78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 24 Apr 2025 09:10:49 +0200 Subject: [PATCH] Upgrade to Testcontainers 1.21.0 Closes gh-45276 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- ...etricsContainerConnectionDetailsFactoryIntegrationTests.java | 2 +- .../connection/ldap/LLdapContainerConnectionDetailsFactory.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index e439fd5eff4..c7431ca5418 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -2454,7 +2454,7 @@ bom { releaseNotes("https://github.com/xerial/sqlite-jdbc/releases/tag/{version}") } } - library("Testcontainers", "1.20.6") { + library("Testcontainers", "1.21.0") { group("org.testcontainers") { bom("testcontainers-bom") } diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java index f510959e92f..5b3cfe93a65 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java @@ -76,7 +76,7 @@ class GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTes .untilAsserted(() -> { Response response = RestAssured.given() .queryParam("query", "{job=\"test\"}") - .get("%s/api/v1/query".formatted(container.getPromehteusHttpUrl())) + .get("%s/api/v1/query".formatted(container.getPrometheusHttpUrl())) .prettyPeek() .thenReturn(); assertThat(response.getStatusCode()).isEqualTo(200); diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ldap/LLdapContainerConnectionDetailsFactory.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ldap/LLdapContainerConnectionDetailsFactory.java index 6b419a9d092..c99931e8fb7 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ldap/LLdapContainerConnectionDetailsFactory.java +++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ldap/LLdapContainerConnectionDetailsFactory.java @@ -61,7 +61,7 @@ class LLdapContainerConnectionDetailsFactory @Override public String getPassword() { - return getContainer().getUserPass(); + return getContainer().getPassword(); } }