From a5856187ba059330976f73510c0aba01fec91679 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 08:15:54 +0000 Subject: [PATCH 1/2] Bump org.flywaydb:flyway-core from 9.8.3 to 10.15.2 Bumps [org.flywaydb:flyway-core](https://github.com/flyway/flyway) from 9.8.3 to 10.15.2. - [Release notes](https://github.com/flyway/flyway/releases) - [Commits](https://github.com/flyway/flyway/compare/flyway-9.8.3...flyway-10.15.2) --- updated-dependencies: - dependency-name: org.flywaydb:flyway-core dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c5a4cf4..56ab4d7 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 1.14.18 4.3.0 - 9.8.3 + 10.15.2 33.2.1-jre 2.2.224 2.7.1 From 6d447d695b4a7e7c203549e9b109b291a9cee82b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sondre=20Eikanger=20Kval=C3=B8?= Date: Thu, 11 Jul 2024 14:33:57 +0200 Subject: [PATCH 2/2] Read profile with override for java 11 --- embedded-db-flyway/pom.xml | 15 +++++++++++++++ ...FlywayInitializerCheckConfigurationTest.java | 17 ++++------------- pom.xml | 1 + 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/embedded-db-flyway/pom.xml b/embedded-db-flyway/pom.xml index 2eb3b6a..52c9b0e 100644 --- a/embedded-db-flyway/pom.xml +++ b/embedded-db-flyway/pom.xml @@ -68,6 +68,21 @@ test + + + add-flyway-hsqldb-module + + [17,) + + + + org.flywaydb + flyway-database-hsqldb + ${flyway.version} + + + + diff --git a/embedded-db-flyway/src/test/java/org/zapodot/junit/db/plugin/FlywayInitializerCheckConfigurationTest.java b/embedded-db-flyway/src/test/java/org/zapodot/junit/db/plugin/FlywayInitializerCheckConfigurationTest.java index 63b4169..7cfc0a2 100644 --- a/embedded-db-flyway/src/test/java/org/zapodot/junit/db/plugin/FlywayInitializerCheckConfigurationTest.java +++ b/embedded-db-flyway/src/test/java/org/zapodot/junit/db/plugin/FlywayInitializerCheckConfigurationTest.java @@ -1,12 +1,12 @@ package org.zapodot.junit.db.plugin; import com.google.common.collect.ImmutableMap; -import org.flywaydb.core.internal.license.FlywayTeamsUpgradeRequiredException; -import org.junit.Test; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class FlywayInitializerCheckConfigurationTest { @@ -22,6 +22,7 @@ public class FlywayInitializerCheckConfigurationTest { public static final String TARGET_VERSION = "2"; public static final String LOCATION = "classpath:placeholder"; + @DisplayName("Test builder") @Test public void testBuilder() { final FlywayInitializer flywayInitializer = new FlywayInitializer.Builder().withInstalledBy(INSTALLED_BY) @@ -56,14 +57,4 @@ public void testBuilder() { } - @Test - public void ignorePatterns() { - assertThrows(FlywayTeamsUpgradeRequiredException.class, () -> - FlywayInitializer.builder().withIgnoreMissingMigrations() - ); - - assertThrows(FlywayTeamsUpgradeRequiredException.class, () -> - FlywayInitializer.builder().withIgnoreMigrationPatterns("repeatable:missing") - ); - } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2c6c33a..1ffda8a 100644 --- a/pom.xml +++ b/pom.xml @@ -93,6 +93,7 @@ 5.3.37 + 9.22.3