chore(deps): Support Spring boot 4.0.0 (#2879)

* Support Spring boot 4.0.0

* Apply review suggestion

* Polishing

Author: m1ngyuan

README.adoc

@@ -24,6 +24,9 @@ Usage of Spring Cloud in your production code is optional, but __you will need i
 
 |3.2.X, 3.3.X, 3.4.X, 3.5.X
 |3.1.X
+
+|4.0.X
+|4.0.X
 |===
 
 [[how-to-use]]

embedded-aerospike/src/main/java/com/playtika/testcontainer/aerospike/EmbeddedAerospikeBootstrapConfiguration.java

@@ -21,10 +21,10 @@
 import org.springframework.core.env.MapPropertySource;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
-import org.testcontainers.containers.ToxiproxyContainer;
 import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.toxiproxy.ToxiproxyContainer;
 
 import java.util.LinkedHashMap;
 import java.util.Optional;

embedded-artifactory/pom.xml

@@ -28,12 +28,6 @@
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

embedded-artifactory/src/main/java/com/playtika/testcontainer/artifactory/EmbeddedArtifactoryBootstrapConfiguration.java

@@ -19,9 +19,9 @@
 import org.springframework.core.env.MapPropertySource;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
-import org.testcontainers.containers.ToxiproxyContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import org.testcontainers.containers.wait.strategy.WaitStrategy;
+import org.testcontainers.toxiproxy.ToxiproxyContainer;
 
 import java.util.LinkedHashMap;
 import java.util.Optional;

embedded-azurite/src/main/java/com/playtika/testcontainer/azurite/EmbeddedAzuriteBootstrapConfiguration.java

@@ -18,7 +18,7 @@
 import org.springframework.core.env.MapPropertySource;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
-import org.testcontainers.containers.ToxiproxyContainer;
+import org.testcontainers.toxiproxy.ToxiproxyContainer;
 
 import java.util.LinkedHashMap;
 import java.util.Optional;

embedded-cassandra/pom.xml

@@ -25,11 +25,11 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>cassandra</artifactId>
+            <artifactId>testcontainers-cassandra</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-cassandra</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-data-cassandra</artifactId>
             <optional>true</optional>
         </dependency>
     </dependencies>

embedded-cassandra/src/main/java/com/playtika/testcontainer/cassandra/EmbeddedCassandraBootstrapConfiguration.java

@@ -18,12 +18,12 @@
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.io.ResourceLoader;
-import org.testcontainers.containers.CassandraContainer;
+import org.testcontainers.cassandra.CassandraContainer;
+import org.testcontainers.cassandra.CassandraDatabaseDelegate;
 import org.testcontainers.containers.Network;
-import org.testcontainers.containers.ToxiproxyContainer;
-import org.testcontainers.containers.delegate.CassandraDatabaseDelegate;
 import org.testcontainers.delegate.DatabaseDelegate;
 import org.testcontainers.ext.ScriptUtils;
+import org.testcontainers.toxiproxy.ToxiproxyContainer;
 
 import javax.script.ScriptException;
 
@@ -72,7 +72,7 @@ public CassandraContainer cassandra(ConfigurableEnvironment environment,
                                         CassandraProperties properties,
                                         Optional<Network> network) throws Exception {
 
-        CassandraContainer cassandra = new CassandraContainer<>(ContainerUtils.getDockerImageName(properties))
+        CassandraContainer cassandra = new CassandraContainer(ContainerUtils.getDockerImageName(properties))
                 .withExposedPorts(properties.getPort())
                 .withNetworkAliases(CASSANDRA_NETWORK_ALIAS);
 
@@ -101,7 +101,7 @@ static Map<String, Object> registerCassandraEnvironment(ConfigurableEnvironment
         return cassandraEnv;
     }
 
-    private void initKeyspace(CassandraProperties properties, CassandraContainer<?> cassandra) throws ScriptException {
+    private void initKeyspace(CassandraProperties properties, CassandraContainer cassandra) throws ScriptException {
         String initScriptContent = prepareCassandraInitScript(properties);
         try (DatabaseDelegate databaseDelegate = new CassandraDatabaseDelegate(cassandra)) {
             ScriptUtils.executeDatabaseScript(databaseDelegate, "init.cql", initScriptContent);

embedded-clickhouse/README.adoc

@@ -44,7 +44,7 @@ To auto-configure `spring-jdbc` use these properties in your test `application.p
 [source,properties]
 ./src/test/resources/application.properties
 ----
-spring.datasource.driver-class-name=ru.yandex.clickhouse.ClickHouseDriver
+spring.datasource.driver-class-name=com.clickhouse.jdbc.Driver
 spring.datasource.url=jdbc:clickhouse://${embedded.clickhouse.host}:${embedded.clickhouse.port}/${embedded.clickhouse.schema}
 spring.datasource.username=${embedded.clickhouse.user}
 spring.datasource.password=${embedded.clickhouse.password}

embedded-clickhouse/pom.xml

@@ -14,10 +14,14 @@
     <artifactId>embedded-clickhouse</artifactId>
 
     <properties>
-        <clickhouse-driver.version>0.3.2</clickhouse-driver.version>
+        <clickhouse-driver.version>0.9.7</clickhouse-driver.version>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-jdbc</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.playtika.testcontainers</groupId>
             <artifactId>testcontainers-common</artifactId>
@@ -28,24 +32,13 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>clickhouse</artifactId>
+            <artifactId>testcontainers-clickhouse</artifactId>
         </dependency>
         <dependency>
-            <groupId>ru.yandex.clickhouse</groupId>
+            <groupId>com.clickhouse</groupId>
             <artifactId>clickhouse-jdbc</artifactId>
             <version>${clickhouse-driver.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tomcat</groupId>

embedded-clickhouse/src/main/java/com/playtika/testcontainer/clickhouse/ClickHouseProperties.java

@@ -13,8 +13,8 @@ public class ClickHouseProperties extends CommonContainerProperties {
 
     String host = "localhost";
     int port = 8123;
-    String user = "default";
-    String password = "";
+    String user = "test";
+    String password = "test";
 
     String initScriptPath;