Skip to content

Commit ba99b7f

Browse files
tomix26tomix26
authored
Merge pull request #269 from zonkyio/test-version-matrices
Update version matrices in test suites
2 parents 3fd0931 + 599b878 commit ba99b7f

File tree

2 files changed

+36
-29
lines changed

2 files changed

+36
-29
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The primary goal of this project is to make it easier to write Spring-powered in
1010
* Spring `4.3.8` - `6.1.x`
1111
* Spring Boot `1.4.6` - `3.2.x`
1212
* Supports multiple different databases
13-
* [PostgreSQL](#postgresql), [MSSQL](#microsoft-sql-server), [MySQL](#mysql), [MariaDB](#mariadb), [H2](#h2), [HSQLDB](#hsqldb) and [Derby](#derby)
13+
* [PostgreSQL](#postgresql), [MSSQL](#microsoft-sql-server), [MySQL](#mysql), [MariaDB](#mariadb), [H2](#h2), [HSQLDB](#hsqldb), [Derby](#derby)
1414
* Supports multiple database providers
1515
* [Docker / Testcontainers](#using-docker-provider-default), [Zonky](#using-zonky-provider-previous-default), [OpenTable](#using-opentable-provider), [Yandex](#using-yandex-provider)
1616
* Supports various database migration tools

‎build.gradle‎

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ ext {
3232
[name: '6.1.4', flyway: '6.1.4', 'flyway-test': '6.1.0', spring: '5.2.12.RELEASE', 'spring-boot': '2.2.13.RELEASE', 'zonky-postgres': 'default'],
3333
[name: '6.3.3', flyway: '6.3.3', 'flyway-test': '6.3.3', spring: '5.2.22.RELEASE', 'spring-boot': '2.2.13.RELEASE', 'zonky-postgres': 'default'],
3434
[name: '6.5.7', flyway: '6.5.7', 'flyway-test': '6.4.0', spring: '5.2.22.RELEASE', 'spring-boot': '2.2.13.RELEASE', 'zonky-postgres': 'default'],
35-
[name: '7.6.0', flyway: '7.6.0', 'flyway-test': '7.0.0', spring: '5.3.23', 'spring-boot': '2.4.13', 'zonky-postgres': 'default'],
36-
[name: '7.15.0', flyway: '7.15.0', 'flyway-test': '7.0.0', spring: '5.3.23', 'spring-boot': '2.5.14', 'zonky-postgres': 'default'],
37-
[name: '8.0.5', flyway: '8.0.5', 'flyway-test': '7.0.0', spring: '5.3.23', 'spring-boot': '2.6.13', 'zonky-postgres': 'default'],
38-
[name: '8.5.13', flyway: '8.5.13', 'flyway-test': '7.0.0', spring: '5.3.23', 'spring-boot': '2.7.5', 'zonky-postgres': 'default'],
39-
[name: '9.0.4', flyway: '9.0.4', 'flyway-test': '7.0.0', spring: '5.3.23', 'spring-boot': '2.7.5', 'zonky-postgres': 'default'],
40-
[name: '9.8.3', flyway: '9.8.3', 'flyway-test': '7.0.0', spring: '5.3.23', 'spring-boot': '2.7.5', 'zonky-postgres': 'default'],
35+
[name: '7.6.0', flyway: '7.6.0', 'flyway-test': '7.0.0', spring: '5.3.13', 'spring-boot': '2.4.13', 'zonky-postgres': 'default'],
36+
[name: '7.15.0', flyway: '7.15.0', 'flyway-test': '7.0.0', spring: '5.3.27', 'spring-boot': '2.5.15', 'zonky-postgres': 'default'],
37+
[name: '8.0.5', flyway: '8.0.5', 'flyway-test': '7.0.0', spring: '5.3.27', 'spring-boot': '2.6.15', 'zonky-postgres': 'default'],
38+
[name: '8.5.13', flyway: '8.5.13', 'flyway-test': '7.0.0', spring: '5.3.31', 'spring-boot': '2.7.18', 'zonky-postgres': 'default'],
39+
[name: '9.0.4', flyway: '9.0.4', 'flyway-test': '7.0.0', spring: '5.3.31', 'spring-boot': '2.7.18', 'zonky-postgres': 'default'],
40+
[name: '9.8.3', flyway: '9.8.3', 'flyway-test': '7.0.0', spring: '5.3.31', 'spring-boot': '2.7.18', 'zonky-postgres': 'default'],
4141
[name: 'no_sb', flyway: 'default', 'flyway-test': 'default', 'zonky-postgres': 'default']
4242
]],
4343
[name: 'liquibase', versions: [
@@ -46,18 +46,18 @@ ext {
4646
[name: '3.7.0', liquibase: '3.7.0', spring: '5.1.20.RELEASE', 'spring-boot': '2.1.18.RELEASE'],
4747
[name: '3.8.9', liquibase: '3.8.9', spring: '5.2.22.RELEASE', 'spring-boot': '2.2.13.RELEASE'],
4848
[name: '3.9.0', liquibase: '3.9.0', spring: '5.2.22.RELEASE', 'spring-boot': '2.2.13.RELEASE'],
49-
[name: '3.10.3', liquibase: '3.10.3', spring: '5.3.23', 'spring-boot': '2.4.13'],
50-
[name: '4.4.3', liquibase: '4.4.3', spring: '5.3.23', 'spring-boot': '2.5.14'],
51-
[name: '4.5.0', liquibase: '4.5.0', spring: '5.3.23', 'spring-boot': '2.6.11'],
52-
[name: '4.9.1', liquibase: '4.9.1', spring: '5.3.23', 'spring-boot': '2.7.3'],
49+
[name: '3.10.3', liquibase: '3.10.3', spring: '5.3.13', 'spring-boot': '2.4.13'],
50+
[name: '4.4.3', liquibase: '4.4.3', spring: '5.3.27', 'spring-boot': '2.5.15'],
51+
[name: '4.5.0', liquibase: '4.5.0', spring: '5.3.27', 'spring-boot': '2.6.15'],
52+
[name: '4.9.1', liquibase: '4.9.1', spring: '5.3.31', 'spring-boot': '2.7.18'],
5353
[name: 'no_sb', liquibase: 'default']
5454
]],
5555
[name: 'postgres', versions: [
56-
[name: '10', postgres: '10.22', 'zonky-postgres': '10.22.0', opentable: '0.13.4', yandex: 'default'],
57-
[name: '11', postgres: '11.17', 'zonky-postgres': '11.17.0', opentable: 'default', yandex: 'default'],
58-
[name: '12', postgres: '12.12', 'zonky-postgres': '12.12.0', opentable: 'default', yandex: 'default'],
59-
[name: '13', postgres: '13.8', 'zonky-postgres': '13.8.0', opentable: 'default', yandex: 'default'],
60-
[name: '14', postgres: '14.5', 'zonky-postgres': '14.5.0', opentable: 'default', yandex: 'default']
56+
[name: '12', postgres: '12.18', 'zonky-postgres': '12.18.0', opentable: 'default', yandex: 'default'],
57+
[name: '13', postgres: '13.14', 'zonky-postgres': '13.14.0', opentable: 'default', yandex: 'default'],
58+
[name: '14', postgres: '14.11', 'zonky-postgres': '14.11.0', opentable: 'default', yandex: 'default'],
59+
[name: '15', postgres: '15.6', 'zonky-postgres': '15.6.0', opentable: 'default', yandex: 'default'],
60+
[name: '16', postgres: '16.2', 'zonky-postgres': '16.2.0', opentable: 'default', yandex: 'default']
6161
]],
6262
[name: 'mssql', versions: [
6363
[name: '2017', 'mssql': '2017-latest', 'mssql-driver': 'default'],
@@ -66,17 +66,18 @@ ext {
6666
]],
6767
[name: 'mysql', versions: [
6868
[name: '5.7', 'mysql': '5.7', 'mysql-driver': 'default'],
69-
[name: '8.0', 'mysql': '8.0', 'mysql-driver': 'default']
69+
[name: '8.2', 'mysql': '8.2', 'mysql-driver': 'default']
7070
]],
7171
[name: 'mariadb', versions: [
7272
[name: '10.2', 'mariadb': '10.2', 'mariadb-driver': '2.7.7'],
73-
[name: '10.8', 'mariadb': '10.8', 'mariadb-driver': 'default']
73+
[name: '11.3', 'mariadb': '11.3', 'mariadb-driver': 'default']
7474
]],
7575
[name: 'h2', versions: [
7676
[name: '1.3.176', 'h2': '1.3.176'],
7777
[name: '1.4.200', 'h2': '1.4.200'],
7878
[name: '2.0.206', 'h2': '2.0.206'],
79-
[name: '2.1.214', 'h2': '2.1.214']
79+
[name: '2.1.214', 'h2': '2.1.214'],
80+
[name: '2.2.224', 'h2': '2.2.224']
8081
]],
8182
[name: 'hsqldb', versions: [
8283
[name: '2.3.6', 'hsqldb': '2.3.6'],
@@ -100,11 +101,17 @@ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
100101
testSuites.find { it.name == 'derby' }.versions << [name: '10.16.1.1', 'derby': '10.16.1.1']
101102

102103
testSuites.find { it.name == 'flyway' }.versions += [
103-
[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'],
104-
[name: '9.16.3', flyway: '9.16.3', 'flyway-test': '9.5.0', spring: '6.0.15', 'spring-boot': '3.1.7', 'zonky-postgres': 'default'],
105-
[name: '9.22.3', flyway: '9.22.3', 'flyway-test': '9.5.0', spring: '6.1.2', 'spring-boot': '3.2.1', 'zonky-postgres': 'default'],
106-
[name: '10.0.1', flyway: '10.0.1', 'flyway-test': '9.5.0', spring: '6.1.2', 'spring-boot': '3.2.1', 'zonky-postgres': 'default'],
107-
[name: '10.5.0', flyway: '10.5.0', 'flyway-test': '9.5.0', spring: '6.1.2', 'spring-boot': '3.2.1', 'zonky-postgres': 'default']
104+
[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']
109+
]
110+
111+
testSuites.find { it.name == 'liquibase' }.versions += [
112+
[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']
108115
]
109116
}
110117

@@ -264,23 +271,23 @@ project(':embedded-database-spring-test') {
264271
optImplementation 'org.apache.derby:derby:10.14.2.0'
265272
optImplementation 'org.apache.derby:derbytools:10.14.2.0'
266273

267-
optImplementation 'org.flywaydb:flyway-core:9.8.2'
274+
optImplementation 'org.flywaydb:flyway-core:9.8.3'
268275
optImplementation 'org.flywaydb.flyway-test-extensions:flyway-spring-test:7.0.0'
269-
optImplementation('org.springframework.boot:spring-boot-starter-test:2.7.6') {
276+
optImplementation('org.springframework.boot:spring-boot-starter-test:2.7.18') {
270277
exclude group: 'org.mockito'
271278
}
272279
optImplementation 'org.liquibase:liquibase-core:3.5.5'
273280

274-
api 'org.springframework:spring-context:5.3.24'
275-
api 'org.springframework:spring-test:5.3.24'
281+
api 'org.springframework:spring-context:5.3.31'
282+
api 'org.springframework:spring-test:5.3.31'
276283

277284
optImplementation 'com.google.guava:guava:24.1.1-jre'
278285

279286
api('com.cedarsoftware:java-util:1.68.0') {
280287
exclude group: 'org.apache.logging.log4j'
281288
}
282289

283-
testImplementation 'org.springframework:spring-jdbc:5.3.24'
290+
testImplementation 'org.springframework:spring-jdbc:5.3.31'
284291
testImplementation 'ch.qos.logback:logback-classic:1.2.11'
285292
testImplementation 'org.mockito:mockito-core:3.12.4'
286293
testImplementation 'org.assertj:assertj-core:3.23.1'

0 commit comments

Comments
 (0)