build(deps): bump org.springframework.boot:spring-boot-dependencies from 3.3.5 to 3.4.0 (#2117)

dependabot[bot] · ijusti · admitrov · web-flow · commit f2969953d335 · 2025-05-12T20:05:33.000+02:00
* build(deps): bump org.springframework.boot:spring-boot-dependencies Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 3.3.5 to 3.4.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.3.5...v3.4.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * spring-cloud-dependencies from 2023.0.4 to 2024.0.0 * Fix error message assert * build(deps): bump org.opensearch.client:spring-data-opensearch-starter from 1.5.4 to 1.6.0 * reorder modules * Update pom.xml * Resolve incompatibilities with Spring Boot 3.4.4 (#2373) * prevent overriding Cockroach's default port forwarding settings * remove the redundant testcontainers-bom dependency * enable Spring Booot's default CouchbaseAutoConfiguration * replace the @SpringBootConfiguration search with a nested @configuration class * update docs compatibility * remove redundant changes --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Oleksandr <ijusti@users.noreply.github.com> Co-authored-by: admitrov <admitrov@playtika.com> Co-authored-by: Stanislav Dobrovolschi <st.dobrovolschi@gmail.com>
diff --git a/README.adoc b/README.adoc
@@ -22,7 +22,7 @@ Usage of Spring Cloud in your production code is optional, but __you will need i
 |3.0.X, 3.1.X
 |3.0.X
 
-|3.2.X
+|3.2.X, 3.3.X, 3.4.X
 |3.1.X
 |===
 
diff --git a/embedded-cockroachdb/src/main/java/com/playtika/testcontainer/cockroach/CockroachDBProperties.java b/embedded-cockroachdb/src/main/java/com/playtika/testcontainer/cockroach/CockroachDBProperties.java
@@ -10,8 +10,7 @@
 @ConfigurationProperties("embedded.cockroach")
 public class CockroachDBProperties extends CommonContainerProperties {
     static final String BEAN_NAME_EMBEDDED_COCKROACHDB = "embeddedCockroachDb";
-
-    int port = 26257;
+    static final int PORT = 26257;
 
     String initScriptPath;
 
diff --git a/embedded-cockroachdb/src/main/java/com/playtika/testcontainer/cockroach/EmbeddedCockroachDBBootstrapConfiguration.java b/embedded-cockroachdb/src/main/java/com/playtika/testcontainer/cockroach/EmbeddedCockroachDBBootstrapConfiguration.java
@@ -38,9 +38,8 @@ public class EmbeddedCockroachDBBootstrapConfiguration {
     @ConditionalOnToxiProxyEnabled(module = "cockroach")
     ToxiproxyContainer.ContainerProxy cockroachContainerProxy(ToxiproxyContainer toxiproxyContainer,
                                                                 @Qualifier(BEAN_NAME_EMBEDDED_COCKROACHDB) CockroachContainer cockroachContainer,
-                                                                CockroachDBProperties properties,
                                                                 ConfigurableEnvironment environment) {
-        ToxiproxyContainer.ContainerProxy proxy = toxiproxyContainer.getProxy(cockroachContainer, properties.getPort());
+        ToxiproxyContainer.ContainerProxy proxy = toxiproxyContainer.getProxy(cockroachContainer, CockroachDBProperties.PORT);
 
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("embedded.cockroach.toxiproxy.host", proxy.getContainerIpAddress());
@@ -60,21 +59,19 @@ public CockroachContainer cockroach(ConfigurableEnvironment environment,
                                           Optional<Network> network) throws Exception {
 
         CockroachContainer cockroachContainer = new CockroachContainer(ContainerUtils.getDockerImageName(properties))
-                .withExposedPorts(properties.getPort())
                 .withInitScript(properties.getInitScriptPath())
                 .withNetworkAliases(COCKROACHDB_NETWORK_ALIAS);
 
         network.ifPresent(cockroachContainer::withNetwork);
 
         cockroachContainer = (CockroachContainer) configureCommonsAndStart(cockroachContainer, properties, log);
-        registerCockroachDBEnvironment(cockroachContainer, environment, properties);
+        registerCockroachDBEnvironment(cockroachContainer, environment);
         return cockroachContainer;
     }
 
     private void registerCockroachDBEnvironment(CockroachContainer cockroach,
-                                                ConfigurableEnvironment environment,
-                                                CockroachDBProperties properties) {
-        Integer mappedPort = cockroach.getMappedPort(properties.getPort());
+                                                ConfigurableEnvironment environment) {
+        Integer mappedPort = cockroach.getMappedPort(CockroachDBProperties.PORT);
         String host = cockroach.getHost();
 
         LinkedHashMap<String, Object> map = new LinkedHashMap<>();
@@ -84,7 +81,7 @@ private void registerCockroachDBEnvironment(CockroachContainer cockroach,
         map.put("embedded.cockroach.user", cockroach.getUsername());
         map.put("embedded.cockroach.password", cockroach.getPassword());
         map.put("embedded.cockroach.networkAlias", COCKROACHDB_NETWORK_ALIAS);
-        map.put("embedded.cockroach.internalPort", properties.getPort());
+        map.put("embedded.cockroach.internalPort", CockroachDBProperties.PORT);
 
         String jdbcURL = "jdbc:postgresql://{}:{}/{}";
         log.info("Started CockroachDB server. Connection details: {}, " +
diff --git a/embedded-couchbase/src/test/java/com/playtika/testcontainer/couchbase/EmbeddedCouchbaseBootstrapConfigurationTest.java b/embedded-couchbase/src/test/java/com/playtika/testcontainer/couchbase/EmbeddedCouchbaseBootstrapConfigurationTest.java
@@ -1,18 +1,18 @@
 package com.playtika.testcontainer.couchbase;
 
-import com.playtika.testcontainer.couchbase.springdata.CouchbaseConfiguration;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(
-        classes = {CouchbaseConfiguration.class},
+        classes = {EmbeddedCouchbaseBootstrapConfigurationTest.TestConfiguration.class},
         properties = {
                 "spring.profiles.active=enabled",
-                "spring.main.allow-bean-definition-overriding=true",
                 "embedded.toxiproxy.proxies.couchbase.enabled=true"
         })
 public abstract class EmbeddedCouchbaseBootstrapConfigurationTest {
@@ -31,4 +31,9 @@ public void propertiesAreAvailable() {
         assertThat(System.getProperty("com.couchbase.bootstrapHttpDirectPort")).isNotEmpty();
         assertThat(System.getProperty("com.couchbase.bootstrapCarrierDirectPort")).isNotEmpty();
     }
+
+    @EnableAutoConfiguration
+    @Configuration
+    static class TestConfiguration {
+    }
 }
diff --git a/embedded-couchbase/src/test/java/com/playtika/testcontainer/couchbase/springdata/CouchbaseConfiguration.java b/embedded-couchbase/src/test/java/com/playtika/testcontainer/couchbase/springdata/CouchbaseConfiguration.java
diff --git a/embedded-couchbase/src/test/java/com/playtika/testcontainer/couchbase/springdata/CouchbaseConfigurationProperties.java b/embedded-couchbase/src/test/java/com/playtika/testcontainer/couchbase/springdata/CouchbaseConfigurationProperties.java
diff --git a/embedded-couchbase/src/test/java/com/playtika/testcontainer/couchbase/springdata/SpringDataTest.java b/embedded-couchbase/src/test/java/com/playtika/testcontainer/couchbase/springdata/SpringDataTest.java
@@ -37,9 +37,6 @@ public class SpringDataTest extends EmbeddedCouchbaseBootstrapConfigurationTest
     @Autowired
     CouchbaseOperations couchbaseOperations;
 
-    @Autowired
-    CouchbaseConfigurationProperties couchbaseConfigurationProperties;
-
     @Test
     public void springDataShouldWork() {
         String key = "test::1";
diff --git a/embedded-couchbase/src/test/resources/application-enabled.properties b/embedded-couchbase/src/test/resources/application-enabled.properties
@@ -1,12 +1,7 @@
-couchbase.bucket=${embedded.couchbase.bucket}
-couchbase.user=${embedded.couchbase.user}
-couchbase.password=${embedded.couchbase.password}
-couchbase.bootstrapHttpDirectPort=${embedded.couchbase.toxiproxy.port}
-couchbase.bootstrapCarrierDirectPort=${embedded.couchbase.bootstrapCarrierDirectPort}
-couchbase.hosts=${embedded.couchbase.host}
-
-
-spring.couchbase.connection-string=couchbase://${embedded.couchbase.host}
+spring.couchbase.connection-string=couchbase://${embedded.couchbase.host}:${embedded.couchbase.bootstrapCarrierDirectPort}=kv,${embedded.couchbase.host}:${embedded.couchbase.toxiproxy.port}=manager
+spring.couchbase.username=${embedded.couchbase.user}
+spring.couchbase.password=${embedded.couchbase.password}
+spring.couchbase.env.timeouts.connect=20s
+spring.couchbase.env.timeouts.key-value=20s
 spring.data.couchbase.bucket-name=${embedded.couchbase.bucket}
 spring.data.couchbase.auto-index=true
-spring.couchbase.env.timeouts.connect=20000
diff --git a/embedded-influxdb/src/test/java/com/playtika/testcontainer/influxdb/EmbeddedInfluxDBBootstrapConfigurationTest.java b/embedded-influxdb/src/test/java/com/playtika/testcontainer/influxdb/EmbeddedInfluxDBBootstrapConfigurationTest.java
@@ -6,15 +6,17 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(SpringExtension.class)
-@SpringBootTest(classes = {TestApplication.class})
+@SpringBootTest
 class EmbeddedInfluxDBBootstrapConfigurationTest {
 
     @Autowired
@@ -47,4 +49,9 @@ void influxDatabaseIsAvailable() {
     private String getUrl() {
         return "http://" + influxDBProperties.getHost() + ":" + influxDBProperties.getPort();
     }
+
+    @EnableAutoConfiguration
+    @Configuration
+    static class TestConfiguration {
+    }
 }
diff --git a/embedded-influxdb/src/test/java/com/playtika/testcontainer/influxdb/TestApplication.java b/embedded-influxdb/src/test/java/com/playtika/testcontainer/influxdb/TestApplication.java
diff --git a/embedded-k3s/src/test/java/com/playtika/testcontainer/k3s/EmbeddedK3sBootstrapConfigurationTest.java b/embedded-k3s/src/test/java/com/playtika/testcontainer/k3s/EmbeddedK3sBootstrapConfigurationTest.java
@@ -6,20 +6,16 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 @ExtendWith(SpringExtension.class)
-@SpringBootTest(
-        classes = {
-                EmbeddedK3sBootstrapConfigurationTest.TestApplication.class
-        }
-)
+@SpringBootTest
 class EmbeddedK3sBootstrapConfigurationTest {
 
     @Autowired
@@ -43,7 +39,7 @@ void k3sIsAvailable() {
         }
     }
 
-    @SpringBootApplication
-    public static class TestApplication {
+    @Configuration
+    static class TestConfiguration {
     }
 }
diff --git a/embedded-mailhog/src/test/java/com/playtika/testcontainer/mailhog/EmbeddedMailHogBootstrapConfigurationTest.java b/embedded-mailhog/src/test/java/com/playtika/testcontainer/mailhog/EmbeddedMailHogBootstrapConfigurationTest.java
@@ -4,7 +4,9 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
@@ -18,7 +20,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(
-        classes = TestApplication.class,
         properties = {
                 "embedded.toxiproxy.proxies.mailhog.enabled=true"
         }
@@ -79,4 +80,8 @@ private List<String> fetchEmailSubjectsFromMailHog() throws Exception {
         return JsonPath.parse(response.body()).read("$.items[*].Content.Headers.Subject[*]");
     }
 
+    @EnableAutoConfiguration
+    @Configuration
+    static class TestConfiguration {
+    }
 }
diff --git a/embedded-mailhog/src/test/java/com/playtika/testcontainer/mailhog/TestApplication.java b/embedded-mailhog/src/test/java/com/playtika/testcontainer/mailhog/TestApplication.java
diff --git a/embedded-mssqlserver/pom.xml b/embedded-mssqlserver/pom.xml
@@ -29,7 +29,6 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>mssqlserver</artifactId>
-            <version>${testcontainers.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/embedded-opensearch/pom.xml b/embedded-opensearch/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>embedded-opensearch</artifactId>
 
     <properties>
-        <spring-data-opensearch-starter.version>1.5.4</spring-data-opensearch-starter.version>
+        <spring-data-opensearch-starter.version>1.6.0</spring-data-opensearch-starter.version>
         <opensearch-testcontainers.version>2.1.3</opensearch-testcontainers.version>
     </properties>
 
@@ -48,4 +48,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/embedded-opensearch/src/test/java/com/playtika/testcontainer/opensearch/springdata/SpringDataTest.java b/embedded-opensearch/src/test/java/com/playtika/testcontainer/opensearch/springdata/SpringDataTest.java
@@ -34,11 +34,11 @@ public void springDataShouldWork() {
         String key = "test::1";
         String value = "myvalue";
         assertThat(documentRepository).isNotNull();
-        assertThat(documentRepository.findById(key).isPresent()).isFalse();
+        assertThat(documentRepository.findById(key)).isEmpty();
 
         TestDocument testDocument = saveDocument(key, value);
 
-        assertThat(documentRepository.findById(key).get()).isEqualTo(testDocument);
+        assertThat(documentRepository.findById(key)).contains(testDocument);
     }
 
     @Test
@@ -50,7 +50,7 @@ public void queryShouldWork() {
 
         List<TestDocument> resultList = documentRepository.findByTitle(title);
 
-        assertThat(resultList.size()).isEqualTo(2);
+        assertThat(resultList).hasSize(2);
     }
 
     @Test
diff --git a/testcontainers-common/src/test/java/com/playtika/testcontainer/common/utils/MountVolumesTest.java b/testcontainers-common/src/test/java/com/playtika/testcontainer/common/utils/MountVolumesTest.java
diff --git a/testcontainers-spring-boot-parent/pom.xml b/testcontainers-spring-boot-parent/pom.xml
