Skip to content

Upgrade to TestContainers 2 #1000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2025
Merged

Upgrade to TestContainers 2 #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<sonar.host.url>http://localhost:9000</sonar.host.url>

<kotlin.code.style>official</kotlin.code.style>
<test.containers.version>1.21.3</test.containers.version>
<test.containers.version>2.0.1</test.containers.version>
<osgi.export>org.mybatis.dynamic.sql.*;version=${project.version};-noimport:=true</osgi.export>

<!-- Reproducible Builds -->
Expand Down Expand Up @@ -177,13 +177,13 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<artifactId>testcontainers-junit-jupiter</artifactId>
<version>${test.containers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<artifactId>testcontainers-postgresql</artifactId>
<version>${test.containers.version}</version>
<scope>test</scope>
</dependency>
Expand All @@ -195,7 +195,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mariadb</artifactId>
<artifactId>testcontainers-mariadb</artifactId>
<version>${test.containers.version}</version>
<scope>test</scope>
</dependency>
Expand All @@ -207,7 +207,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mysql</artifactId>
<artifactId>testcontainers-mysql</artifactId>
<version>${test.containers.version}</version>
<scope>test</scope>
</dependency>
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/config/TestContainersConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@
public interface TestContainersConfiguration {
DockerImageName POSTGRES_LATEST = DockerImageName.parse("postgres:18.0");
DockerImageName MARIADB_LATEST = DockerImageName.parse("mariadb:12.0.2");
// Note - Can't go past MySQL:9.2.0 until this is released: https://github.com/testcontainers/testcontainers-java/pull/10185
DockerImageName MYSQL_LATEST = DockerImageName.parse("mysql:9.2.0");
DockerImageName MYSQL_LATEST = DockerImageName.parse("mysql:9.5.0");
}
7 changes: 3 additions & 4 deletions src/test/java/examples/custom_render/CustomRenderingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,16 @@
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.postgresql.PostgreSQLContainer;

@Testcontainers
class CustomRenderingTest {

@SuppressWarnings("resource")
@Container
private static final PostgreSQLContainer<?> postgres =
new PostgreSQLContainer<>(TestContainersConfiguration.POSTGRES_LATEST)
private static final PostgreSQLContainer postgres =
new PostgreSQLContainer(TestContainersConfiguration.POSTGRES_LATEST)
.withInitScript("examples/custom_render/dbInit.sql");

private SqlSessionFactory sqlSessionFactory;
Expand Down
8 changes: 3 additions & 5 deletions src/test/java/examples/mariadb/MariaDBTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,16 @@
import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper;
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper;
import org.testcontainers.containers.MariaDBContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;

import org.testcontainers.mariadb.MariaDBContainer;

@Testcontainers
class MariaDBTest {

@SuppressWarnings("resource")
@Container
private static final MariaDBContainer<?> mariadb =
new MariaDBContainer<>(TestContainersConfiguration.MARIADB_LATEST)
private static final MariaDBContainer mariadb =
new MariaDBContainer(TestContainersConfiguration.MARIADB_LATEST)
.withInitScript("examples/mariadb/CreateDB.sql");

private static SqlSessionFactory sqlSessionFactory;
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/examples/mariadb/OrderByCaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,16 @@
import org.mybatis.dynamic.sql.render.RenderingStrategies;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
import org.testcontainers.containers.MariaDBContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.mariadb.MariaDBContainer;

@Testcontainers
class OrderByCaseTest {

@SuppressWarnings("resource")
@Container
private static final MariaDBContainer<?> mariadb =
new MariaDBContainer<>(TestContainersConfiguration.MARIADB_LATEST)
private static final MariaDBContainer mariadb =
new MariaDBContainer(TestContainersConfiguration.MARIADB_LATEST)
.withInitScript("examples/mariadb/CreateDB.sql");

private static SqlSessionFactory sqlSessionFactory;
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/examples/mysql/MySQLTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,16 @@
import org.mybatis.dynamic.sql.render.RenderingStrategies;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.mysql.MySQLContainer;

@Testcontainers
class MySQLTest {

@SuppressWarnings("resource")
@Container
private static final MySQLContainer<?> mysql =
new MySQLContainer<>(TestContainersConfiguration.MYSQL_LATEST)
private static final MySQLContainer mysql =
new MySQLContainer(TestContainersConfiguration.MYSQL_LATEST)
.withInitScript("examples/mariadb/CreateDB.sql");

private SqlSessionFactory sqlSessionFactory;
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/examples/postgres/PostgresTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,16 @@
import org.mybatis.dynamic.sql.render.RenderingStrategies;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.postgresql.PostgreSQLContainer;

@Testcontainers
class PostgresTest {

@SuppressWarnings("resource")
@Container
private static final PostgreSQLContainer<?> postgres =
new PostgreSQLContainer<>(TestContainersConfiguration.POSTGRES_LATEST)
private static final PostgreSQLContainer postgres =
new PostgreSQLContainer(TestContainersConfiguration.POSTGRES_LATEST)
.withInitScript("examples/postgres/dbInit.sql");

private static SqlSessionFactory sqlSessionFactory;
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/issues/gh655/Gh655Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,16 @@
import org.mybatis.dynamic.sql.select.SelectModel;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
import org.testcontainers.containers.MariaDBContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.mariadb.MariaDBContainer;

@Testcontainers
class Gh655Test {

@SuppressWarnings("resource")
@Container
private static final MariaDBContainer<?> mariadb =
new MariaDBContainer<>(TestContainersConfiguration.MARIADB_LATEST)
private static final MariaDBContainer mariadb =
new MariaDBContainer(TestContainersConfiguration.MARIADB_LATEST)
.withInitScript("examples/mariadb/CreateDB.sql");

private static SqlSessionFactory sqlSessionFactory;
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/examples/kotlin/mybatis3/custom/render/KCustomRenderingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ import org.mybatis.dynamic.sql.util.kotlin.mybatis3.insertMultiple
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.select
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.update
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper
import org.testcontainers.containers.PostgreSQLContainer
import org.testcontainers.junit.jupiter.Container
import org.testcontainers.junit.jupiter.Testcontainers
import org.testcontainers.postgresql.PostgreSQLContainer
import java.sql.JDBCType

@Testcontainers
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/examples/kotlin/mybatis3/mariadb/KMariaDBTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ import org.mybatis.dynamic.sql.util.kotlin.mybatis3.update
import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper
import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper
import org.testcontainers.containers.MariaDBContainer
import org.testcontainers.junit.jupiter.Container
import org.testcontainers.junit.jupiter.Testcontainers
import org.testcontainers.mariadb.MariaDBContainer
import java.util.Locale

@Testcontainers
Expand Down