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

Merge branch '2.1.x'

This commit is contained in:
Andy Wilkinson 2019-08-19 16:08:25 +01:00
parent f916e1a1ce ab87b2a39b
commit cc3df98135
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java
View File

@ -25,7 +25,6 @@ import org.junit.jupiter.api.io.TempDir;
import org.springframework.boot.actuate.endpoint.web.test.WebEndpointTest;
import org.springframework.boot.logging.LogFile;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
@ -41,17 +40,13 @@ import org.springframework.util.FileCopyUtils;
*/
class LogFileWebEndpointWebIntegrationTests {
private ConfigurableApplicationContext context;
private WebTestClient client;
private static File tempFile;
@BeforeEach
void setUp(WebTestClient client, ConfigurableApplicationContext context) {
void setUp(WebTestClient client) {
this.client = client;
this.context = context;
}
@BeforeAll

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java
View File

@ -100,6 +100,7 @@ public class BatchAutoConfiguration {
return factory;
}
@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(DataSource.class)
@ConditionalOnClass(DatabasePopulator.class)
static class DataSourceInitializerConfiguration {

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
View File

@ -45,7 +45,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.core.io.ResourceLoader;
import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean;
@ -85,11 +84,8 @@ public class LiquibaseAutoConfiguration {
private final LiquibaseProperties properties;
private final ResourceLoader resourceLoader;
public LiquibaseConfiguration(LiquibaseProperties properties, ResourceLoader resourceLoader) {
public LiquibaseConfiguration(LiquibaseProperties properties) {
this.properties = properties;
this.resourceLoader = resourceLoader;
}
@Bean