Merge branch '1.2.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java

@@ -133,9 +133,7 @@ public class FlywayAutoConfiguration {
 			else {
 				flyway.setDataSource(this.dataSource);
 			}
-			// TODO: remove this line once SPR-13749 is fixed
 			flyway.setLocations(this.properties.getLocations().toArray(new String[0]));
-
 			return flyway;
 		}
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java

 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java

@@ -545,20 +545,14 @@ public class PropertiesLauncher extends Launcher {
 		if (url.toString().endsWith(".jar") || url.toString().endsWith(".zip")) {
 			return new JarFileArchive(new File(url.toURI()));
 		}
-		else if (url.toString().endsWith("/*")) {
+		if (url.toString().endsWith("/*")) {
 			String name = url.getFile();
 			File dir = new File(name.substring(0, name.length() - 1));
-			if (dir.exists()) {
-				return new ExplodedArchive(new File(name.substring(0, name.length() - 1)),
-						false);
+			return (dir.exists() ? new ExplodedArchive(dir, false) : null);
 		}
-		}
-		else {
 		String filename = URLDecoder.decode(url.getFile(), "UTF-8");
 		return new ExplodedArchive(new File(filename));
 	}
-		return null;
-	}
 
 	private void addNestedArchivesFromParent(List<Archive> urls) {
 		int index = findArchive(urls, this.parent);