Fiks flyway 9 (#2007)

* Fikser antal connections for flyway 9 migrering.

Author: mrsladek

web/src/main/java/no/nav/foreldrepenger/abakus/jetty/JettyServer.java

@@ -186,7 +186,7 @@ protected void konfigurerJndi() throws Exception {
     }
 
     void migrerDatabaser() {
-        try (var dataSource = DatasourceUtil.createDatasource(DatasourceRole.ADMIN, 1)) {
+        try (var dataSource = DatasourceUtil.createDatasource(DatasourceRole.ADMIN, 2)) {
             var flyway = Flyway.configure()
                 .dataSource(dataSource)
                 .locations("classpath:/db/migration/defaultDS")

web/src/test/java/no/nav/foreldrepenger/abakus/jetty/JettyDevServer.java

@@ -35,11 +35,12 @@ void migrerDatabaser() {
             super.migrerDatabaser();
         } catch (Exception e) {
             log.info("Migreringer feilet, cleaner og prøver på nytt for lokal db.");
-            try (var migreringDs = DatasourceUtil.createDatasource(DatasourceRole.ADMIN, 1)) {
+            try (var migreringDs = DatasourceUtil.createDatasource(DatasourceRole.ADMIN, 2)) {
                 var flyway = Flyway.configure()
                     .dataSource(migreringDs)
                     .locations("classpath:/db/migration/")
                     .baselineOnMigrate(true)
+                    .cleanDisabled(false)
                     .load();
                 flyway.clean();
             } catch (FlywayException fwe) {