From 3ba5bb4bebf2a22fd0c6d07535eb688911bb7a18 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 21 Oct 2021 08:07:59 +0200 Subject: [PATCH 1/2] Update flyway-core from 7.15.0 to 8.0.2 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 73e530f50..05cd01bac 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ object Dependencies { val datastaxJavaDriverCore = "com.datastax.oss" % "java-driver-core" % Versions.datastaxJavaDriverCore val doobie = "org.tpolecat" %% "doobie-core" % Versions.doobie val doobieHikari = "org.tpolecat" %% "doobie-hikari" % Versions.doobie - val flywayCore = "org.flywaydb" % "flyway-core" % "7.15.0" + val flywayCore = "org.flywaydb" % "flyway-core" % "8.0.2" val fs2Kafka = "com.github.fd4s" %% "fs2-kafka" % "1.8.0" val grpcNettyShaded = "io.grpc" % "grpc-netty-shaded" % Versions.grpc val grpcProtobuf = "io.grpc" % "grpc-protobuf" % Versions.grpc From 4f6d84934782d9423495e9860a1004509aafd789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jane=C4=8Dek?= Date: Tue, 26 Oct 2021 09:56:59 +0200 Subject: [PATCH 2/2] BREAKING CHANGE: Remove use of deprecated Flyway configuration --- .../src/main/scala/com/avast/sst/flyway/FlywayConfig.scala | 5 +---- .../src/main/scala/com/avast/sst/flyway/FlywayModule.scala | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/flyway/src/main/scala/com/avast/sst/flyway/FlywayConfig.scala b/flyway/src/main/scala/com/avast/sst/flyway/FlywayConfig.scala index 862c0f90d..a29e2d904 100644 --- a/flyway/src/main/scala/com/avast/sst/flyway/FlywayConfig.scala +++ b/flyway/src/main/scala/com/avast/sst/flyway/FlywayConfig.scala @@ -14,10 +14,7 @@ final case class FlywayConfig( connectRetries: Int = 0, encoding: Charset = StandardCharsets.UTF_8, group: Boolean = false, - ignoreFutureMigrations: Boolean = true, - ignoreIgnoredMigrations: Boolean = false, - ignoreMissingMigrations: Boolean = false, - ignorePendingMigrations: Boolean = false, + ignoreMigrationPatterns: List[String] = List.empty, installedBy: Option[String] = None, mixed: Boolean = false, locations: List[String] = List.empty, diff --git a/flyway/src/main/scala/com/avast/sst/flyway/FlywayModule.scala b/flyway/src/main/scala/com/avast/sst/flyway/FlywayModule.scala index 9b8d55a37..a7599c02e 100644 --- a/flyway/src/main/scala/com/avast/sst/flyway/FlywayModule.scala +++ b/flyway/src/main/scala/com/avast/sst/flyway/FlywayModule.scala @@ -19,10 +19,7 @@ object FlywayModule { .connectRetries(config.connectRetries) .encoding(config.encoding) .group(config.group) - .ignoreFutureMigrations(config.ignoreFutureMigrations) - .ignoreIgnoredMigrations(config.ignoreIgnoredMigrations) - .ignoreMissingMigrations(config.ignoreMissingMigrations) - .ignorePendingMigrations(config.ignorePendingMigrations) + .ignoreMigrationPatterns(config.ignoreMigrationPatterns: _*) .mixed(config.mixed) .outOfOrder(config.outOfOrder) .validateOnMigrate(config.validateOnMigrate)