Merge branch '1.4.x' into 1.5.x

spring-boot-devtools/pom.xml

@@ -34,11 +34,6 @@
 			<artifactId>javax.servlet-api</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java

@@ -110,7 +110,7 @@ public class DevToolsDataSourceAutoConfiguration {
 			return false;
 		}
 
-		private static enum InMemoryDatabase {
+		private enum InMemoryDatabase {
 
 			DERBY(null, "org.apache.derby.jdbc.EmbeddedDriver"),