Merge branch '1.3.x'

72e40642 · Stephane Nicoll · 09166407 · ec4c8bf5 · 72e40642
Commit 72e40642 authored Jun 09, 2016 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

DataSourceBuilder.java ...gframework/boot/autoconfigure/jdbc/DataSourceBuilder.java +4 -1

No files found.
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java
@@ -84,7 +84,10 @@ public class DataSourceBuilder {
 	private void bind(DataSource result) {
 		MutablePropertyValues properties = new MutablePropertyValues(this.properties);
-		new RelaxedDataBinder(result).withAlias("url", "jdbcUrl").bind(properties);
+		new RelaxedDataBinder(result)
+				.withAlias("url", "jdbcUrl")
+				.withAlias("username", "user")
+				.bind(properties);
 	}
 	public DataSourceBuilder type(Class<? extends DataSource> type) {