Merge branch '2.1.x'

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

@@ -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

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

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

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

@@ -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) {
-
-		public LiquibaseConfiguration(LiquibaseProperties properties, ResourceLoader resourceLoader) {
 			this.properties = properties;
-			this.resourceLoader = resourceLoader;
 		}
 
 		@Bean