Polish “Replace custom Neo4j container with Testcontainers version”

See gh-15638

spring-boot-project/spring-boot-parent/pom.xml

@@ -26,6 +26,7 @@
 		<maven.version>3.5.4</maven.version>
 		<maven-resolver.version>1.1.1</maven-resolver.version>
 		<spock.version>1.0-groovy-2.4</spock.version>
+		<testcontainers.version>1.10.6</testcontainers.version>
 		<dependency-management-plugin.version>1.0.6.RELEASE</dependency-management-plugin.version>
 	</properties>
 	<scm>
@@ -96,16 +97,6 @@
 				<artifactId>mockwebserver</artifactId>
 				<version>3.9.0</version>
 			</dependency>
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>testcontainers</artifactId>
-				<version>1.10.6</version>
-			</dependency>
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>neo4j</artifactId>
-				<version>1.10.6</version>
-			</dependency>
 			<dependency>
 				<groupId>com.vaadin.external.google</groupId>
 				<artifactId>android-json</artifactId>
@@ -247,6 +238,16 @@
 				<artifactId>spock-spring</artifactId>
 				<version>${spock.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.testcontainers</groupId>
+				<artifactId>neo4j</artifactId>
+				<version>${testcontainers.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.testcontainers</groupId>
+				<artifactId>testcontainers</artifactId>
+				<version>${testcontainers.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.zeroturnaround</groupId>
 				<artifactId>zt-zip</artifactId>

spring-boot-project/spring-boot-test-autoconfigure/pom.xml

@@ -296,12 +296,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers</artifactId>
+			<artifactId>neo4j</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>neo4j</artifactId>
+			<artifactId>testcontainers</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java

@@ -47,7 +47,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 public class DataNeo4jTestIntegrationTests {
 
 	@ClassRule
-	public static Neo4jContainer neo4j = new Neo4jContainer().withAdminPassword(null);
+	public static Neo4jContainer<?> neo4j = new Neo4jContainer<>()
+			.withAdminPassword(null);
 
 	@Autowired
 	private Session session;

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java

@@ -44,7 +44,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class DataNeo4jTestWithIncludeFilterIntegrationTests {
 
 	@ClassRule
-	public static Neo4jContainer neo4j = new Neo4jContainer().withAdminPassword(null);
+	public static Neo4jContainer<?> neo4j = new Neo4jContainer<>()
+			.withAdminPassword(null);
 
 	@Autowired
 	private ExampleService service;