Skip to content

Commit 022f08d

Browse files
tomix26tomix26
committed
upgrade versions in test suites
1 parent a1af513 commit 022f08d

File tree

2 files changed

+73
-64
lines changed

2 files changed

+73
-64
lines changed

‎build.gradle‎

Lines changed: 62 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -11,71 +11,76 @@ ext {
1111
ossrhUsername = project.findProperty('ossrh.username')
1212
ossrhPassword = project.findProperty('ossrh.password')
1313

14-
// TODO: upgrade all versions to the latest ones
15-
// TODO: update matrix versions to the major ones
1614
testSuites = [
1715
[name: 'default', versions: [
1816
[name: 'suite', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default']
1917
]],
2018
[name: 'spring', versions: [
21-
[name: '4.3.8', spring: '4.3.8.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default'],
22-
[name: '4.3.25', spring: '4.3.25.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default'],
23-
[name: '5.0.13', spring: '5.0.13.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default'],
24-
[name: '5.1.14', spring: '5.1.14.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default'],
25-
[name: '5.2.5', spring: '5.2.5.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default']
19+
[name: '4.3.8', spring: '4.3.8.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default'],
20+
[name: '4.3.29', spring: '4.3.29.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default'],
21+
[name: '5.0.19', spring: '5.0.19.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default'],
22+
[name: '5.1.19', spring: '5.1.19.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default'],
23+
[name: '5.2.11', spring: '5.2.11.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default'],
24+
[name: '5.3.1', spring: '5.3.1', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default']
2625
]],
2726
[name: 'flyway', versions: [
28-
[name: '3.0', flyway: '3.0', 'flyway-test': '3.0.1', spring: '4.3.8.RELEASE', 'spring-boot': '1.4.6.RELEASE', 'zonky-postgres': 'default'],
29-
[name: '3.1', flyway: '3.1', 'flyway-test': '3.1', spring: '4.3.8.RELEASE', 'spring-boot': '1.4.6.RELEASE', 'zonky-postgres': 'default'],
30-
[name: '3.2.1', flyway: '3.2.1', 'flyway-test': '3.2.1.1', spring: '4.3.8.RELEASE', 'spring-boot': '1.4.6.RELEASE', 'zonky-postgres': 'default'],
31-
[name: '4.0.3', flyway: '4.0.3', 'flyway-test': '4.0.1', spring: '4.3.25.RELEASE', 'spring-boot': '1.5.22.RELEASE', 'zonky-postgres': 'default'],
32-
[name: '4.1.2', flyway: '4.1.2', 'flyway-test': '4.1.0', spring: '4.3.25.RELEASE', 'spring-boot': '1.5.22.RELEASE', 'zonky-postgres': 'default'],
33-
[name: '4.2.0', flyway: '4.2.0', 'flyway-test': '4.2.0.2', spring: '4.3.25.RELEASE', 'spring-boot': '1.5.22.RELEASE', 'zonky-postgres': 'default'],
34-
[name: '5.0.7', flyway: '5.0.7', 'flyway-test': '5.0.0', spring: '4.3.25.RELEASE', 'spring-boot': '1.5.22.RELEASE', 'zonky-postgres': 'default'],
35-
[name: '5.1.4', flyway: '5.1.4', 'flyway-test': '5.1.0', spring: '5.0.13.RELEASE', 'spring-boot': '2.0.9.RELEASE', 'zonky-postgres': 'default'],
36-
[name: '5.2.4', flyway: '5.2.4', 'flyway-test': '5.2.4', spring: '5.1.14.RELEASE', 'spring-boot': '2.1.13.RELEASE', 'zonky-postgres': 'default'],
37-
[name: '6.0.2', flyway: '6.0.2', 'flyway-test': '6.0.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
38-
[name: '6.0.8', flyway: '6.0.8', 'flyway-test': '6.0.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
39-
[name: '6.1.4', flyway: '6.1.4', 'flyway-test': '6.1.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
40-
[name: '6.2.4', flyway: '6.2.4', 'flyway-test': '6.1.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
41-
[name: '6.3.2', flyway: '6.3.2', 'flyway-test': '6.1.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
42-
[name: '6.3.3', flyway: '6.3.3', 'flyway-test': '6.3.3', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
43-
[name: '6.4.4', flyway: '6.4.4', 'flyway-test': '6.4.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
44-
[name: '6.5.3', flyway: '6.5.3', 'flyway-test': '6.4.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
45-
[name: '7.0.4', flyway: '7.0.4', 'flyway-test': '7.0.0', spring: '5.3.1', 'spring-boot': '2.4.0', 'zonky-postgres': 'default'],
46-
[name: '7.1.1', flyway: '7.1.1', 'flyway-test': '7.0.0', spring: '5.3.1', 'spring-boot': '2.4.0', 'zonky-postgres': 'default'],
47-
[name: '7.2.0', flyway: '7.1.1', 'flyway-test': '7.0.0', spring: '5.3.1', 'spring-boot': '2.4.0', 'zonky-postgres': 'default'],
48-
[name: 'no_sb', flyway: 'default', 'flyway-test': 'default', 'zonky-postgres': 'default']
27+
[name: '3.0', flyway: '3.0', 'flyway-test': '3.0.1', spring: '4.3.8.RELEASE', 'spring-boot': '1.4.6.RELEASE', 'zonky-postgres': 'default'],
28+
[name: '3.1', flyway: '3.1', 'flyway-test': '3.1', spring: '4.3.8.RELEASE', 'spring-boot': '1.4.6.RELEASE', 'zonky-postgres': 'default'],
29+
[name: '3.2.1', flyway: '3.2.1', 'flyway-test': '3.2.1.1', spring: '4.3.8.RELEASE', 'spring-boot': '1.4.6.RELEASE', 'zonky-postgres': 'default'],
30+
[name: '4.0.3', flyway: '4.0.3', 'flyway-test': '4.0.1', spring: '4.3.25.RELEASE', 'spring-boot': '1.5.22.RELEASE', 'zonky-postgres': 'default'],
31+
[name: '4.1.2', flyway: '4.1.2', 'flyway-test': '4.1.0', spring: '4.3.25.RELEASE', 'spring-boot': '1.5.22.RELEASE', 'zonky-postgres': 'default'],
32+
[name: '4.2.0', flyway: '4.2.0', 'flyway-test': '4.2.0.2', spring: '4.3.25.RELEASE', 'spring-boot': '1.5.22.RELEASE', 'zonky-postgres': 'default'],
33+
[name: '5.0.7', flyway: '5.0.7', 'flyway-test': '5.0.0', spring: '5.0.13.RELEASE', 'spring-boot': '2.0.9.RELEASE', 'zonky-postgres': 'default'],
34+
[name: '5.1.4', flyway: '5.1.4', 'flyway-test': '5.1.0', spring: '5.0.13.RELEASE', 'spring-boot': '2.0.9.RELEASE', 'zonky-postgres': 'default'],
35+
[name: '5.2.4', flyway: '5.2.4', 'flyway-test': '5.2.4', spring: '5.1.19.RELEASE', 'spring-boot': '2.1.18.RELEASE', 'zonky-postgres': 'default'],
36+
[name: '6.0.6', flyway: '6.0.6', 'flyway-test': '6.0.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
37+
[name: '6.0.8', flyway: '6.0.8', 'flyway-test': '6.0.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
38+
[name: '6.1.4', flyway: '6.1.4', 'flyway-test': '6.1.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
39+
[name: '6.2.4', flyway: '6.2.4', 'flyway-test': '6.1.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
40+
[name: '6.3.2', flyway: '6.3.2', 'flyway-test': '6.1.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
41+
[name: '6.3.3', flyway: '6.3.3', 'flyway-test': '6.3.3', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
42+
[name: '6.4.4', flyway: '6.4.4', 'flyway-test': '6.4.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
43+
[name: '6.5.7', flyway: '6.5.7', 'flyway-test': '6.4.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE', 'zonky-postgres': 'default'],
44+
[name: '7.0.4', flyway: '7.0.4', 'flyway-test': '7.0.0', spring: '5.3.1', 'spring-boot': '2.4.0', 'zonky-postgres': 'default'],
45+
[name: '7.1.1', flyway: '7.1.1', 'flyway-test': '7.0.0', spring: '5.3.1', 'spring-boot': '2.4.0', 'zonky-postgres': 'default'],
46+
[name: '7.2.1', flyway: '7.2.1', 'flyway-test': '7.0.0', spring: '5.3.1', 'spring-boot': '2.4.0', 'zonky-postgres': 'default'],
47+
[name: 'no_sb', flyway: 'default', 'flyway-test': 'default', 'zonky-postgres': 'default']
4948
]],
5049
[name: 'liquibase', versions: [
51-
[name: '3.5.3', liquibase: '3.5.3', spring: '4.3.8.RELEASE', 'spring-boot': '1.4.6.RELEASE'],
52-
[name: '3.5.5', liquibase: '3.5.5', spring: '4.3.25.RELEASE', 'spring-boot': '1.5.22.RELEASE'],
53-
[name: '3.6.3', liquibase: '3.6.3', spring: '5.1.14.RELEASE', 'spring-boot': '2.1.13.RELEASE'],
54-
[name: '3.8.8', liquibase: '3.8.8', spring: '5.2.5.RELEASE', 'spring-boot': '2.2.6.RELEASE'],
55-
[name: 'no_sb', liquibase: 'default']
50+
[name: '3.5.3', liquibase: '3.5.3', spring: '4.3.8.RELEASE', 'spring-boot': '1.4.6.RELEASE'],
51+
[name: '3.5.5', liquibase: '3.5.5', spring: '4.3.25.RELEASE', 'spring-boot': '1.5.22.RELEASE'],
52+
[name: '3.6.3', liquibase: '3.6.3', spring: '5.1.19.RELEASE', 'spring-boot': '2.1.18.RELEASE'],
53+
[name: '3.7.0', liquibase: '3.7.0', spring: '5.1.19.RELEASE', 'spring-boot': '2.1.18.RELEASE'],
54+
[name: '3.8.9', liquibase: '3.8.9', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE'],
55+
[name: '3.9.0', liquibase: '3.9.0', spring: '5.2.10.RELEASE', 'spring-boot': '2.2.11.RELEASE'],
56+
[name: '3.10.3', liquibase: '3.10.3', spring: '5.3.1', 'spring-boot': '2.4.0'],
57+
[name: '4.0.0', liquibase: '4.0.0', spring: '5.3.1', 'spring-boot': '2.4.0'],
58+
[name: '4.1.1', liquibase: '4.1.1', spring: '5.3.1', 'spring-boot': '2.4.0'],
59+
[name: '4.2.0', liquibase: '4.2.0', spring: '5.3.1', 'spring-boot': '2.4.0'],
60+
[name: 'no_sb', liquibase: 'default']
5661
]],
5762
[name: 'postgres', versions: [
58-
[name: '9.5.20', postgres: '9.5.20', 'zonky-postgres': '9.5.20', opentable: '0.12.8', yandex: 'default'],
59-
[name: '9.6.16', postgres: '9.6.16', 'zonky-postgres': '9.6.16', opentable: '0.12.8', yandex: 'default'],
60-
[name: '10.11', postgres: '10.11', 'zonky-postgres': '10.11.0', opentable: '0.13.3', yandex: 'default'],
61-
[name: '11.6', postgres: '11.6', 'zonky-postgres': '11.6.0', opentable: 'default', yandex: 'default'],
62-
[name: '12.1', postgres: '12.1', 'zonky-postgres': '12.1.0', opentable: 'default', yandex: 'default']
63+
[name: '9.5.20', postgres: '9.5.20', 'zonky-postgres': '9.5.20', opentable: '0.12.8', yandex: 'default'],
64+
[name: '9.6.16', postgres: '9.6.16', 'zonky-postgres': '9.6.16', opentable: '0.12.8', yandex: 'default'],
65+
[name: '10.11', postgres: '10.11', 'zonky-postgres': '10.11.0', opentable: '0.13.3', yandex: 'default'],
66+
[name: '11.6', postgres: '11.6', 'zonky-postgres': '11.6.0', opentable: 'default', yandex: 'default'],
67+
[name: '12.1', postgres: '12.1', 'zonky-postgres': '12.1.0', opentable: 'default', yandex: 'default']
6368
]],
6469
[name: 'mssql', versions: [
65-
[name: '2017', 'mssql': '2017-latest', 'mssql-driver': 'default'],
66-
[name: '2019', 'mssql': '2019-latest', 'mssql-driver': 'default']
70+
[name: '2017', 'mssql': '2017-latest', 'mssql-driver': 'default'],
71+
[name: '2019', 'mssql': '2019-latest', 'mssql-driver': 'default']
6772
]],
6873
[name: 'mysql', versions: [
69-
[name: '8.0', 'mysql': '8.0', 'mysql-driver': 'default'],
70-
[name: '5.7', 'mysql': '5.7', 'mysql-driver': 'default'],
71-
[name: '5.6', 'mysql': '5.6', 'mysql-driver': 'default']
74+
[name: '5.6', 'mysql': '5.6', 'mysql-driver': 'default'],
75+
[name: '5.7', 'mysql': '5.7', 'mysql-driver': 'default'],
76+
[name: '8.0', 'mysql': '8.0', 'mysql-driver': 'default']
7277
]],
7378
[name: 'mariadb', versions: [
74-
[name: '10.5', 'mariadb': '10.5', 'mariadb-driver': 'default'],
75-
[name: '10.4', 'mariadb': '10.4', 'mariadb-driver': 'default'],
76-
[name: '10.3', 'mariadb': '10.3', 'mariadb-driver': 'default'],
77-
[name: '10.2', 'mariadb': '10.2', 'mariadb-driver': 'default'],
78-
[name: '10.1', 'mariadb': '10.1', 'mariadb-driver': 'default']
79+
[name: '10.1', 'mariadb': '10.1', 'mariadb-driver': 'default'],
80+
[name: '10.2', 'mariadb': '10.2', 'mariadb-driver': 'default'],
81+
[name: '10.3', 'mariadb': '10.3', 'mariadb-driver': 'default'],
82+
[name: '10.4', 'mariadb': '10.4', 'mariadb-driver': 'default'],
83+
[name: '10.5', 'mariadb': '10.5', 'mariadb-driver': 'default']
7984
]]
8085
]
8186
}
@@ -158,10 +163,6 @@ subprojects {
158163
}
159164

160165
developers {
161-
developer {
162-
name 'Roman Pichlik'
163-
email '[email protected]'
164-
}
165166
developer {
166167
name 'Tomas Vanek'
167168
email '[email protected]'
@@ -195,17 +196,17 @@ project(':embedded-database-spring-test') {
195196
dependencies {
196197
compile project(':embedded-database-spring-test-autoconfigure')
197198

198-
compile 'org.testcontainers:postgresql:1.14.1'
199-
compile 'org.testcontainers:mssqlserver:1.14.1'
200-
compile 'org.testcontainers:mysql:1.14.1'
201-
compile 'org.testcontainers:mariadb:1.14.1'
199+
compile 'org.testcontainers:postgresql:1.15.0'
200+
compile 'org.testcontainers:mssqlserver:1.15.0'
201+
compile 'org.testcontainers:mysql:1.15.0'
202+
compile 'org.testcontainers:mariadb:1.15.0'
202203

203204
compile 'io.zonky.test:embedded-postgres:1.2.8', optional
204-
compile 'com.opentable.components:otj-pg-embedded:0.13.1', optional
205+
compile 'com.opentable.components:otj-pg-embedded:0.13.3', optional
205206
compile 'ru.yandex.qatools.embed:postgresql-embedded:2.10', optional
206-
compile 'com.microsoft.sqlserver:mssql-jdbc:8.2.2.jre8', optional
207-
compile 'mysql:mysql-connector-java:8.0.15', optional
208-
compile 'org.mariadb.jdbc:mariadb-java-client:2.3.0', optional
207+
compile 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre8', optional
208+
compile 'mysql:mysql-connector-java:8.0.22', optional
209+
compile 'org.mariadb.jdbc:mariadb-java-client:2.7.0', optional
209210

210211
compile 'org.flywaydb:flyway-core:5.0.7', optional
211212
compile 'org.flywaydb.flyway-test-extensions:flyway-spring-test:5.0.0', optional
@@ -223,7 +224,7 @@ project(':embedded-database-spring-test') {
223224
testCompile 'org.springframework:spring-jdbc:4.3.25.RELEASE'
224225
testCompile 'ch.qos.logback:logback-classic:1.2.3'
225226
testCompile 'org.mockito:mockito-core:1.10.19'
226-
testCompile 'org.assertj:assertj-core:3.14.0'
227+
testCompile 'org.assertj:assertj-core:3.18.1'
227228
}
228229

229230
configurations {

‎embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/postgres/DockerPostgresDatabaseProvider.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
import com.google.common.collect.ImmutableMap;
2626
import com.google.common.util.concurrent.UncheckedExecutionException;
2727
import io.zonky.test.db.preparer.DatabasePreparer;
28-
import io.zonky.test.db.provider.support.BlockingDatabaseWrapper;
2928
import io.zonky.test.db.provider.DatabaseRequest;
3029
import io.zonky.test.db.provider.DatabaseTemplate;
3130
import io.zonky.test.db.provider.EmbeddedDatabase;
3231
import io.zonky.test.db.provider.ProviderException;
33-
import io.zonky.test.db.provider.support.SimpleDatabaseTemplate;
3432
import io.zonky.test.db.provider.TemplatableDatabaseProvider;
33+
import io.zonky.test.db.provider.support.BlockingDatabaseWrapper;
34+
import io.zonky.test.db.provider.support.SimpleDatabaseTemplate;
3535
import io.zonky.test.db.util.PropertyUtils;
3636
import org.apache.commons.lang3.RandomStringUtils;
3737
import org.postgresql.ds.PGSimpleDataSource;
@@ -40,8 +40,10 @@
4040
import org.slf4j.LoggerFactory;
4141
import org.springframework.beans.factory.ObjectProvider;
4242
import org.springframework.core.env.Environment;
43+
import org.springframework.util.ClassUtils;
4344
import org.testcontainers.containers.PostgreSQLContainer;
4445
import org.testcontainers.containers.output.Slf4jLogConsumer;
46+
import org.testcontainers.utility.DockerImageName;
4547

4648
import javax.sql.DataSource;
4749
import java.sql.Connection;
@@ -59,6 +61,7 @@
5961
import java.util.function.Consumer;
6062
import java.util.stream.Collectors;
6163

64+
import static io.zonky.test.db.util.ReflectionUtils.invokeMethod;
6265
import static java.util.Collections.emptyList;
6366
import static org.testcontainers.containers.PostgreSQLContainer.POSTGRESQL_PORT;
6467

@@ -152,7 +155,12 @@ private DatabaseInstance(DatabaseConfig config) {
152155
.map(e -> String.format("-c %s=%s", e.getKey(), e.getValue()))
153156
.collect(Collectors.joining(" "));
154157

155-
container = new PostgreSQLContainer(config.dockerImage) {
158+
DockerImageName dockerImage = DockerImageName.parse(config.dockerImage);
159+
if (ClassUtils.hasMethod(DockerImageName.class, "asCompatibleSubstituteFor", String.class)) {
160+
dockerImage = invokeMethod(dockerImage, "asCompatibleSubstituteFor", "postgres");
161+
}
162+
163+
container = new PostgreSQLContainer(dockerImage) {
156164
@Override
157165
protected void configure() {
158166
super.configure();

0 commit comments

Comments
 (0)