root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-04-07 14:17:23 +01:00
parent 8c785b214b ac3071670f
commit 9d642a69b3
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-devtools/pom.xml
View File

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

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

@ -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"),