diff --git a/codegen/src/sbt-test/it-flyway-sbt/managed/build.sbt b/codegen/src/sbt-test/it-flyway-sbt/managed/build.sbt index cd82a60..f5174c6 100644 --- a/codegen/src/sbt-test/it-flyway-sbt/managed/build.sbt +++ b/codegen/src/sbt-test/it-flyway-sbt/managed/build.sbt @@ -10,7 +10,7 @@ Compile / jooqCodegen := (Compile / jooqCodegen).dependsOn(migration / flywayMig jooqCodegenConfig := file("jooq-codegen.xml") -libraryDependencies += "com.h2database" % "h2" % sys.props("scripted.h2.v1.version") % JooqCodegen +libraryDependencies += "com.h2database" % "h2" % sys.props("scripted.h2.version") % JooqCodegen lazy val migration = project .enablePlugins(FlywayPlugin) @@ -18,5 +18,6 @@ lazy val migration = project flywayUrl := "jdbc:h2:./test", flywaySchemas := Seq("PUBLIC"), flywayLocations := Seq("classpath:db/migration"), - libraryDependencies += "com.h2database" % "h2" % sys.props("scripted.h2.v1.version") % Runtime + flywayCleanDisabled := false, + libraryDependencies += "com.h2database" % "h2" % sys.props("scripted.h2.version") % Runtime ) diff --git a/codegen/src/sbt-test/it-flyway-sbt/managed/project/plugins.sbt b/codegen/src/sbt-test/it-flyway-sbt/managed/project/plugins.sbt index 5ba27f2..e274a6c 100644 --- a/codegen/src/sbt-test/it-flyway-sbt/managed/project/plugins.sbt +++ b/codegen/src/sbt-test/it-flyway-sbt/managed/project/plugins.sbt @@ -1,3 +1,3 @@ addSbtPlugin("com.github.kxbmap" % "sbt-jooq-codegen" % sys.props("scripted.plugin.version")) -addSbtPlugin("io.github.davidmweber" % "flyway-sbt" % sys.props("scripted.flywaysbt.version")) +addSbtPlugin("com.github.sbt" % "flyway-sbt" % sys.props("scripted.flywaysbt.version")) diff --git a/codegen/src/sbt-test/it-flyway-sbt/unmanaged/build.sbt b/codegen/src/sbt-test/it-flyway-sbt/unmanaged/build.sbt index 165952b..5d92ed5 100644 --- a/codegen/src/sbt-test/it-flyway-sbt/unmanaged/build.sbt +++ b/codegen/src/sbt-test/it-flyway-sbt/unmanaged/build.sbt @@ -10,7 +10,7 @@ Compile / jooqCodegen := (Compile / jooqCodegen).dependsOn(migration / flywayMig jooqCodegenConfig := file("jooq-codegen.xml") -libraryDependencies += "com.h2database" % "h2" % sys.props("scripted.h2.v1.version") % JooqCodegen +libraryDependencies += "com.h2database" % "h2" % sys.props("scripted.h2.version") % JooqCodegen lazy val migration = project .enablePlugins(FlywayPlugin) @@ -18,5 +18,6 @@ lazy val migration = project flywayUrl := "jdbc:h2:./test", flywaySchemas := Seq("PUBLIC"), flywayLocations := Seq("classpath:db/migration"), - libraryDependencies += "com.h2database" % "h2" % sys.props("scripted.h2.v1.version") % Runtime + flywayCleanDisabled := false, + libraryDependencies += "com.h2database" % "h2" % sys.props("scripted.h2.version") % Runtime ) diff --git a/codegen/src/sbt-test/it-flyway-sbt/unmanaged/project/plugins.sbt b/codegen/src/sbt-test/it-flyway-sbt/unmanaged/project/plugins.sbt index 5ba27f2..e274a6c 100644 --- a/codegen/src/sbt-test/it-flyway-sbt/unmanaged/project/plugins.sbt +++ b/codegen/src/sbt-test/it-flyway-sbt/unmanaged/project/plugins.sbt @@ -1,3 +1,3 @@ addSbtPlugin("com.github.kxbmap" % "sbt-jooq-codegen" % sys.props("scripted.plugin.version")) -addSbtPlugin("io.github.davidmweber" % "flyway-sbt" % sys.props("scripted.flywaysbt.version")) +addSbtPlugin("com.github.sbt" % "flyway-sbt" % sys.props("scripted.flywaysbt.version")) diff --git a/project/Versions.scala b/project/Versions.scala index 48d9be4..8466977 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -41,7 +41,7 @@ object Versions { final val javaxAnnotationApiVersion = "1.3.2" - final val flywaySbtVersion = "7.4.0" + final val flywaySbtVersion = "10.21.0" final val scalaTestVersion = "3.2.19"