Merge branch '1.4.x'

spring-cloud-config-server/pom.xml

@@ -75,6 +75,12 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<properties>

spring-cloud-config-server/src/main/resources/configserver.yml

@@ -3,6 +3,7 @@ info:
 spring:
   application:
     name: configserver
+  autoconfigure.exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   jmx:
     default_domain: cloud.config.server
   cloud:

spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ConfigServerApplicationTests.java

@@ -0,0 +1,22 @@
+package org.springframework.cloud.config.server;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cloud.ClassPathExclusions;
+import org.springframework.cloud.FilteredClassPathRunner;
+import org.springframework.context.ConfigurableApplicationContext;
+
+@RunWith(FilteredClassPathRunner.class)
+@ClassPathExclusions("h2-*.jar")
+public class ConfigServerApplicationTests {
+
+	@Test
+	public void contextLoads() {
+		try (ConfigurableApplicationContext context = new SpringApplicationBuilder(ConfigServerApplication.class)
+				.properties("spring.config.name=configserver").run()) {
+
+		}
+	}
+
+}