Upgrade to Testcontainers 2.0.

See spring-projects/spring-data-build#2688

Author: mp911de

spring-data-jpa/pom.xml

@@ -150,7 +150,7 @@
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>mysql</artifactId>
+			<artifactId>testcontainers-mysql</artifactId>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
@@ -170,7 +170,7 @@
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>postgresql</artifactId>
+			<artifactId>testcontainers-postgresql</artifactId>
 			<scope>test</scope>
 		</dependency>
 
@@ -192,7 +192,7 @@
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>oracle-free</artifactId>
+			<artifactId>testcontainers-oracle-free</artifactId>
 			<scope>test</scope>
 		</dependency>
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/PgVectorIntegrationTests.java

@@ -33,7 +33,7 @@
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.postgresql.PostgreSQLContainer;
 
 /**
  * Testcase to verify Vector Search work with Postgres (PGvector).
@@ -81,9 +81,9 @@ public List<String> getManagedPackages() {
 
 		@SuppressWarnings("resource")
 		@Bean(initMethod = "start", destroyMethod = "start")
-		public PostgreSQLContainer<?> container() {
+		public PostgreSQLContainer container() {
 
-			return new PostgreSQLContainer<>("pgvector/pgvector:pg17") //
+			return new PostgreSQLContainer("pgvector/pgvector:pg17") //
 					.withUsername("postgres").withReuse(true);
 		}
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/MySqlStoredProcedureIntegrationTests.java

@@ -47,7 +47,7 @@
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 
-import org.testcontainers.containers.MySQLContainer;
+import org.testcontainers.mysql.MySQLContainer;
 
 /**
  * Testcase to verify {@link org.springframework.jdbc.object.StoredProcedure}s work with MySQL.
@@ -256,9 +256,9 @@ public List<String> getManagedPackages() {
 
 		@SuppressWarnings("resource")
 		@Bean(initMethod = "start", destroyMethod = "stop")
-		public MySQLContainer<?> container() {
+		public MySQLContainer container() {
 
-			return new MySQLContainer<>("mysql:8.0.24") //
+			return new MySQLContainer("mysql:8.0.24") //
 					.withUsername("test") //
 					.withPassword("test") //
 					.withConfigurationOverride("");

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureIntegrationTests.java

@@ -52,7 +52,7 @@
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 
-import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.postgresql.PostgreSQLContainer;
 
 /**
  * Testcase to verify {@link org.springframework.jdbc.object.StoredProcedure}s work with Postgres.
@@ -325,9 +325,9 @@ public List<String> getManagedPackages() {
 
 		@SuppressWarnings("resource")
 		@Bean(initMethod = "start", destroyMethod = "stop")
-		public PostgreSQLContainer<?> container() {
+		public PostgreSQLContainer container() {
 
-			return new PostgreSQLContainer<>("postgres:15.3") //
+			return new PostgreSQLContainer("postgres:15.3") //
 					.withUsername("postgres");
 		}
 	}

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureNullHandlingIntegrationTests.java

@@ -47,7 +47,7 @@
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 
-import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.postgresql.PostgreSQLContainer;
 
 /**
  * Testcase to verify {@link org.springframework.jdbc.object.StoredProcedure}s properly handle null values.
@@ -162,9 +162,9 @@ public List<String> getManagedPackages() {
 
 		@SuppressWarnings("resource")
 		@Bean(initMethod = "start", destroyMethod = "stop")
-		public PostgreSQLContainer<?> container() {
+		public PostgreSQLContainer container() {
 
-			return new PostgreSQLContainer<>("postgres:15.3") //
+			return new PostgreSQLContainer("postgres:15.3") //
 					.withUsername("postgres");
 		}
 	}