Skip to content

Commit 996a7cf

Browse files
committed
Upgrade to Flyway 5.0.0
Closes gh-11287
1 parent 36ea2ee commit 996a7cf

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.flywaydb.core.Flyway;
2727
import org.flywaydb.core.api.MigrationVersion;
2828
import org.flywaydb.core.api.callback.FlywayCallback;
29-
import org.flywaydb.core.internal.callback.SqlScriptFlywayCallback;
3029
import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
3130
import org.junit.Test;
3231
import org.mockito.InOrder;
@@ -285,11 +284,9 @@ public void callbacksAreConfiguredAndOrdered() {
285284
FlywayCallback.class);
286285
FlywayCallback callbackTwo = context.getBean("callbackTwo",
287286
FlywayCallback.class);
288-
assertThat(flyway.getCallbacks()).hasSize(3);
289-
assertThat(flyway.getCallbacks()).startsWith(callbackTwo,
287+
assertThat(flyway.getCallbacks()).hasSize(2);
288+
assertThat(flyway.getCallbacks()).containsExactly(callbackTwo,
290289
callbackOne);
291-
assertThat(flyway.getCallbacks()[2])
292-
.isInstanceOf(SqlScriptFlywayCallback.class);
293290
InOrder orderedCallbacks = inOrder(callbackOne, callbackTwo);
294291
orderedCallbacks.verify(callbackTwo)
295292
.beforeMigrate(any(Connection.class));

spring-boot-project/spring-boot-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<ehcache.version>2.10.4</ehcache.version>
5050
<ehcache3.version>3.4.0</ehcache3.version>
5151
<embedded-mongo.version>2.0.0</embedded-mongo.version>
52-
<flyway.version>4.2.0</flyway.version>
52+
<flyway.version>5.0.0</flyway.version>
5353
<freemarker.version>2.3.27-incubating</freemarker.version>
5454
<elasticsearch.version>5.5.3</elasticsearch.version>
5555
<glassfish-el.version>3.0.0</glassfish-el.version>

0 commit comments

Comments
 (0)