Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
996a7cf0
Commit
996a7cf0
authored
Dec 07, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Flyway 5.0.0
Closes gh-11287
parent
36ea2ee8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
FlywayAutoConfigurationTests.java
...ot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
+2
-5
pom.xml
spring-boot-project/spring-boot-dependencies/pom.xml
+1
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
View file @
996a7cf0
...
@@ -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
));
...
...
spring-boot-project/spring-boot-dependencies/pom.xml
View file @
996a7cf0
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment