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/36a2087a Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/36a2087a Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/36a2087a Branch: refs/heads/master Commit: 36a2087a6c5232b575329ebf02a8a3c810aa1732 Parents: 761f8e6 0d30693 Author: Stefan Bodewig <bode...@apache.org> Authored: Tue Apr 17 11:30:04 2018 +0200 Committer: Stefan Bodewig <bode...@apache.org> Committed: Tue Apr 17 11:30:04 2018 +0200 ---------------------------------------------------------------------- WHATSNEW | 7 ++++++ .../tools/ant/taskdefs/PumpStreamHandler.java | 24 ++++++++++++-------- 2 files changed, 21 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/36a2087a/WHATSNEW ---------------------------------------------------------------------- diff --cc WHATSNEW index 611ff14,a40c4ed..78a1fbc --- a/WHATSNEW +++ b/WHATSNEW @@@ -16,10 -16,14 +16,17 @@@ Fixed bugs Other changes: -------------- + * AntAssert is deprecated, assertThat from JUnit 4.4+, Hamcrest matchers and/or + ExpectedException rule provide equivalent functionality + + * PumpStreamHandler now explicitly verifies the streams for output + and error are not null and will throw an exception if they + are. This way creating a PumpStreamHandler will fail early as + opposed to some obscure errors later when closing streams or + finishing threads might fail. + Bugzilla Report 62148 + -Changes from Ant 1.9.10 TO Ant 1.9.11 +Changes from Ant 1.10.2 TO Ant 1.10.3 ===================================== Changes that could break older environments:
