Merge branch '1.5.x'

2016-10-07 10:23:27 +02:00
parent 640a77fcfa d57f3afdd3
commit 502daf06ab
1 changed files with 2 additions and 1 deletions
--- a/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
+++ b/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
@@ -38,7 +38,8 @@ public enum DatabaseDriver {
 	/**
 	 * Apache Derby.
 	 */
-	DERBY("Apache Derby", "org.apache.derby.jdbc.EmbeddedDriver", null,
+	DERBY("Apache Derby", "org.apache.derby.jdbc.EmbeddedDriver",
+			"org.apache.derby.jdbc.EmbeddedXADataSource",
 			"SELECT 1 FROM SYSIBM.SYSDUMMY1"),

 	/**