mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.2.x'
This commit is contained in:
commit
93c3b22bb4
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -545,19 +545,13 @@ 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;
|
||||
String filename = URLDecoder.decode(url.getFile(), "UTF-8");
|
||||
return new ExplodedArchive(new File(filename));
|
||||
}
|
||||
|
||||
private void addNestedArchivesFromParent(List<Archive> urls) {
|
||||
|
Loading…
Reference in New Issue
Block a user