You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/12/21 16:00:01 UTC

[12/12] ant git commit: Merge branch '1.9.x'

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/754efaae
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/754efaae
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/754efaae

Branch: refs/heads/master
Commit: 754efaae6dce6861ff05deee48e98e76b2a321a9
Parents: 06c4251 ae7f01f
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Dec 21 16:59:38 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Dec 21 16:59:38 2016 +0100

----------------------------------------------------------------------
 .../org/apache/tools/ant/RuntimeConfigurable.java |  5 +++--
 .../org/apache/tools/ant/filters/SortFilter.java  |  2 +-
 .../apache/tools/ant/taskdefs/AntStructure.java   |  3 +--
 .../apache/tools/ant/taskdefs/ExecuteJava.java    |  9 +++++++--
 .../org/apache/tools/ant/taskdefs/Manifest.java   |  2 +-
 .../org/apache/tools/ant/taskdefs/Parallel.java   | 10 ++++++++--
 .../ant/taskdefs/cvslib/ChangeLogParser.java      | 17 ++++++++---------
 .../ant/taskdefs/cvslib/ChangeLogWriter.java      | 14 +++++++-------
 .../ant/taskdefs/optional/EchoProperties.java     | 18 ++++++++++++++++++
 .../tools/ant/taskdefs/optional/TraXLiaison.java  |  2 +-
 .../apache/tools/ant/taskdefs/rmic/KaffeRmic.java |  2 +-
 .../apache/tools/ant/types/AntFilterReader.java   |  3 +--
 .../org/apache/tools/ant/types/FilterChain.java   |  3 +--
 src/main/org/apache/tools/ant/types/Mapper.java   |  2 +-
 .../org/apache/tools/ant/types/Permissions.java   |  2 +-
 .../org/apache/tools/ant/types/XMLCatalog.java    |  2 +-
 .../ant/types/resources/ArchiveResource.java      |  2 +-
 .../tools/ant/types/resources/MappedResource.java |  2 +-
 .../ant/types/resources/ResourceDecorator.java    | 16 +++++++++++++++-
 .../tools/ant/types/resources/StringResource.java | 11 +++++++++++
 .../tools/ant/types/resources/URLResource.java    |  2 +-
 .../tools/ant/util/OutputStreamFunneler.java      |  8 +++++++-
 .../org/apache/tools/ant/util/ResourceUtils.java  |  4 ++--
 src/main/org/apache/tools/ant/util/WorkerAnt.java |  8 ++++++--
 src/main/org/apache/tools/bzip2/BlockSort.java    |  2 +-
 src/main/org/apache/tools/tar/TarUtils.java       |  2 +-
 .../tools/zip/UnsupportedZipFeatureException.java |  8 ++++----
 27 files changed, 111 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/754efaae/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
----------------------------------------------------------------------