Skip to content

S
spring-boot
Commit ac307167 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.4.x' into 1.5.x

parents bccbbc14 492aee9c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 6 deletions
spring-boot-devtools/pom.xml
View file @ ac307167
...@@ -34,11 +34,6 @@ ...@@ -34,11 +34,6 @@
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId> <artifactId>spring-jdbc</artifactId>
......
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java
View file @ ac307167
...@@ -110,7 +110,7 @@ public class DevToolsDataSourceAutoConfiguration { ...@@ -110,7 +110,7 @@ public class DevToolsDataSourceAutoConfiguration {
return false; return false;
} }
private static enum InMemoryDatabase { private enum InMemoryDatabase {
DERBY(null, "org.apache.derby.jdbc.EmbeddedDriver"), DERBY(null, "org.apache.derby.jdbc.EmbeddedDriver"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment