From 53189b1300dcaa600078532ac8071ddbf4b6d1b4 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Sat, 16 Nov 2024 09:53:03 +0100
Subject: [PATCH 1/2] Upgrade flyway-sbt + flyway-core

(cherry picked from commit e0859d2835eae7034a5b8721de1943a42b8f0ea7)
---
 scala/isolated-slick/build.sbt           | 18 ++++++++++++------
 scala/isolated-slick/project/plugins.sbt |  4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/scala/isolated-slick/build.sbt b/scala/isolated-slick/build.sbt
index 497bc7ac3..00499b8a5 100644
--- a/scala/isolated-slick/build.sbt
+++ b/scala/isolated-slick/build.sbt
@@ -8,7 +8,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"
 
@@ -32,7 +32,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,
@@ -86,11 +90,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" % "7.0.1" % Test
     ),
     (Test / fork) := true
diff --git a/scala/isolated-slick/project/plugins.sbt b/scala/isolated-slick/project/plugins.sbt
index d4e6ca815..a5339e805 100644
--- a/scala/isolated-slick/project/plugins.sbt
+++ b/scala/isolated-slick/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 4c98540bd62696c62a06499dce8923e39e0c907a Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Sat, 16 Nov 2024 12:03:07 +0100
Subject: [PATCH 2/2] flyway[-sbt] 10.21.0

(cherry picked from commit c347b53492ca58406f5213425d4acb5c68cbcb61)
---
 scala/isolated-slick/build.sbt           | 2 +-
 scala/isolated-slick/project/plugins.sbt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scala/isolated-slick/build.sbt b/scala/isolated-slick/build.sbt
index 00499b8a5..be38c1321 100644
--- a/scala/isolated-slick/build.sbt
+++ b/scala/isolated-slick/build.sbt
@@ -8,7 +8,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/scala/isolated-slick/project/plugins.sbt b/scala/isolated-slick/project/plugins.sbt
index a5339e805..38d80c0cb 100644
--- a/scala/isolated-slick/project/plugins.sbt
+++ b/scala/isolated-slick/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