Adapt to changes in Spring Boot 4.0.

See #693

Author: mp911de

cassandra/pom.xml

@@ -31,6 +31,12 @@
 			<artifactId>spring-boot-starter-data-cassandra</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-data-cassandra-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 </project>

cassandra/reactive/src/test/java/example/springdata/cassandra/auditing/AuditingIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.data.cassandra.DataCassandraTest;
+import org.springframework.boot.data.cassandra.test.autoconfigure.DataCassandraTest;
 
 /**
  * Integration tests showing Reactive Auditing with Cassandra in action.

cassandra/reactive/src/test/java/example/springdata/cassandra/spel/ExpressionIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.data.cassandra.DataCassandraTest;
+import org.springframework.boot.data.cassandra.test.autoconfigure.DataCassandraTest;
 
 /**
  * Integration tests showing the SpEL context extension in action.

cassandra/util/pom.xml

@@ -27,7 +27,7 @@
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>cassandra</artifactId>
+			<artifactId>testcontainers-cassandra</artifactId>
 		</dependency>
 
 		<dependency>

cassandra/util/src/main/java/example/springdata/cassandra/util/CassandraExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2021 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 
 import org.springframework.util.StringUtils;
 
-import org.testcontainers.containers.CassandraContainer;
+import org.testcontainers.cassandra.CassandraContainer;
 
 import com.datastax.oss.driver.api.core.CqlSession;
 
@@ -92,13 +92,13 @@ private static CassandraKeyspace findAnnotation(ExtensionContext context) {
 		return annotation.orElseThrow(() -> new IllegalStateException("Test class not annotated with @Cassandra"));
 	}
 
-	private CassandraContainer<?> runTestcontainer() {
+	private CassandraContainer runTestcontainer() {
 
 		if (container != null) {
 			return container;
 		}
 
-		container = new CassandraContainer<>(getCassandraDockerImageName());
+		container = new CassandraContainer(getCassandraDockerImageName());
 		container.withReuse(true);
 
 		container.start();

couchbase/example/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>spring-data-couchbase-example</artifactId>
-	<name>Basic sample for Spring Data Couchbase</name>
+	<name>Spring Data Couchbase - Basic sample</name>
 	<description>Small sample project showing the usage of Spring Data Couchbase.</description>
 
 	<dependencies>

elasticsearch/pom.xml

@@ -45,13 +45,13 @@
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>elasticsearch</artifactId>
+			<artifactId>testcontainers-elasticsearch</artifactId>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>junit-jupiter</artifactId>
+			<artifactId>testcontainers-junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
 

jdbc/basics/src/test/java/example/springdata/jdbc/basics/aggregate/AggregateTests.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2021 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,13 +21,12 @@
 
 import java.time.Period;
 import java.util.Arrays;
-import java.util.List;
 
 import org.assertj.core.groups.Tuple;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.data.jdbc.AutoConfigureDataJdbc;
+import org.springframework.boot.data.jdbc.test.autoconfigure.AutoConfigureDataJdbc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
 

jdbc/basics/src/test/java/example/springdata/jdbc/basics/simpleentity/SimpleEntityTests.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2021 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,14 +23,14 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureJdbc;
+import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureJdbc;
 import org.springframework.boot.test.context.SpringBootTest;
 
 /**
  * Demonstrates simple CRUD operations with a simple entity without any references.
  *
  * @author Jens Schauder
- * @author Divya Srivastava
+ * @author Divya Srivastava
  */
 @SpringBootTest(classes = CategoryConfiguration.class)
 @AutoConfigureJdbc

jdbc/composite-ids/src/test/java/example/springdata/jdbc/compositeid/EmployeeTests.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,13 +15,14 @@
  */
 package example.springdata.jdbc.compositeid;
 
+import static org.assertj.core.api.Assertions.*;
+
 import org.junit.jupiter.api.Test;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.data.jdbc.AutoConfigureDataJdbc;
+import org.springframework.boot.data.jdbc.test.autoconfigure.AutoConfigureDataJdbc;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import static org.assertj.core.api.Assertions.*;
-
 /**
  * Test demonstrating the use of composite ids.
  *