Use maven.home if it exists

Author: Dave Syer

launcher/src/main/java/org/springframework/boot/loader/thin/MavenSettingsReader.java

@@ -65,7 +65,7 @@ public MavenSettingsReader(String dir) {
 				homeDir = new File(homeDir).getParent();
 			}
 		}
-		if (homeDir==null || !new File(homeDir, "settings.xml").exists()) {
+		if (homeDir == null || !new File(homeDir, "settings.xml").exists()) {
 			if (homeDir == null) {
 				homeDir = System.getProperty("maven.repo.local");
 				if (homeDir != null) {
@@ -74,11 +74,14 @@ public MavenSettingsReader(String dir) {
 						homeDir = null;
 					}
 				}
-			 }
- 			if (homeDir == null) {
-				homeDir = System.getProperty("user.home");
-				if (homeDir != null) {
-					homeDir = new File(homeDir, ".m2").getAbsolutePath();
+			}
+			if (homeDir == null) {
+				homeDir = System.getProperty("maven.home");
+				if (homeDir == null || !new File(homeDir, "settings.xml").exists()) {
+					homeDir = System.getProperty("user.home");
+					if (homeDir != null) {
+						homeDir = new File(homeDir, ".m2").getAbsolutePath();
+					}
 				}
 			}
 		}