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
32c1dd45
Commit
32c1dd45
authored
Feb 14, 2020
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge pull request #19926 from xak2000"
Closes gh-19926
parent
41b05446
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
19 deletions
+19
-19
LiquibaseEndpointTests.java
...mework/boot/actuate/liquibase/LiquibaseEndpointTests.java
+4
-4
LiquibaseProperties.java
...ork/boot/autoconfigure/liquibase/LiquibaseProperties.java
+2
-2
additional-spring-configuration-metadata.json
...es/META-INF/additional-spring-configuration-metadata.json
+1
-1
LiquibaseAutoConfigurationTests.java
...oconfigure/liquibase/LiquibaseAutoConfigurationTests.java
+9
-9
SampleLiquibaseApplicationTests.java
...ava/sample/liquibase/SampleLiquibaseApplicationTests.java
+3
-3
No files found.
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java
View file @
32c1dd45
/*
* Copyright 2012-20
20
the original author or authors.
* Copyright 2012-20
19
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.
...
...
@@ -104,10 +104,10 @@ public class LiquibaseEndpointTests {
.
liquibaseBeans
().
getContexts
().
get
(
context
.
getId
()).
getLiquibaseBeans
();
assertThat
(
liquibaseBeans
.
get
(
"liquibase"
).
getChangeSets
()).
hasSize
(
1
);
assertThat
(
liquibaseBeans
.
get
(
"liquibase"
).
getChangeSets
().
get
(
0
).
getChangeLog
())
.
isEqualTo
(
"classpath:db/changelog/db.changelog-master.yaml"
);
.
isEqualTo
(
"classpath:
/
db/changelog/db.changelog-master.yaml"
);
assertThat
(
liquibaseBeans
.
get
(
"liquibaseBackup"
).
getChangeSets
()).
hasSize
(
1
);
assertThat
(
liquibaseBeans
.
get
(
"liquibaseBackup"
).
getChangeSets
().
get
(
0
).
getChangeLog
())
.
isEqualTo
(
"classpath:db/changelog/db.changelog-master-backup.yaml"
);
.
isEqualTo
(
"classpath:
/
db/changelog/db.changelog-master-backup.yaml"
);
});
}
...
...
@@ -157,7 +157,7 @@ public class LiquibaseEndpointTests {
private
SpringLiquibase
createSpringLiquibase
(
String
changeLog
,
DataSource
dataSource
)
{
SpringLiquibase
liquibase
=
new
SpringLiquibase
();
liquibase
.
setChangeLog
(
"classpath:db/changelog/"
+
changeLog
);
liquibase
.
setChangeLog
(
"classpath:
/
db/changelog/"
+
changeLog
);
liquibase
.
setShouldRun
(
true
);
liquibase
.
setDataSource
(
dataSource
);
return
liquibase
;
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java
View file @
32c1dd45
/*
* Copyright 2012-20
20
the original author or authors.
* Copyright 2012-20
19
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.
...
...
@@ -36,7 +36,7 @@ public class LiquibaseProperties {
/**
* Change log configuration path.
*/
private
String
changeLog
=
"classpath:db/changelog/db.changelog-master.yaml"
;
private
String
changeLog
=
"classpath:
/
db/changelog/db.changelog-master.yaml"
;
/**
* Comma-separated list of runtime contexts to use.
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View file @
32c1dd45
...
...
@@ -964,7 +964,7 @@
"name"
:
"liquibase.change-log"
,
"type"
:
"java.lang.String"
,
"description"
:
"Change log configuration path."
,
"defaultValue"
:
"classpath:db/changelog/db.changelog-master.yaml"
,
"defaultValue"
:
"classpath:
/
db/changelog/db.changelog-master.yaml"
,
"deprecation"
:
{
"replacement"
:
"spring.liquibase.change-log"
,
"level"
:
"error"
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java
View file @
32c1dd45
/*
* Copyright 2012-20
20
the original author or authors.
* Copyright 2012-20
19
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.
...
...
@@ -92,7 +92,7 @@ public class LiquibaseAutoConfigurationTests {
public
void
defaultSpringLiquibase
()
{
this
.
contextRunner
.
withUserConfiguration
(
EmbeddedDataSourceConfiguration
.
class
)
.
run
(
assertLiquibase
((
liquibase
)
->
{
assertThat
(
liquibase
.
getChangeLog
()).
isEqualTo
(
"classpath:db/changelog/db.changelog-master.yaml"
);
assertThat
(
liquibase
.
getChangeLog
()).
isEqualTo
(
"classpath:
/
db/changelog/db.changelog-master.yaml"
);
assertThat
(
liquibase
.
getContexts
()).
isNull
();
assertThat
(
liquibase
.
getDefaultSchema
()).
isNull
();
assertThat
(
liquibase
.
isDropFirst
()).
isFalse
();
...
...
@@ -102,26 +102,26 @@ public class LiquibaseAutoConfigurationTests {
@Test
public
void
changelogXml
()
{
this
.
contextRunner
.
withUserConfiguration
(
EmbeddedDataSourceConfiguration
.
class
)
.
withPropertyValues
(
"spring.liquibase.change-log:classpath:db/changelog/db.changelog-override.xml"
)
.
withPropertyValues
(
"spring.liquibase.change-log:classpath:
/
db/changelog/db.changelog-override.xml"
)
.
run
(
assertLiquibase
((
liquibase
)
->
assertThat
(
liquibase
.
getChangeLog
())
.
isEqualTo
(
"classpath:db/changelog/db.changelog-override.xml"
)));
.
isEqualTo
(
"classpath:
/
db/changelog/db.changelog-override.xml"
)));
}
@Test
public
void
changelogJson
()
{
this
.
contextRunner
.
withUserConfiguration
(
EmbeddedDataSourceConfiguration
.
class
)
.
withPropertyValues
(
"spring.liquibase.change-log:classpath:db/changelog/db.changelog-override.json"
)
.
withPropertyValues
(
"spring.liquibase.change-log:classpath:
/
db/changelog/db.changelog-override.json"
)
.
run
(
assertLiquibase
((
liquibase
)
->
assertThat
(
liquibase
.
getChangeLog
())
.
isEqualTo
(
"classpath:db/changelog/db.changelog-override.json"
)));
.
isEqualTo
(
"classpath:
/
db/changelog/db.changelog-override.json"
)));
}
@Test
public
void
changelogSql
()
{
Assume
.
javaEight
();
this
.
contextRunner
.
withUserConfiguration
(
EmbeddedDataSourceConfiguration
.
class
)
.
withPropertyValues
(
"spring.liquibase.change-log:classpath:db/changelog/db.changelog-override.sql"
)
.
withPropertyValues
(
"spring.liquibase.change-log:classpath:
/
db/changelog/db.changelog-override.sql"
)
.
run
(
assertLiquibase
((
liquibase
)
->
assertThat
(
liquibase
.
getChangeLog
())
.
isEqualTo
(
"classpath:db/changelog/db.changelog-override.sql"
)));
.
isEqualTo
(
"classpath:
/
db/changelog/db.changelog-override.sql"
)));
}
@Test
...
...
@@ -354,7 +354,7 @@ public class LiquibaseAutoConfigurationTests {
@Bean
SpringLiquibase
springLiquibase
(
DataSource
dataSource
)
{
SpringLiquibase
liquibase
=
new
SpringLiquibase
();
liquibase
.
setChangeLog
(
"classpath:db/changelog/db.changelog-master.yaml"
);
liquibase
.
setChangeLog
(
"classpath:
/
db/changelog/db.changelog-master.yaml"
);
liquibase
.
setShouldRun
(
true
);
liquibase
.
setDataSource
(
dataSource
);
return
liquibase
;
...
...
spring-boot-samples/spring-boot-sample-liquibase/src/test/java/sample/liquibase/SampleLiquibaseApplicationTests.java
View file @
32c1dd45
/*
* Copyright 2012-20
20
the original author or authors.
* Copyright 2012-20
19
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.
...
...
@@ -61,9 +61,9 @@ public class SampleLiquibaseApplicationTests {
assertThat
(
output
).
contains
(
"Successfully acquired change log lock"
)
.
contains
(
"Creating database history "
+
"table with name: PUBLIC.DATABASECHANGELOG"
)
.
contains
(
"Table person created"
)
.
contains
(
"ChangeSet classpath:db/"
+
"changelog/db.changelog-master.yaml::1::"
.
contains
(
"ChangeSet classpath:
/
db/"
+
"changelog/db.changelog-master.yaml::1::"
+
"marceloverdijk ran successfully"
)
.
contains
(
"New row inserted into person"
).
contains
(
"ChangeSet classpath:db/changelog/"
.
contains
(
"New row inserted into person"
).
contains
(
"ChangeSet classpath:
/
db/changelog/"
+
"db.changelog-master.yaml::2::"
+
"marceloverdijk ran successfully"
)
.
contains
(
"Successfully released change log lock"
);
}
...
...
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