Skip to content

Commit 8c7a691

Browse files
committed
Use autoconfiguration for Liquibase.
1 parent ba3e250 commit 8c7a691

File tree

5 files changed

+8
-61
lines changed

5 files changed

+8
-61
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@
699699
${basedir}/src/main/resources/liquibase/liquibase.properties
700700
</propertyFile>
701701
<migrationSqlOutputFile>/dev/stdout</migrationSqlOutputFile>
702-
<!-- See also src/main/java/ru/mystamps/web/config/LiquibaseConfig.java -->
702+
<!-- See also application.yml -->
703703
<contexts>scheme,init-data,prod-data</contexts>
704704
</configuration>
705705
</plugin>

src/main/java/ru/mystamps/web/config/ApplicationContext.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
@Configuration
3232
@Import({
3333
DbConfig.class,
34-
LiquibaseConfig.class,
3534
MailConfig.class,
3635
SecurityConfig.class,
3736
DaoConfig.class,

src/main/java/ru/mystamps/web/config/DbConfig.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import org.springframework.context.annotation.Bean;
2727
import org.springframework.context.annotation.Configuration;
28-
import org.springframework.context.annotation.DependsOn;
2928
import org.springframework.context.annotation.Import;
3029
import org.springframework.context.annotation.PropertySource;
3130
import org.springframework.core.env.Environment;
@@ -65,7 +64,6 @@ public JpaVendorAdapter getJpaVendorAdapter() {
6564
// Explicitly specified bean names which will be looking by Spring Data
6665

6766
@Bean(name = "entityManagerFactory")
68-
@DependsOn("liquibase")
6967
public LocalContainerEntityManagerFactoryBean getEntityManagerFactory() {
7068
LocalContainerEntityManagerFactoryBean entityManagerFactory =
7169
new LocalContainerEntityManagerFactoryBean();

src/main/java/ru/mystamps/web/config/LiquibaseConfig.java

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/main/resources/application.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,16 @@ spring:
88
thymeleaf:
99
prefix: /WEB-INF/views/
1010
suffix: .html
11+
liquibase:
12+
change-log: classpath:/liquibase/changelog.xml
1113
---
1214
spring:
1315
profiles: test
16+
liquibase:
17+
contexts: scheme, init-data, test-data
1418
---
1519
spring:
1620
profiles: prod
21+
liquibase:
22+
# see also duplicate definition at pom.xml
23+
contexts: scheme, init-data, prod-data

0 commit comments

Comments
 (0)