Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Phillip Webb
2016-12-19 12:36:57 -08:00
330 changed files with 554 additions and 47 deletions

View File

@@ -122,6 +122,7 @@ class InternalOutputCapture implements TestRule {
this.copy.flush();
this.original.flush();
}
}
}

View File

@@ -253,6 +253,7 @@ public class PropertiesLauncherTests {
protected Class<?> findClass(String name) throws ClassNotFoundException {
return super.findClass(name);
}
}
}

View File

@@ -60,4 +60,5 @@ public class WarLauncherTests extends AbstractExecutableArchiveLauncherTests {
new URL("jar:" + jarRoot.toURI().toURL() + "!/WEB-INF/classes!/"),
new URL("jar:" + jarRoot.toURI().toURL() + "!/WEB-INF/lib/foo.jar!/"));
}
}