Merge branch '1.2.x'

This commit is contained in:
Phillip Webb 2015-06-18 23:26:14 -07:00
commit a48ed907e4

View File

@ -94,6 +94,13 @@ public class WarPackagingTests {
checkWebInfLibProvidedEntries(war, expectedLibProvidedEntries);
checkWebInfLibEntries(war, expectedLibProvidedEntries);
try {
war.close();
}
catch (IOException ex) {
// Ignore
}
}
private void checkWebInfLibProvidedEntries(JarFile war, Set<String> expectedEntries)