Merge branch '1.2.x'

cd1ace0c · Stephane Nicoll · 4882f1c3 · 8d75aa0e · cd1ace0c
Commit cd1ace0c authored Sep 02, 2015 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

DatabaseDriver.java ...ringframework/boot/autoconfigure/jdbc/DatabaseDriver.java +1 -1

No files found.
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DatabaseDriver.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DatabaseDriver.java
@@ -71,7 +71,7 @@ enum DatabaseDriver {
 	/**
 	 * Oracle
 	 */
-	ORACLE("oracle.jdbc.OracleDriver", "oracle.jdbc.xa.OracleXADataSource"),
+	ORACLE("oracle.jdbc.OracleDriver", "oracle.jdbc.xa.client.OracleXADataSource"),
 	/**
 	 * Postres