Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 33f46fd

Browse files
Merge pull request #1000 from jeffgbutler/testcontainers-upgrade
Upgrade to TestContainers 2
2 parents fec408d + 95b62b5 commit 33f46fd

File tree

10 files changed

+26
-34
lines changed

10 files changed

+26
-34
lines changed

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<sonar.host.url>http://localhost:9000</sonar.host.url>
8181

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

8686
<!-- Reproducible Builds -->
@@ -177,13 +177,13 @@
177177
</dependency>
178178
<dependency>
179179
<groupId>org.testcontainers</groupId>
180-
<artifactId>junit-jupiter</artifactId>
180+
<artifactId>testcontainers-junit-jupiter</artifactId>
181181
<version>${test.containers.version}</version>
182182
<scope>test</scope>
183183
</dependency>
184184
<dependency>
185185
<groupId>org.testcontainers</groupId>
186-
<artifactId>postgresql</artifactId>
186+
<artifactId>testcontainers-postgresql</artifactId>
187187
<version>${test.containers.version}</version>
188188
<scope>test</scope>
189189
</dependency>
@@ -195,7 +195,7 @@
195195
</dependency>
196196
<dependency>
197197
<groupId>org.testcontainers</groupId>
198-
<artifactId>mariadb</artifactId>
198+
<artifactId>testcontainers-mariadb</artifactId>
199199
<version>${test.containers.version}</version>
200200
<scope>test</scope>
201201
</dependency>
@@ -207,7 +207,7 @@
207207
</dependency>
208208
<dependency>
209209
<groupId>org.testcontainers</groupId>
210-
<artifactId>mysql</artifactId>
210+
<artifactId>testcontainers-mysql</artifactId>
211211
<version>${test.containers.version}</version>
212212
<scope>test</scope>
213213
</dependency>

‎src/test/java/config/TestContainersConfiguration.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,5 @@
2323
public interface TestContainersConfiguration {
2424
DockerImageName POSTGRES_LATEST = DockerImageName.parse("postgres:18.0");
2525
DockerImageName MARIADB_LATEST = DockerImageName.parse("mariadb:12.0.2");
26-
// Note - Can't go past MySQL:9.2.0 until this is released: https://github.com/testcontainers/testcontainers-java/pull/10185
27-
DockerImageName MYSQL_LATEST = DockerImageName.parse("mysql:9.2.0");
26+
DockerImageName MYSQL_LATEST = DockerImageName.parse("mysql:9.5.0");
2827
}

‎src/test/java/examples/custom_render/CustomRenderingTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,16 @@
5050
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
5151
import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
5252
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
53-
import org.testcontainers.containers.PostgreSQLContainer;
5453
import org.testcontainers.junit.jupiter.Container;
5554
import org.testcontainers.junit.jupiter.Testcontainers;
55+
import org.testcontainers.postgresql.PostgreSQLContainer;
5656

