From 6561c645857417498501a3868d633611b8f9061f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Van=C4=9Bk?= Date: Tue, 9 Apr 2024 12:32:51 +0200 Subject: [PATCH] update versions in test suites --- README.md | 2 +- build.gradle | 48 +++++++++++++++++++++++++++--------------------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 1f2d3a3..611456d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The primary goal of this project is to make it easier to write Spring-powered in * Spring `4.3.8` - `6.1.x` * Spring Boot `1.4.6` - `3.2.x` * Supports multiple different databases - * [PostgreSQL](#postgresql), [MSSQL](#microsoft-sql-server), [MySQL](#mysql), [MariaDB](#mariadb), [H2](#h2), [HSQLDB](#hsqldb) and [Derby](#derby) + * [PostgreSQL](#postgresql), [MSSQL](#microsoft-sql-server), [MySQL](#mysql), [MariaDB](#mariadb), [H2](#h2), [HSQLDB](#hsqldb), [Derby](#derby) * Supports multiple database providers * [Docker / Testcontainers](#using-docker-provider-default), [Zonky](#using-zonky-provider-previous-default), [OpenTable](#using-opentable-provider), [Yandex](#using-yandex-provider) * Supports various database migration tools diff --git a/build.gradle b/build.gradle index db68382..b485492 100644 --- a/build.gradle +++ b/build.gradle @@ -32,12 +32,12 @@ ext { [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'], [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'], [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'], - [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'], - [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'], - [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'], - [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'], - [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'], - [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'], + [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'], + [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'], + [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'], + [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'], + [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'], + [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'], [name: 'no_sb', flyway: 'default', 'flyway-test': 'default', 'zonky-postgres': 'default'] ]], [name: 'liquibase', versions: [ @@ -46,10 +46,10 @@ ext { [name: '3.7.0', liquibase: '3.7.0', spring: '5.1.20.RELEASE', 'spring-boot': '2.1.18.RELEASE'], [name: '3.8.9', liquibase: '3.8.9', spring: '5.2.22.RELEASE', 'spring-boot': '2.2.13.RELEASE'], [name: '3.9.0', liquibase: '3.9.0', spring: '5.2.22.RELEASE', 'spring-boot': '2.2.13.RELEASE'], - [name: '3.10.3', liquibase: '3.10.3', spring: '5.3.23', 'spring-boot': '2.4.13'], - [name: '4.4.3', liquibase: '4.4.3', spring: '5.3.23', 'spring-boot': '2.5.14'], - [name: '4.5.0', liquibase: '4.5.0', spring: '5.3.23', 'spring-boot': '2.6.11'], - [name: '4.9.1', liquibase: '4.9.1', spring: '5.3.23', 'spring-boot': '2.7.3'], + [name: '3.10.3', liquibase: '3.10.3', spring: '5.3.13', 'spring-boot': '2.4.13'], + [name: '4.4.3', liquibase: '4.4.3', spring: '5.3.27', 'spring-boot': '2.5.15'], + [name: '4.5.0', liquibase: '4.5.0', spring: '5.3.27', 'spring-boot': '2.6.15'], + [name: '4.9.1', liquibase: '4.9.1', spring: '5.3.31', 'spring-boot': '2.7.18'], [name: 'no_sb', liquibase: 'default'] ]], [name: 'postgres', versions: [ @@ -100,11 +100,17 @@ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { testSuites.find { it.name == 'derby' }.versions << [name: '10.16.1.1', 'derby': '10.16.1.1'] testSuites.find { it.name == 'flyway' }.versions += [ - [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'], - [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'], - [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'], - [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'], - [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'] + [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'], + [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'], + [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'], + [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'], + [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'] + ] + + testSuites.find { it.name == 'flyway' }.versions += [ + [name: '4.17.2', liquibase: '4.17.2', spring: '6.0.14', 'spring-boot': '3.0.13'], + [name: '4.20.0', liquibase: '4.20.0', spring: '6.0.18', 'spring-boot': '3.1.10'], + [name: '4.24.0', liquibase: '4.24.0', spring: '6.1.5', 'spring-boot': '3.2.4'] ] } @@ -264,15 +270,15 @@ project(':embedded-database-spring-test') { optImplementation 'org.apache.derby:derby:10.14.2.0' optImplementation 'org.apache.derby:derbytools:10.14.2.0' - optImplementation 'org.flywaydb:flyway-core:9.8.2' - optImplementation 'org.flywaydb.flyway-test-extensions:flyway-spring-test:7.0.0' - optImplementation('org.springframework.boot:spring-boot-starter-test:2.7.6') { + optImplementation 'org.flywaydb:flyway-core:9.8.3' + optImplementation 'org.flywaydb.flyway-test-extensions:flyway-spring-test:9.5.0' + optImplementation('org.springframework.boot:spring-boot-starter-test:2.7.18') { exclude group: 'org.mockito' } optImplementation 'org.liquibase:liquibase-core:3.5.5' - api 'org.springframework:spring-context:5.3.24' - api 'org.springframework:spring-test:5.3.24' + api 'org.springframework:spring-context:5.3.31' + api 'org.springframework:spring-test:5.3.31' optImplementation 'com.google.guava:guava:24.1.1-jre' @@ -280,7 +286,7 @@ project(':embedded-database-spring-test') { exclude group: 'org.apache.logging.log4j' } - testImplementation 'org.springframework:spring-jdbc:5.3.24' + testImplementation 'org.springframework:spring-jdbc:5.3.31' testImplementation 'ch.qos.logback:logback-classic:1.2.11' testImplementation 'org.mockito:mockito-core:3.12.4' testImplementation 'org.assertj:assertj-core:3.23.1'