Commit 996a7cf0 authored by Andy Wilkinson's avatar Andy Wilkinson

Upgrade to Flyway 5.0.0

Closes gh-11287
parent 36ea2ee8
...@@ -26,7 +26,6 @@ import javax.sql.DataSource; ...@@ -26,7 +26,6 @@ import javax.sql.DataSource;
import org.flywaydb.core.Flyway; import org.flywaydb.core.Flyway;
import org.flywaydb.core.api.MigrationVersion; import org.flywaydb.core.api.MigrationVersion;
import org.flywaydb.core.api.callback.FlywayCallback; import org.flywaydb.core.api.callback.FlywayCallback;
import org.flywaydb.core.internal.callback.SqlScriptFlywayCallback;
import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform; import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
import org.junit.Test; import org.junit.Test;
import org.mockito.InOrder; import org.mockito.InOrder;
...@@ -285,11 +284,9 @@ public class FlywayAutoConfigurationTests { ...@@ -285,11 +284,9 @@ public class FlywayAutoConfigurationTests {
FlywayCallback.class); FlywayCallback.class);
FlywayCallback callbackTwo = context.getBean("callbackTwo", FlywayCallback callbackTwo = context.getBean("callbackTwo",
FlywayCallback.class); FlywayCallback.class);
assertThat(flyway.getCallbacks()).hasSize(3); assertThat(flyway.getCallbacks()).hasSize(2);
assertThat(flyway.getCallbacks()).startsWith(callbackTwo, assertThat(flyway.getCallbacks()).containsExactly(callbackTwo,
callbackOne); callbackOne);
assertThat(flyway.getCallbacks()[2])
.isInstanceOf(SqlScriptFlywayCallback.class);
InOrder orderedCallbacks = inOrder(callbackOne, callbackTwo); InOrder orderedCallbacks = inOrder(callbackOne, callbackTwo);
orderedCallbacks.verify(callbackTwo) orderedCallbacks.verify(callbackTwo)
.beforeMigrate(any(Connection.class)); .beforeMigrate(any(Connection.class));
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<ehcache.version>2.10.4</ehcache.version> <ehcache.version>2.10.4</ehcache.version>
<ehcache3.version>3.4.0</ehcache3.version> <ehcache3.version>3.4.0</ehcache3.version>
<embedded-mongo.version>2.0.0</embedded-mongo.version> <embedded-mongo.version>2.0.0</embedded-mongo.version>
<flyway.version>4.2.0</flyway.version> <flyway.version>5.0.0</flyway.version>
<freemarker.version>2.3.27-incubating</freemarker.version> <freemarker.version>2.3.27-incubating</freemarker.version>
<elasticsearch.version>5.5.3</elasticsearch.version> <elasticsearch.version>5.5.3</elasticsearch.version>
<glassfish-el.version>3.0.0</glassfish-el.version> <glassfish-el.version>3.0.0</glassfish-el.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment