Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/5e063268 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/5e063268 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/5e063268 Branch: refs/heads/master Commit: 5e0632687f091895867a50ba6d78b07ee8e67c76 Parents: 476b4ef 7081e35 Author: Stefan Bodewig <[email protected]> Authored: Thu Dec 22 07:12:28 2016 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Thu Dec 22 07:12:28 2016 +0100 ---------------------------------------------------------------------- src/main/org/apache/tools/ant/Main.java | 6 +----- src/main/org/apache/tools/ant/Project.java | 8 ++++---- src/main/org/apache/tools/ant/ProjectHelperRepository.java | 6 +++--- src/main/org/apache/tools/ant/XmlLogger.java | 6 +++--- src/main/org/apache/tools/ant/listener/MailLogger.java | 4 ++-- src/main/org/apache/tools/ant/taskdefs/LogOutputStream.java | 2 +- src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java | 6 +++--- src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java | 4 ++-- .../org/apache/tools/ant/taskdefs/optional/TraXLiaison.java | 5 +++-- .../tools/ant/taskdefs/optional/depend/JarFileIterator.java | 4 +++- .../org/apache/tools/ant/taskdefs/optional/jlink/jlink.java | 2 +- .../apache/tools/ant/taskdefs/optional/junit/JUnitTask.java | 4 ++-- src/main/org/apache/tools/ant/util/DOMElementWriter.java | 2 +- src/main/org/apache/tools/ant/util/FileUtils.java | 2 +- src/main/org/apache/tools/ant/util/ReaderInputStream.java | 2 +- src/main/org/apache/tools/ant/util/StringUtils.java | 2 +- .../org/apache/tools/ant/util/depend/AbstractAnalyzer.java | 3 ++- .../apache/tools/ant/util/optional/JavaxScriptRunner.java | 2 +- src/main/org/apache/tools/tar/TarEntry.java | 7 ++++--- src/main/org/apache/tools/tar/TarInputStream.java | 2 +- src/main/org/apache/tools/tar/TarOutputStream.java | 4 ++-- src/main/org/apache/tools/tar/TarUtils.java | 4 ++-- src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java | 2 +- src/main/org/apache/tools/zip/AsiExtraField.java | 2 +- src/main/org/apache/tools/zip/ExtraFieldUtils.java | 6 +++--- src/main/org/apache/tools/zip/GeneralPurposeBit.java | 2 +- src/main/org/apache/tools/zip/ZipEntry.java | 4 ++-- src/main/org/apache/tools/zip/ZipLong.java | 2 +- src/main/org/apache/tools/zip/ZipShort.java | 2 +- 29 files changed, 54 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/5e063268/src/main/org/apache/tools/ant/Project.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/5e063268/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/5e063268/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/5e063268/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/5e063268/src/main/org/apache/tools/ant/util/FileUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/5e063268/src/main/org/apache/tools/ant/util/StringUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/5e063268/src/main/org/apache/tools/ant/util/depend/AbstractAnalyzer.java ----------------------------------------------------------------------
