Merge branch '3.1.x'

spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLoader.java

@@ -74,10 +74,6 @@ public class ConfigServerConfigDataLoader implements ConfigDataLoader<ConfigServ
 		this.logger = logFactory.getLog(getClass());
 	}
 
-	public ConfigServerConfigDataLoader(Log logger) {
-		this.logger = logger;
-	}
-
 	@Override
 	public int getOrder() {
 		return -1;

spring-cloud-config-sample/src/test/java/sample/ConfigDataOrderingVaultIntegrationTests.java

@@ -59,7 +59,7 @@ public class ConfigDataOrderingVaultIntegrationTests {
 
 	@BeforeAll
 	public static void startConfigServer() throws IOException, InterruptedException, JSONException {
-		server = SpringApplication.run(org.springframework.cloud.config.server.test.TestConfigServerApplication.class,
+		server = SpringApplication.run(TestConfigServerApplication.class,
 				"--spring.config.location=classpath:/vaultordering/", "--spring.config.name=server",
 				"--server.port=" + configServerPort,
 				"--spring.cloud.config.server.vault.port=" + vaultContainer.getFirstMappedPort());