5757
@Testcontainers
5858
class CustomRenderingTest {
5959

60-
@SuppressWarnings("resource")
6160
@Container
62-
private static final PostgreSQLContainer<?> postgres =
63-
new PostgreSQLContainer<>(TestContainersConfiguration.POSTGRES_LATEST)
61+
private static final PostgreSQLContainer postgres =
62+
new PostgreSQLContainer(TestContainersConfiguration.POSTGRES_LATEST)
6463
.withInitScript("examples/custom_render/dbInit.sql");
6564

6665
private SqlSessionFactory sqlSessionFactory;

‎src/test/java/examples/mariadb/MariaDBTest.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,16 @@
4949
import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper;
5050
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
5151
import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper;
52-
import org.testcontainers.containers.MariaDBContainer;
5352
import org.testcontainers.junit.jupiter.Container;
5453
import org.testcontainers.junit.jupiter.Testcontainers;
55-
54+
importorg.testcontainers.mariadb.MariaDBContainer;
5655

5756
@Testcontainers
5857
class MariaDBTest {
5958

60-
@SuppressWarnings("resource")
6159
@Container
62-
private static final MariaDBContainer<?> mariadb =
63-
new MariaDBContainer<>(TestContainersConfiguration.MARIADB_LATEST)
60+
private static final MariaDBContainer mariadb =
61+
new MariaDBContainer(TestContainersConfiguration.MARIADB_LATEST)
6462
.withInitScript("examples/mariadb/CreateDB.sql");
6563

6664
private static SqlSessionFactory sqlSessionFactory;

‎src/test/java/examples/mariadb/OrderByCaseTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,16 @@
3939
import org.mybatis.dynamic.sql.render.RenderingStrategies;
4040
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
4141
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
42-
import org.testcontainers.containers.MariaDBContainer;
4342
import org.testcontainers.junit.jupiter.Container;
4443
import org.testcontainers.junit.jupiter.Testcontainers;
44+
import org.testcontainers.mariadb.MariaDBContainer;
4545

4646
@Testcontainers
4747
class OrderByCaseTest {
4848

49-
@SuppressWarnings("resource")
5049
@Container
51-
private static final MariaDBContainer<?> mariadb =
52-
new MariaDBContainer<>(TestContainersConfiguration.MARIADB_LATEST)
50+
private static final MariaDBContainer mariadb =
51+
new MariaDBContainer(TestContainersConfiguration.MARIADB_LATEST)
5352
.withInitScript("examples/mariadb/CreateDB.sql");
5453

5554
private static SqlSessionFactory sqlSessionFactory;

‎src/test/java/examples/mysql/MySQLTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,16 @@
3838
import org.mybatis.dynamic.sql.render.RenderingStrategies;
3939
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
4040
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
41-
import org.testcontainers.containers.MySQLContainer;
4241
import org.testcontainers.junit.jupiter.Container;
4342
import org.testcontainers.junit.jupiter.Testcontainers;
43+
import org.testcontainers.mysql.MySQLContainer;
4444

4545
@Testcontainers
4646
class MySQLTest {
4747

48-
@SuppressWarnings("resource")
4948
@Container
50-
private static final MySQLContainer<?> mysql =
51-
new MySQLContainer<>(TestContainersConfiguration.MYSQL_LATEST)
49+
private static final MySQLContainer mysql =
50+
new MySQLContainer(TestContainersConfiguration.MYSQL_LATEST)
5251
.withInitScript("examples/mariadb/CreateDB.sql");
5352

5453
private SqlSessionFactory sqlSessionFactory;

‎src/test/java/examples/postgres/PostgresTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,16 @@
3535
import org.mybatis.dynamic.sql.render.RenderingStrategies;
3636
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
3737
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
38-
import org.testcontainers.containers.PostgreSQLContainer;
3938
import org.testcontainers.junit.jupiter.Container;
4039
import org.testcontainers.junit.jupiter.Testcontainers;
40+
import org.testcontainers.postgresql.PostgreSQLContainer;
4141

4242
@Testcontainers
4343
class PostgresTest {
4444

45-
@SuppressWarnings("resource")
4645
@Container
47-
private static final PostgreSQLContainer<?> postgres =
48-
new PostgreSQLContainer<>(TestContainersConfiguration.POSTGRES_LATEST)
46+
private static final PostgreSQLContainer postgres =
47+
new PostgreSQLContainer(TestContainersConfiguration.POSTGRES_LATEST)
4948
.withInitScript("examples/postgres/dbInit.sql");
5049

5150
private static SqlSessionFactory sqlSessionFactory;

‎src/test/java/issues/gh655/Gh655Test.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,16 @@
4141
import org.mybatis.dynamic.sql.select.SelectModel;
4242
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
4343
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper;
44-
import org.testcontainers.containers.MariaDBContainer;
4544
import org.testcontainers.junit.jupiter.Container;
4645
import org.testcontainers.junit.jupiter.Testcontainers;
46+
import org.testcontainers.mariadb.MariaDBContainer;
4747

4848
@Testcontainers
4949
class Gh655Test {
5050

51-
@SuppressWarnings("resource")
5251
@Container
53-
private static final MariaDBContainer<?> mariadb =
54-
new MariaDBContainer<>(TestContainersConfiguration.MARIADB_LATEST)
52+
private static final MariaDBContainer mariadb =
53+
new MariaDBContainer(TestContainersConfiguration.MARIADB_LATEST)
5554
.withInitScript("examples/mariadb/CreateDB.sql");
5655

5756
private static SqlSessionFactory sqlSessionFactory;

‎src/test/kotlin/examples/kotlin/mybatis3/custom/render/KCustomRenderingTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ import org.mybatis.dynamic.sql.util.kotlin.mybatis3.insertMultiple
3535
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.select
3636
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.update
3737
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper
38-
import org.testcontainers.containers.PostgreSQLContainer
3938
import org.testcontainers.junit.jupiter.Container
4039
import org.testcontainers.junit.jupiter.Testcontainers
40+
import org.testcontainers.postgresql.PostgreSQLContainer
4141
import java.sql.JDBCType
4242

4343
@Testcontainers

‎src/test/kotlin/examples/kotlin/mybatis3/mariadb/KMariaDBTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ import org.mybatis.dynamic.sql.util.kotlin.mybatis3.update
3535
import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper
3636
import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper
3737
import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper
38-
import org.testcontainers.containers.MariaDBContainer
3938
import org.testcontainers.junit.jupiter.Container
4039
import org.testcontainers.junit.jupiter.Testcontainers
40+
import org.testcontainers.mariadb.MariaDBContainer
4141
import java.util.Locale
4242

4343
@Testcontainers

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /