Skip to content

Commit 0d9881a

Browse files
reneleonhardtreneleonhardt
committed
chore(deps): Update dependencies
1 parent 49e474f commit 0d9881a

File tree

15 files changed

+330
-237
lines changed

15 files changed

+330
-237
lines changed

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
java: [8, 11, 17]
10+
java: [8, 11, 17, 21]
1111
steps:
1212
- name: Checkout project
1313
uses: actions/checkout@v3

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -526,19 +526,19 @@ The provider configuration can be managed via properties in the
526526
and `zonky.test.database.mssql.docker` groups as shown below.
527527

528528
```properties
529-
zonky.test.database.postgres.docker.image=postgres:11-alpine # Docker image containing PostgreSQL database.
529+
zonky.test.database.postgres.docker.image=postgres:16-alpine # Docker image containing PostgreSQL database.
530530
zonky.test.database.postgres.docker.tmpfs.enabled=false # Whether to mount postgres data directory as tmpfs.
531531
zonky.test.database.postgres.docker.tmpfs.options=rw,noexec,nosuid # Mount options used to configure the tmpfs filesystem.
532532

533-
zonky.test.database.mysql.docker.image=mysql:5.7 # Docker image containing MySQL database.
533+
zonky.test.database.mysql.docker.image=mysql:9 # Docker image containing MySQL database (arm64 requires 8+).
534534
zonky.test.database.mysql.docker.tmpfs.enabled=false # Whether to mount database data directory as tmpfs.
535535
zonky.test.database.mysql.docker.tmpfs.options=rw,noexec,nosuid # Mount options used to configure the tmpfs filesystem.
536536

537-
zonky.test.database.mariadb.docker.image=mariadb:10.4 # Docker image containing MariaDB database.
537+
zonky.test.database.mariadb.docker.image=mariadb:11.5 # Docker image containing MariaDB database.
538538
zonky.test.database.mariadb.docker.tmpfs.enabled=false # Whether to mount database data directory as tmpfs.
539539
zonky.test.database.mariadb.docker.tmpfs.options=rw,noexec,nosuid # Mount options used to configure the tmpfs filesystem.
540540

541-
zonky.test.database.mssql.docker.image=mcr.microsoft.com/mssql/server:2017-latest # Docker image containing MSSQL database.
541+
zonky.test.database.mssql.docker.image=mcr.microsoft.com/mssql/server:2022-latest # Docker image containing MSSQL database.
542542
```
543543

544544
Or, the provider configuration can also be customized with a bean implementing `PostgreSQLContainerCustomizer` interface.
@@ -722,7 +722,7 @@ public class YandexProviderIntegrationTest {
722722
The provider configuration can be managed via properties in the `zonky.test.database.postgres.yandex-provider` group.
723723

724724
```properties
725-
zonky.test.database.postgres.yandex-provider.postgres-version=11.10-1 # Version of EnterpriseDB PostgreSQL binaries (https://www.enterprisedb.com/download-postgresql-binaries).
725+
zonky.test.database.postgres.yandex-provider.postgres-version=12.18-1 # Version of EnterpriseDB PostgreSQL binaries (https://www.enterprisedb.com/download-postgresql-binaries).
726726
```
727727

728728
## Advanced Topics

‎build.gradle‎

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import java.util.regex.Matcher
22

33
plugins {
4-
id 'net.researchgate.release' version '2.8.1'
5-
id 'com.github.johnrengelman.shadow' version '7.1.2'
4+
id 'net.researchgate.release' version '3.0.2'
5+
id 'com.github.johnrengelman.shadow' version '8.1.1'
66
}
77

88
ext {
@@ -91,29 +91,34 @@ ext {
9191
]
9292
}
9393

94-
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
95-
testSuites.find { it.name == 'hsqldb' }.versions << [name: '2.7.1', 'hsqldb': '2.7.1']
96-
}
9794
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_1_9)) {
9895
testSuites.find { it.name == 'derby' }.versions << [name: '10.15.2.0', 'derby': '10.15.2.0']
9996
}
97+
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
98+
testSuites.find { it.name == 'hsqldb' }.versions << [name: '2.7.3', 'hsqldb': '2.7.3']
99+
testSuites.find { it.name == 'h2' }.versions << [name: '2.2.232', 'h2': '2.3.232']
100+
testSuites.find { it.name == 'otj-pg-embedded' }.versions << [name: '1.1.0', 'otj-pg-embedded': '1.1.0']
101+
}
100102
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
101103
testSuites.find { it.name == 'derby' }.versions << [name: '10.16.1.1', 'derby': '10.16.1.1']
102104

103105
testSuites.find { it.name == 'flyway' }.versions += [
104106
[name: '9.9.0', flyway: '9.9.0', 'flyway-test': '9.5.0', spring: '6.0.14', 'spring-boot': '3.0.13', 'zonky-postgres': 'default'],
105-
[name: '9.16.3', flyway: '9.16.3', 'flyway-test': '9.5.0', spring: '6.0.18', 'spring-boot': '3.1.10', 'zonky-postgres': 'default'],
106-
[name: '9.22.3', flyway: '9.22.3', 'flyway-test': '9.5.0', spring: '6.1.5', 'spring-boot': '3.2.4', 'zonky-postgres': 'default'],
107-
[name: '10.0.1', flyway: '10.0.1', 'flyway-test': '10.0.0', spring: '6.1.5', 'spring-boot': '3.2.4', 'zonky-postgres': 'default'],
108-
[name: '10.11.0', flyway: '10.5.0', 'flyway-test': '10.0.0', spring: '6.1.5', 'spring-boot': '3.2.4', 'zonky-postgres': 'default']
107+
[name: '9.16.3', flyway: '9.16.3', 'flyway-test': '9.5.0', spring: '6.0.21', 'spring-boot': '3.1.12', 'zonky-postgres': 'default'],
108+
[name: '9.22.3', flyway: '9.22.3', 'flyway-test': '9.5.0', spring: '6.1.11', 'spring-boot': '3.2.8', 'zonky-postgres': 'default'],
109+
[name: '10.0.1', flyway: '10.0.1', 'flyway-test': '10.0.0', spring: '6.1.11', 'spring-boot': '3.2.8', 'zonky-postgres': 'default'],
110+
[name: '10.17.1', flyway: '10.17.1', 'flyway-test': '10.0.0', spring: '6.1.11', 'spring-boot': '3.2.8', 'zonky-postgres': 'default']
109111
]
110112

111113
testSuites.find { it.name == 'liquibase' }.versions += [
112114
[name: '4.17.2', liquibase: '4.17.2', spring: '6.0.14', 'spring-boot': '3.0.13'],
113-
[name: '4.20.0', liquibase: '4.20.0', spring: '6.0.18', 'spring-boot': '3.1.10'],
114-
[name: '4.24.0', liquibase: '4.24.0', spring: '6.1.5', 'spring-boot': '3.2.4']
115+
[name: '4.20.0', liquibase: '4.20.0', spring: '6.0.21', 'spring-boot': '3.1.12'],
116+
[name: '4.24.0', liquibase: '4.24.0', spring: '6.1.11', 'spring-boot': '3.2.8']
115117
]
116118
}
119+
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) {
120+
testSuites.find { it.name == 'derby' }.versions << [name: '10.17.1.0', 'derby': '10.17.1.0']
121+
}
117122

118123
allprojects {
119124
group 'io.zonky.test'
@@ -233,7 +238,7 @@ subprojects {
233238
/(\d+)\.\d+(([^\d\.].*)?$)/: { Matcher m, Project p -> m.replaceAll("${(m[0][1] as int) + 1}.0${m[0][2]}") }
234239
]
235240
git {
236-
requireBranch = '^(master|\\d+\\.\\d+\\.x)$'
241+
requireBranch.set('^(master|\\d+\\.\\d+\\.x)$')
237242
}
238243
}
239244
}
@@ -253,20 +258,20 @@ project(':embedded-database-spring-test') {
253258
dependencies {
254259
api project(':embedded-database-spring-test-autoconfigure')
255260

256-
api 'org.testcontainers:postgresql:1.18.3'
257-
api 'org.testcontainers:mssqlserver:1.18.3'
258-
api 'org.testcontainers:mysql:1.18.3'
259-
api 'org.testcontainers:mariadb:1.18.3'
261+
api 'org.testcontainers:postgresql:1.20.1'
262+
api 'org.testcontainers:mssqlserver:1.20.1'
263+
api 'org.testcontainers:mysql:1.20.1'
264+
api 'org.testcontainers:mariadb:1.20.1'
260265

261266
optImplementation 'io.zonky.test:embedded-postgres:2.0.7'
262267
optImplementation 'com.opentable.components:otj-pg-embedded:0.13.4'
263268
optImplementation 'ru.yandex.qatools.embed:postgresql-embedded:2.10'
264269

265270
optImplementation 'org.postgresql:postgresql:42.7.3'
266-
optImplementation 'com.microsoft.sqlserver:mssql-jdbc:11.2.0.jre8'
267-
optImplementation 'mysql:mysql-connector-java:8.0.30'
268-
optImplementation 'org.mariadb.jdbc:mariadb-java-client:3.1.0'
269-
optImplementation 'com.h2database:h2:2.1.214'
271+
optImplementation 'com.microsoft.sqlserver:mssql-jdbc:12.8.0.jre8'
272+
optImplementation 'mysql:mysql-connector-java:8.0.33'
273+
optImplementation 'org.mariadb.jdbc:mariadb-java-client:3.4.1'
274+
optImplementation 'com.h2database:h2:2.2.224'
270275
optImplementation 'org.hsqldb:hsqldb:2.5.2'
271276
optImplementation 'org.apache.derby:derby:10.14.2.0'
272277
optImplementation 'org.apache.derby:derbytools:10.14.2.0'
@@ -276,22 +281,22 @@ project(':embedded-database-spring-test') {
276281
optImplementation('org.springframework.boot:spring-boot-starter-test:2.7.18') {
277282
exclude group: 'org.mockito'
278283
}
279-
optImplementation 'org.liquibase:liquibase-core:3.5.5'
284+
optImplementation 'org.liquibase:liquibase-core:3.10.3'
280285

281286
api 'org.springframework:spring-context:5.3.31'
282287
api 'org.springframework:spring-test:5.3.31'
283288

284-
optImplementation 'com.google.guava:guava:24.1.1-jre'
289+
optImplementation 'com.google.guava:guava:33.2.1-jre'
285290

286-
api('com.cedarsoftware:java-util:1.68.0') {
291+
api('com.cedarsoftware:java-util:2.13.0') {
287292
exclude group: 'org.apache.logging.log4j'
288293
}
289294

290-
testImplementation 'org.springframework:spring-jdbc:5.3.31'
291-
testImplementation 'ch.qos.logback:logback-classic:1.2.11'
292-
testImplementation 'org.mockito:mockito-core:3.12.4'
293-
testImplementation 'org.assertj:assertj-core:3.23.1'
294-
testImplementation 'com.zaxxer:HikariCP:4.0.3'
295+
testImplementation 'org.springframework:spring-jdbc:5.3.31' // 5.3 is Java 8
296+
testImplementation 'ch.qos.logback:logback-classic:1.3.14' // 1.3 is Java 8
297+
testImplementation 'org.mockito:mockito-core:3.12.4' // 4.11.0 is Java 8
298+
testImplementation 'org.assertj:assertj-core:3.26.3'
299+
testImplementation 'com.zaxxer:HikariCP:4.0.3' // 4.0 is Java 8
295300
}
296301

297302
configurations {
@@ -327,7 +332,7 @@ project(':embedded-database-spring-test') {
327332

328333
eachDependency { details ->
329334
if (details.requested.group == 'junit') {
330-
details.useVersion "4.12"
335+
details.useVersion "4.13.2"
331336
}
332337
}
333338

@@ -579,7 +584,7 @@ task updateReadmeVersion() {
579584
}
580585

581586
// workaround for https://github.com/researchgate/gradle-release/issues/186
582-
task build(group: 'build') {
587+
tasks.named('build') {
583588
subprojects.each {
584589
dependsOn "${it.path}:build"
585590
}

‎embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/mariadb/DockerMariaDBDatabaseProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public DatabasePool load(DatabaseConfig config) {
7575
private final ClientConfig clientConfig;
7676

7777
public DockerMariaDBDatabaseProvider(Environment environment, ObjectProvider<List<MariaDBContainerCustomizer>> containerCustomizers) {
78-
String dockerImage = environment.getProperty("zonky.test.database.mariadb.docker.image", "mariadb:10.4");
78+
String dockerImage = environment.getProperty("zonky.test.database.mariadb.docker.image", "mariadb:10.11");
7979
String tmpfsOptions = environment.getProperty("zonky.test.database.mariadb.docker.tmpfs.options", "rw,noexec,nosuid");
8080
boolean tmpfsEnabled = environment.getProperty("zonky.test.database.mariadb.docker.tmpfs.enabled", boolean.class, false);
8181

‎embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/mysql/DockerMySQLDatabaseProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public DatabasePool load(DatabaseConfig config) {
7575
private final ClientConfig clientConfig;
7676

7777
public DockerMySQLDatabaseProvider(Environment environment, ObjectProvider<List<MySQLContainerCustomizer>> containerCustomizers) {
78-
String dockerImage = environment.getProperty("zonky.test.database.mysql.docker.image", "mysql:5.7");
78+
String dockerImage = environment.getProperty("zonky.test.database.mysql.docker.image", "mysql:8.4");
7979
String tmpfsOptions = environment.getProperty("zonky.test.database.mysql.docker.tmpfs.options", "rw,noexec,nosuid");
8080
boolean tmpfsEnabled = environment.getProperty("zonky.test.database.mysql.docker.tmpfs.enabled", boolean.class, false);
8181

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public DatabaseInstance load(DatabaseConfig config) {
8282
private final ClientConfig clientConfig;
8383

8484
public DockerPostgresDatabaseProvider(Environment environment, ObjectProvider<List<PostgreSQLContainerCustomizer>> containerCustomizers) {
85-
String dockerImage = environment.getProperty("zonky.test.database.postgres.docker.image", "postgres:11-alpine");
85+
String dockerImage = environment.getProperty("zonky.test.database.postgres.docker.image", "postgres:16-alpine");
8686
String tmpfsOptions = environment.getProperty("zonky.test.database.postgres.docker.tmpfs.options", "rw,noexec,nosuid");
8787
boolean tmpfsEnabled = environment.getProperty("zonky.test.database.postgres.docker.tmpfs.enabled", boolean.class, false);
8888

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public DatabaseInstance load(DatabaseConfig config) throws IOException {
8080
private final ClientConfig clientConfig;
8181

8282
public YandexPostgresDatabaseProvider(Environment environment) {
83-
String postgresVersion = environment.getProperty("zonky.test.database.postgres.yandex-provider.postgres-version", "11.10-1");
83+
String postgresVersion = environment.getProperty("zonky.test.database.postgres.yandex-provider.postgres-version", "11.21-1");
8484

8585
Map<String, String> initdbProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.initdb.properties");
8686
Map<String, String> configProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.server.properties");

‎embedded-database-spring-test/src/main/resources/META-INF/spring-configuration-metadata.json‎

Lines changed: 39 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
"name": "zonky.test.database.postgres.yandex-provider.postgres-version",
132132
"type": "java.lang.String",
133133
"description": "Version of EnterpriseDB PostgreSQL binaries (https://www.enterprisedb.com/download-postgresql-binaries).",
134-
"defaultValue": "11.10-1"
134+
"defaultValue": "11.21-1"
135135
},
136136
{
137137
"name": "zonky.test.database.mssql.client.properties",
@@ -256,76 +256,64 @@
256256
"name": "zonky.test.database.postgres.docker.image",
257257
"values": [
258258
{
259-
"value": "postgres:13-alpine"
260-
},
261-
{
262-
"value": "postgres:12-alpine"
263-
},
264-
{
265-
"value": "postgres:11-alpine"
266-
},
267-
{
268-
"value": "postgres:10-alpine"
269-
},
270-
{
271-
"value": "postgres:9.6-alpine"
259+
"value": "postgres:16-alpine"
272260
},
273261
{
274-
"value": "postgres:9.5-alpine"
262+
"value": "postgres:15-alpine"
275263
},
276264
{
277-
"value": "postgres:13"
265+
"value": "postgres:14-alpine"
278266
},
279267
{
280-
"value": "postgres:12"
268+
"value": "postgres:13-alpine"
281269
},
282270
{
283-
"value": "postgres:11"
271+
"value": "postgres:12-alpine"
284272
},
285273
{
286-
"value": "postgres:10"
274+
"value": "postgres:16"
287275
},
288276
{
289-
"value": "postgres:9.6"
277+
"value": "postgres:15"
290278
},
291279
{
292-
"value": "postgres:9.5"
280+
"value": "postgres:14"
293281
},
294282
{
295-
"value": "postgis/postgis:13-3.1-alpine"
283+
"value": "postgres:13"
296284
},
297285
{
298-
"value": "postgis/postgis:12-3.1-alpine"
286+
"value": "postgres:12"
299287
},
300288
{
301-
"value": "postgis/postgis:11-3.1-alpine"
289+
"value": "postgis/postgis:16-3.4-alpine"
302290
},
303291
{
304-
"value": "postgis/postgis:10-3.1-alpine"
292+
"value": "postgis/postgis:15-3.4-alpine"
305293
},
306294
{
307-
"value": "postgis/postgis:9.6-3.1-alpine"
295+
"value": "postgis/postgis:14-3.4-alpine"
308296
},
309297
{
310-
"value": "postgis/postgis:9.5-3.0-alpine"
298+
"value": "postgis/postgis:13-3.4-alpine"
311299
},
312300
{
313-
"value": "postgis/postgis:13-3.1"
301+
"value": "postgis/postgis:12-3.4-alpine"
314302
},
315303
{
316-
"value": "postgis/postgis:12-3.1"
304+
"value": "postgis/postgis:16-3.4"
317305
},
318306
{
319-
"value": "postgis/postgis:11-3.1"
307+
"value": "postgis/postgis:15-3.4"
320308
},
321309
{
322-
"value": "postgis/postgis:10-3.1"
310+
"value": "postgis/postgis:14-3.4"
323311
},
324312
{
325-
"value": "postgis/postgis:9.6-3.1"
313+
"value": "postgis/postgis:13-3.4"
326314
},
327315
{
328-
"value": "postgis/postgis:9.5-3.0"
316+
"value": "postgis/postgis:12-3.4"
329317
}
330318
],
331319
"providers": [
@@ -357,13 +345,16 @@
357345
"name": "zonky.test.database.mysql.docker.image",
358346
"values": [
359347
{
360-
"value": "mysql:8.0"
348+
"value": "mysql:9.0"
361349
},
362350
{
363-
"value": "mysql:5.7"
351+
"value": "mysql:8.4"
352+
},
353+
{
354+
"value": "mysql:8.0"
364355
},
365356
{
366-
"value": "mysql:5.6"
357+
"value": "mysql:5.7"
367358
}
368359
],
369360
"providers": [
@@ -376,19 +367,25 @@
376367
"name": "zonky.test.database.mariadb.docker.image",
377368
"values": [
378369
{
379-
"value": "mariadb:10.5"
370+
"value": "mariadb:11.5"
371+
},
372+
{
373+
"value": "mariadb:11.4"
380374
},
381375
{
382-
"value": "mariadb:10.4"
376+
"value": "mariadb:11.2"
383377
},
384378
{
385-
"value": "mariadb:10.3"
379+
"value": "mariadb:11.1"
386380
},
387381
{
388-
"value": "mariadb:10.2"
382+
"value": "mariadb:10.11"
389383
},
390384
{
391-
"value": "mariadb:10.1"
385+
"value": "mariadb:10.6"
386+
},
387+
{
388+
"value": "mariadb:10.5"
392389
}
393390
],
394391
"providers": [
@@ -398,4 +395,4 @@
398395
]
399396
}
400397
]
401-
}
398+
}

‎embedded-database-spring-test/src/test/java/io/zonky/test/db/SpringBootCustomDatabaseIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class SpringBootCustomDatabaseIntegrationTest {
6868
public static ConditionalTestRule conditionalTestRule = new ConditionalTestRule(TestAssumptions::assumeSpringBootSupportsJdbcTestAnnotation);
6969

7070
@ClassRule
71-
public static PostgreSQLContainer<?> postgresContainer = new PostgreSQLContainer<>("postgres:11-alpine");
71+
public static PostgreSQLContainer<?> postgresContainer = new PostgreSQLContainer<>("postgres:16-alpine");
7272

7373
public static class DockerPropertiesInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
7474

0 commit comments

Comments
 (0)