root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

This commit is contained in:
Phillip Webb 2016-01-21 11:14:20 -08:00
parent a05a5b3f1c c71aa32fbb
commit 93c3b22bb4
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,5 +1,5 @@
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

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

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