revert flyway changes; test 8.0.40

broadinstitute · Jan 31, 2025 · 61b8f9b · 61b8f9b
1 parent 4fe0a8f
commit 61b8f9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -89,8 +89,7 @@ libraryDependencies ++= Seq(
   "org.mock-server" % "mockserver-netty" % "5.11.1" % Test,
   "com.dimafeng" %% "testcontainers-scala-mysql" % testcontainersScalaV % Test,
   "com.dimafeng" %% "testcontainers-scala-mongodb" % testcontainersScalaV % Test,
-  "org.flywaydb" % "flyway-core" % "9.22.3" % Test, // Starting 10.0.0 Flyway only supports Java 17. Agora is on Java 11
-  "org.flywaydb" % "flyway-mysql" % "9.22.3" % Test,
+  "org.flywaydb" % "flyway-core" % "7.3.2" % Test, // Starting 10.0.0 Flyway only supports Java 17. Agora is on Java 11
   "org.broadinstitute.dsde.workbench" % "sam-client_2.12" % "0.1-61135c7",      // Should become available for 2.13 once a release happens ( https://github.com/broadinstitute/sam/pull/491 )
   "org.broadinstitute.cromwell" % "cromwell-client_2.12" % "0.1-8b413b45f-SNAP", // Contains only Java, pinning on 2.12
   "org.broadinstitute.dsde.workbench" %% "workbench-oauth2" % workbenchOauth2V excludeAll(

diff --git a/...a/org/broadinstitute/dsde/agora/server/dataaccess/permissions/TestPermissionsClient.scala b/...a/org/broadinstitute/dsde/agora/server/dataaccess/permissions/TestPermissionsClient.scala
@@ -19,7 +19,7 @@ object TestPermissionsClient {
       Set("url", "user", "password", "properties", "driver", "driverClassName"),
     )
 
-    Flyway.configure().dataSource(driverDataSource).cleanDisabled(false).load()
+    Flyway.configure().dataSource(driverDataSource).load()
   }
 
   def ensureRunning(): Unit = flyway.migrate()