Merge branch '1.5.x'

This commit is contained in:
Phillip Webb
2016-10-11 23:42:14 -07:00
25 changed files with 130 additions and 118 deletions

View File

@@ -289,10 +289,9 @@ abstract class ArchiveCommand extends OptionParsingCommand {
return libraries;
}
protected void writeClasspathEntry(JarWriter writer,
MatchedResource entry) throws IOException {
writer.writeEntry(entry.getName(),
new FileInputStream(entry.getFile()));
protected void writeClasspathEntry(JarWriter writer, MatchedResource entry)
throws IOException {
writer.writeEntry(entry.getName(), new FileInputStream(entry.getFile()));
}
protected abstract LibraryScope getLibraryScope(File file);