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
d2ebd778
Commit
d2ebd778
authored
Mar 10, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Flyway 6.3.0
Closes gh-20445
parent
0cd8197e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
FlywayAutoConfigurationTests.java
...ot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
+8
-8
build.gradle
spring-boot-project/spring-boot-dependencies/build.gradle
+1
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
View file @
d2ebd778
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -33,6 +33,7 @@ import org.flywaydb.core.api.migration.JavaMigration;
import
org.flywaydb.core.internal.license.FlywayProUpgradeRequiredException
;
import
org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.extension.ExtendWith
;
import
org.mockito.InOrder
;
import
org.springframework.beans.factory.BeanCreationException
;
...
...
@@ -42,6 +43,8 @@ import org.springframework.boot.jdbc.DataSourceBuilder;
import
org.springframework.boot.jdbc.SchemaManagement
;
import
org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.test.system.CapturedOutput
;
import
org.springframework.boot.test.system.OutputCaptureExtension
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Primary
;
...
...
@@ -75,6 +78,7 @@ import static org.mockito.Mockito.mock;
* @author Dominic Gunn
* @author András Deák
*/
@ExtendWith
(
OutputCaptureExtension
.
class
)
class
FlywayAutoConfigurationTests
{
private
ApplicationContextRunner
contextRunner
=
new
ApplicationContextRunner
()
...
...
@@ -427,14 +431,10 @@ class FlywayAutoConfigurationTests {
}
@Test
void
licenseKeyIsCorrectlyMapped
()
{
void
licenseKeyIsCorrectlyMapped
(
CapturedOutput
output
)
{
this
.
contextRunner
.
withUserConfiguration
(
EmbeddedDataSourceConfiguration
.
class
)
.
withPropertyValues
(
"spring.flyway.license-key=<<secret>>"
).
run
((
context
)
->
{
assertThat
(
context
).
hasFailed
();
Throwable
failure
=
context
.
getStartupFailure
();
assertThat
(
failure
).
hasRootCauseInstanceOf
(
FlywayProUpgradeRequiredException
.
class
);
assertThat
(
failure
).
hasMessageContaining
(
" licenseKey "
);
});
.
withPropertyValues
(
"spring.flyway.license-key=<<secret>>"
).
run
((
context
)
->
assertThat
(
output
)
.
contains
(
"<<secret>> is not supported by Flyway Community Edition"
));
}
@Test
...
...
spring-boot-project/spring-boot-dependencies/build.gradle
View file @
d2ebd778
...
...
@@ -322,7 +322,7 @@ bom {
]
}
}
library
(
"Flyway"
,
"6.
2.3
"
)
{
library
(
"Flyway"
,
"6.
3.0
"
)
{
group
(
"org.flywaydb"
)
{
modules
=
[
"flyway-core"
...
...
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