Skip to content

Commit a81b1eb

Browse files
tomix26tomix26
authored
Merge pull request #198 from zonkyio/dependency-upgrades
Upgrade outdated and vulnerable dependencies
2 parents 487d465 + ce41ac1 commit a81b1eb

File tree

2 files changed

+56
-71
lines changed

2 files changed

+56
-71
lines changed

‎build.gradle‎

Lines changed: 54 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -16,84 +16,64 @@ ext {
1616
]],
1717
[name: 'spring', versions: [
1818
[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', 'h2': 'default'],
19-
[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', 'h2': 'default'],
20-
[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', 'h2': 'default'],
21-
[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', 'h2': 'default'],
22-
[name: '5.2.12', spring: '5.2.12.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default', 'h2': 'default'],
23-
[name: '5.3.10', spring: '5.3.10', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default', 'h2': 'default']
19+
[name: '4.3.30', spring: '4.3.30.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default', 'h2': 'default'],
20+
[name: '5.0.20', spring: '5.0.20.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default', 'h2': 'default'],
21+
[name: '5.1.20', spring: '5.1.20.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default', 'h2': 'default'],
22+
[name: '5.2.22', spring: '5.2.22.RELEASE', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default', 'h2': 'default'],
23+
[name: '5.3.22', spring: '5.3.22', 'zonky-postgres': 'default', opentable: 'default', yandex: 'default', 'mssql-driver': 'default', 'mysql-driver': 'default', 'mariadb-driver': 'default', 'h2': 'default']
2424
]],
2525
[name: 'flyway', versions: [
26-
[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'],
27-
[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'],
28-
[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'],
29-
[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'],
30-
[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'],
31-
[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'],
32-
[name: '6.0.6', flyway: '6.0.6', 'flyway-test': '6.0.0', spring: '5.2.12.RELEASE', 'spring-boot': '2.2.13.RELEASE', 'zonky-postgres': 'default'],
33-
[name: '6.0.8', flyway: '6.0.8', 'flyway-test': '6.0.0', spring: '5.2.12.RELEASE', 'spring-boot': '2.2.13.RELEASE', 'zonky-postgres': 'default'],
34-
[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'],
35-
[name: '6.2.4', flyway: '6.2.4', 'flyway-test': '6.1.0', spring: '5.2.12.RELEASE', 'spring-boot': '2.2.13.RELEASE', 'zonky-postgres': 'default'],
36-
[name: '6.3.2', flyway: '6.3.2', 'flyway-test': '6.1.0', spring: '5.2.12.RELEASE', 'spring-boot': '2.2.13.RELEASE', 'zonky-postgres': 'default'],
37-
[name: '6.3.3', flyway: '6.3.3', 'flyway-test': '6.3.3', spring: '5.2.12.RELEASE', 'spring-boot': '2.2.13.RELEASE', 'zonky-postgres': 'default'],
38-
[name: '6.4.4', flyway: '6.4.4', 'flyway-test': '6.4.0', spring: '5.2.12.RELEASE', 'spring-boot': '2.2.13.RELEASE', 'zonky-postgres': 'default'],
39-
[name: '6.5.7', flyway: '6.5.7', 'flyway-test': '6.4.0', spring: '5.2.12.RELEASE', 'spring-boot': '2.2.13.RELEASE', 'zonky-postgres': 'default'],
40-
[name: '7.0.4', flyway: '7.0.4', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.4.11', 'zonky-postgres': 'default'],
41-
[name: '7.1.1', flyway: '7.1.1', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.4.11', 'zonky-postgres': 'default'],
42-
[name: '7.2.1', flyway: '7.2.1', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.4.11', 'zonky-postgres': 'default'],
43-
[name: '7.3.2', flyway: '7.3.2', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.4.11', 'zonky-postgres': 'default'],
44-
[name: '7.4.0', flyway: '7.4.0', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.4.11', 'zonky-postgres': 'default'],
45-
[name: '7.5.4', flyway: '7.5.4', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.4.11', 'zonky-postgres': 'default'],
46-
[name: '7.6.0', flyway: '7.6.0', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.4.11', 'zonky-postgres': 'default'],
47-
[name: '7.7.3', flyway: '7.7.3', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.5.5', 'zonky-postgres': 'default'],
48-
[name: '7.8.2', flyway: '7.8.2', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.5.5', 'zonky-postgres': 'default'],
49-
[name: '7.9.2', flyway: '7.9.2', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.5.5', 'zonky-postgres': 'default'],
50-
[name: '7.10.0', flyway: '7.10.0', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.5.5', 'zonky-postgres': 'default'],
51-
[name: '7.11.4', flyway: '7.11.4', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.5.5', 'zonky-postgres': 'default'],
52-
[name: '7.12.1', flyway: '7.12.1', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.5.5', 'zonky-postgres': 'default'],
53-
[name: '7.13.0', flyway: '7.13.0', 'flyway-test': '7.0.0', spring: '5.3.10', 'spring-boot': '2.5.5', 'zonky-postgres': 'default'],
26+
[name: '4.0.3', flyway: '4.0.3', 'flyway-test': '4.0.1', spring: '4.3.30.RELEASE', 'spring-boot': '1.5.22.RELEASE', 'zonky-postgres': 'default'],
27+
[name: '4.1.2', flyway: '4.1.2', 'flyway-test': '4.1.0', spring: '4.3.30.RELEASE', 'spring-boot': '1.5.22.RELEASE', 'zonky-postgres': 'default'],
28+
[name: '4.2.0', flyway: '4.2.0', 'flyway-test': '4.2.0.2', spring: '4.3.30.RELEASE', 'spring-boot': '1.5.22.RELEASE', 'zonky-postgres': 'default'],
29+
[name: '5.0.7', flyway: '5.0.7', 'flyway-test': '5.0.0', spring: '5.0.20.RELEASE', 'spring-boot': '2.0.9.RELEASE', 'zonky-postgres': 'default'],
30+
[name: '5.1.4', flyway: '5.1.4', 'flyway-test': '5.1.0', spring: '5.0.20.RELEASE', 'spring-boot': '2.0.9.RELEASE', 'zonky-postgres': 'default'],
31+
[name: '5.2.4', flyway: '5.2.4', 'flyway-test': '5.2.4', spring: '5.1.20.RELEASE', 'spring-boot': '2.1.18.RELEASE', 'zonky-postgres': 'default'],
32+
[name: '6.0.7', flyway: '6.0.6', 'flyway-test': '6.0.0', spring: '5.2.22.RELEASE', 'spring-boot': '2.2.13.RELEASE', 'zonky-postgres': 'default'],
33+
[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'],
34+
[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.22', '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.22', '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.22', 'spring-boot': '2.6.11', 'zonky-postgres': 'default'],
38+
// [name: '8.5.13', flyway: '8.5.13', 'flyway-test': '7.0.0', spring: '5.3.22', 'spring-boot': '2.7.3', 'zonky-postgres': 'default'],
5439
[name: 'no_sb', flyway: 'default', 'flyway-test': 'default', 'zonky-postgres': 'default']
5540
]],
5641
[name: 'liquibase', versions: [
57-
[name: '3.5.5', liquibase: '3.5.5', spring: '4.3.25.RELEASE', 'spring-boot': '1.5.22.RELEASE'],
58-
[name: '3.6.3', liquibase: '3.6.3', spring: '5.1.19.RELEASE', 'spring-boot': '2.1.18.RELEASE'],
59-
[name: '3.7.0', liquibase: '3.7.0', spring: '5.1.19.RELEASE', 'spring-boot': '2.1.18.RELEASE'],
60-
[name: '3.8.9', liquibase: '3.8.9', spring: '5.2.12.RELEASE', 'spring-boot': '2.2.13.RELEASE'],
61-
[name: '3.9.0', liquibase: '3.9.0', spring: '5.2.12.RELEASE', 'spring-boot': '2.2.13.RELEASE'],
62-
[name: '3.10.3', liquibase: '3.10.3', spring: '5.3.10', 'spring-boot': '2.4.11'],
63-
[name: '4.0.0', liquibase: '4.0.0', spring: '5.3.10', 'spring-boot': '2.4.11'],
64-
[name: '4.1.1', liquibase: '4.1.1', spring: '5.3.10', 'spring-boot': '2.4.11'],
65-
[name: '4.2.2', liquibase: '4.2.2', spring: '5.3.10', 'spring-boot': '2.4.11'],
66-
[name: '4.3.5', liquibase: '4.3.5', spring: '5.3.10', 'spring-boot': '2.5.5'],
67-
[name: '4.4.3', liquibase: '4.4.3', spring: '5.3.10', 'spring-boot': '2.5.5'],
68-
[name: '4.5.0', liquibase: '4.5.0', spring: '5.3.10', 'spring-boot': '2.5.5'],
42+
[name: '3.5.5', liquibase: '3.5.5', spring: '4.3.30.RELEASE', 'spring-boot': '1.5.22.RELEASE'],
43+
[name: '3.6.3', liquibase: '3.6.3', spring: '5.1.20.RELEASE', 'spring-boot': '2.1.18.RELEASE'],
44+
[name: '3.7.0', liquibase: '3.7.0', spring: '5.1.20.RELEASE', 'spring-boot': '2.1.18.RELEASE'],
45+
[name: '3.8.9', liquibase: '3.8.9', spring: '5.2.22.RELEASE', 'spring-boot': '2.2.13.RELEASE'],
46+
[name: '3.9.0', liquibase: '3.9.0', spring: '5.2.22.RELEASE', 'spring-boot': '2.2.13.RELEASE'],
47+
[name: '3.10.3', liquibase: '3.10.3', spring: '5.3.22', 'spring-boot': '2.4.13'],
48+
[name: '4.4.3', liquibase: '4.4.3', spring: '5.3.22', 'spring-boot': '2.5.14'],
49+
[name: '4.5.0', liquibase: '4.5.0', spring: '5.3.22', 'spring-boot': '2.6.11'],
50+
[name: '4.9.1', liquibase: '4.9.1', spring: '5.3.22', 'spring-boot': '2.7.3'],
6951
[name: 'no_sb', liquibase: 'default']
7052
]],
7153
[name: 'postgres', versions: [
72-
[name: '9.5', postgres: '9.5.20', 'zonky-postgres': '9.5.20-1', opentable: '0.12.8', yandex: 'default'],
73-
[name: '9.6', postgres: '9.6.16', 'zonky-postgres': '9.6.16-1', opentable: '0.12.8', yandex: 'default'],
74-
[name: '10', postgres: '10.11', 'zonky-postgres': '10.11.0-1', opentable: '0.13.3', yandex: 'default'],
75-
[name: '11', postgres: '11.6', 'zonky-postgres': '11.6.0-1', opentable: 'default', yandex: 'default'],
76-
[name: '12', postgres: '12.1', 'zonky-postgres': '12.1.0-1', opentable: 'default', yandex: 'default']
54+
[name: '10', postgres: '10.22', 'zonky-postgres': '10.22.0', opentable: '0.13.4', yandex: 'default'],
55+
[name: '11', postgres: '11.17', 'zonky-postgres': '11.17.0', opentable: 'default', yandex: 'default'],
56+
[name: '12', postgres: '12.12', 'zonky-postgres': '12.12.0', opentable: 'default', yandex: 'default'],
57+
[name: '13', postgres: '13.8', 'zonky-postgres': '13.8.0', opentable: 'default', yandex: 'default'],
58+
[name: '14', postgres: '14.5', 'zonky-postgres': '14.5.0', opentable: 'default', yandex: 'default']
7759
]],
7860
[name: 'mssql', versions: [
7961
[name: '2017', 'mssql': '2017-latest', 'mssql-driver': 'default'],
8062
[name: '2019', 'mssql': '2019-latest', 'mssql-driver': 'default']
8163
]],
8264
[name: 'mysql', versions: [
83-
[name: '5.6', 'mysql': '5.6', 'mysql-driver': 'default'],
8465
[name: '5.7', 'mysql': '5.7', 'mysql-driver': 'default'],
8566
[name: '8.0', 'mysql': '8.0', 'mysql-driver': 'default']
8667
]],
8768
[name: 'mariadb', versions: [
88-
[name: '10.1', 'mariadb': '10.1', 'mariadb-driver': 'default'],
8969
[name: '10.2', 'mariadb': '10.2', 'mariadb-driver': 'default'],
90-
[name: '10.3', 'mariadb': '10.3', 'mariadb-driver': 'default'],
91-
[name: '10.4', 'mariadb': '10.4', 'mariadb-driver': 'default'],
92-
[name: '10.5', 'mariadb': '10.5', 'mariadb-driver': 'default']
70+
[name: '10.8', 'mariadb': '10.8', 'mariadb-driver': 'default']
9371
]],
9472
[name: 'h2', versions: [
9573
[name: '1.3.176', 'h2': '1.3.176'],
96-
[name: '1.4.200', 'h2': '1.4.200']
74+
[name: '1.4.200', 'h2': '1.4.200'],
75+
[name: '2.0.206', 'h2': '2.0.206'],
76+
[name: '2.1.214', 'h2': '2.1.214']
9777
]]
9878
]
9979
}
@@ -222,33 +202,36 @@ project(':embedded-database-spring-test') {
222202
compile 'org.testcontainers:mariadb:1.15.3'
223203

224204
compile 'io.zonky.test:embedded-postgres:2.0.1', optional
225-
compile 'com.opentable.components:otj-pg-embedded:0.13.3', optional
205+
compile 'com.opentable.components:otj-pg-embedded:0.13.4', optional
226206
compile 'ru.yandex.qatools.embed:postgresql-embedded:2.10', optional
227207

228-
compile 'org.postgresql:postgresql:42.2.18', optional
229-
compile 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre8', optional
230-
compile 'mysql:mysql-connector-java:8.0.22', optional
231-
compile 'org.mariadb.jdbc:mariadb-java-client:2.7.0', optional
232-
compile 'com.h2database:h2:1.4.200', optional
208+
compile 'org.postgresql:postgresql:42.4.2', optional
209+
compile 'com.microsoft.sqlserver:mssql-jdbc:11.2.0.jre8', optional
210+
compile 'mysql:mysql-connector-java:8.0.30', optional
211+
compile 'org.mariadb.jdbc:mariadb-java-client:2.7.6', optional
212+
compile 'com.h2database:h2:2.1.214', optional
233213

234-
compile 'org.flywaydb:flyway-core:7.13.0', optional
214+
compile 'org.flywaydb:flyway-core:7.15.0', optional
235215
compile 'org.flywaydb.flyway-test-extensions:flyway-spring-test:7.0.0', optional
236-
compile 'org.springframework.boot:spring-boot-starter-test:2.0.9.RELEASE', optional
216+
compile('org.springframework.boot:spring-boot-starter-test:2.0.9.RELEASE') {
217+
exclude group: 'org.mockito'
218+
optionalDeps << it // https://github.com/nebula-plugins/gradle-extra-configurations-plugin/issues/44
219+
}
237220
compile 'org.liquibase:liquibase-core:3.5.5', optional
238221

239-
compile 'org.springframework:spring-context:5.0.13.RELEASE'
240-
compile 'org.springframework:spring-test:5.0.13.RELEASE'
222+
compile 'org.springframework:spring-context:5.0.20.RELEASE'
223+
compile 'org.springframework:spring-test:5.0.20.RELEASE'
241224

242225
compile 'com.google.guava:guava:23.0'
243226

244-
compile('com.cedarsoftware:java-util:1.34.0') {
227+
compile('com.cedarsoftware:java-util:1.68.0') {
245228
exclude group: 'org.apache.logging.log4j'
246229
}
247230

248-
testCompile 'org.springframework:spring-jdbc:5.0.13.RELEASE'
249-
testCompile 'ch.qos.logback:logback-classic:1.2.3'
250-
testCompile 'org.mockito:mockito-core:3.9.0'
251-
testCompile 'org.assertj:assertj-core:3.18.1'
231+
testCompile 'org.springframework:spring-jdbc:5.0.20.RELEASE'
232+
testCompile 'ch.qos.logback:logback-classic:1.2.11'
233+
testCompile 'org.mockito:mockito-core:3.12.4'
234+
testCompile 'org.assertj:assertj-core:3.23.1'
252235
testCompile 'com.zaxxer:HikariCP:4.0.3'
253236
}
254237

‎embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/mssql/DockerMSSQLDatabaseProvider.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,8 @@ private EmbeddedDatabase getDatabase(ClientConfig config, String dbName) {
234234
dataSource.setUser(container.getUsername());
235235
dataSource.setPassword(container.getPassword());
236236

237+
dataSource.setTrustServerCertificate(true);
238+
237239
BeanWrapper dataSourceWrapper = new BeanWrapperImpl(dataSource);
238240
for (Map.Entry<String, String> entry : config.connectProperties.entrySet()) {
239241
dataSourceWrapper.setPropertyValue(entry.getKey(), entry.getValue());

0 commit comments

Comments
 (0)