root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Upgrade to Flyway 5.0.0 

Closes gh-11287
This commit is contained in:
Andy Wilkinson 2017-12-07 18:21:23 +00:00
parent 36ea2ee87b
commit 996a7cf013
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@ import javax.sql.DataSource;
import org.flywaydb.core.Flyway;
import org.flywaydb.core.api.MigrationVersion;
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.junit.Test;
import org.mockito.InOrder;
@ -285,11 +284,9 @@ public class FlywayAutoConfigurationTests {
FlywayCallback.class);
FlywayCallback callbackTwo = context.getBean("callbackTwo",
FlywayCallback.class);
assertThat(flyway.getCallbacks()).hasSize(3);
assertThat(flyway.getCallbacks()).startsWith(callbackTwo,
assertThat(flyway.getCallbacks()).hasSize(2);
assertThat(flyway.getCallbacks()).containsExactly(callbackTwo,
callbackOne);
assertThat(flyway.getCallbacks()[2])
.isInstanceOf(SqlScriptFlywayCallback.class);
InOrder orderedCallbacks = inOrder(callbackOne, callbackTwo);
orderedCallbacks.verify(callbackTwo)
.beforeMigrate(any(Connection.class));

2
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@ -49,7 +49,7 @@
<ehcache.version>2.10.4</ehcache.version>
<ehcache3.version>3.4.0</ehcache3.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>
<elasticsearch.version>5.5.3</elasticsearch.version>
<glassfish-el.version>3.0.0</glassfish-el.version>