From 3172f8dd6cb99b48f6c0903a98d0b465b79a24d1 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 16 Nov 2024 09:53:03 +0100 Subject: [PATCH 1/2] Upgrade flyway-sbt + flyway-core (cherry picked from commit e0859d2835eae7034a5b8721de1943a42b8f0ea7) # Conflicts: # play-scala-isolated-slick-example/build.sbt --- play-scala-isolated-slick-example/build.sbt | 18 ++++++++++++------ .../project/plugins.sbt | 4 ++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/play-scala-isolated-slick-example/build.sbt b/play-scala-isolated-slick-example/build.sbt index 9ee12f23a..e93ffeb8b 100644 --- a/play-scala-isolated-slick-example/build.sbt +++ b/play-scala-isolated-slick-example/build.sbt @@ -6,7 +6,7 @@ lazy val databaseUrl = sys.env.getOrElse("DB_DEFAULT_URL", "jdbc:h2:./test") lazy val databaseUser = sys.env.getOrElse("DB_DEFAULT_USER", "sa") lazy val databasePassword = sys.env.getOrElse("DB_DEFAULT_PASSWORD", "") -val FlywayVersion = "9.21.1" +val FlywayVersion = "9.22.0" (ThisBuild / version) := "1.1-SNAPSHOT" @@ -30,7 +30,11 @@ val FlywayVersion = "9.21.1" lazy val flyway = (project in file("modules/flyway")) .enablePlugins(FlywayPlugin) .settings( - libraryDependencies += "org.flywaydb" % "flyway-core" % FlywayVersion, + libraryDependencies += ("org.flywaydb" % "flyway-core" % FlywayVersion).excludeAll( + ExclusionRule("com.fasterxml.jackson.core"), + ExclusionRule("com.fasterxml.jackson.dataformat"), + ExclusionRule("com.fasterxml.jackson.datatype") + ), flywayLocations := Seq("classpath:db/migration"), flywayUrl := databaseUrl, flywayUser := databaseUser, @@ -84,11 +88,13 @@ lazy val root = (project in file(".")) TwirlKeys.templateImports += "com.example.user.User", libraryDependencies ++= Seq( guice, - "com.h2database" % "h2" % "1.4.200", // Can't use latest h2 currently: flyway-sbt comes with an outdated flyway version that does not support h2 2.x yet...: - // https://github.com/flyway/flyway-sbt/blob/7fc35d2833531b2b9e5a98a594d76fd047a077a8/build.sbt#L1 - // https://github.com/flyway/flyway-sbt/issues/82#issuecomment-1636728997 + "com.h2database" % "h2" % "2.3.232", ws % Test, - "org.flywaydb" % "flyway-core" % FlywayVersion % Test, + ("org.flywaydb" % "flyway-core" % FlywayVersion % Test).excludeAll( + ExclusionRule("com.fasterxml.jackson.core"), + ExclusionRule("com.fasterxml.jackson.dataformat"), + ExclusionRule("com.fasterxml.jackson.datatype") + ), "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.1" % Test ), (Test / fork) := true diff --git a/play-scala-isolated-slick-example/project/plugins.sbt b/play-scala-isolated-slick-example/project/plugins.sbt index 3c141438b..dec1f9161 100644 --- a/play-scala-isolated-slick-example/project/plugins.sbt +++ b/play-scala-isolated-slick-example/project/plugins.sbt @@ -1,8 +1,8 @@ -libraryDependencies += "com.h2database" % "h2" % "1.4.200" // Can't use latest h2 currently: https://github.com/flyway/flyway-sbt/issues/82#issuecomment-1636728997 +libraryDependencies += "com.h2database" % "h2" % "2.3.232" // Database migration // https://github.com/flyway/flyway-sbt -addSbtPlugin("io.github.davidmweber" % "flyway-sbt" % "7.4.0") +addSbtPlugin("com.github.sbt" % "flyway-sbt" % "9.22.0") // Slick code generation // https://github.com/tototoshi/sbt-slick-codegen From e19e4383f96eaaea0b64d401f0d4306250c44e58 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 16 Nov 2024 12:03:07 +0100 Subject: [PATCH 2/2] flyway[-sbt] 10.21.0 (cherry picked from commit c347b53492ca58406f5213425d4acb5c68cbcb61) --- play-scala-isolated-slick-example/build.sbt | 2 +- play-scala-isolated-slick-example/project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/play-scala-isolated-slick-example/build.sbt b/play-scala-isolated-slick-example/build.sbt index e93ffeb8b..b47a6da97 100644 --- a/play-scala-isolated-slick-example/build.sbt +++ b/play-scala-isolated-slick-example/build.sbt @@ -6,7 +6,7 @@ lazy val databaseUrl = sys.env.getOrElse("DB_DEFAULT_URL", "jdbc:h2:./test") lazy val databaseUser = sys.env.getOrElse("DB_DEFAULT_USER", "sa") lazy val databasePassword = sys.env.getOrElse("DB_DEFAULT_PASSWORD", "") -val FlywayVersion = "9.22.0" +val FlywayVersion = "10.21.0" (ThisBuild / version) := "1.1-SNAPSHOT" diff --git a/play-scala-isolated-slick-example/project/plugins.sbt b/play-scala-isolated-slick-example/project/plugins.sbt index dec1f9161..f5ca921d4 100644 --- a/play-scala-isolated-slick-example/project/plugins.sbt +++ b/play-scala-isolated-slick-example/project/plugins.sbt @@ -2,7 +2,7 @@ libraryDependencies += "com.h2database" % "h2" % "2.3.232" // Database migration // https://github.com/flyway/flyway-sbt -addSbtPlugin("com.github.sbt" % "flyway-sbt" % "9.22.0") +addSbtPlugin("com.github.sbt" % "flyway-sbt" % "10.21.0") // Slick code generation // https://github.com/tototoshi/sbt-slick-codegen