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/20 19:52:54 UTC
[4/6] 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/89b267ef
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/89b267ef
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/89b267ef
Branch: refs/heads/master
Commit: 89b267eff1e82d85deccd1532d000529af62e1be
Parents: 990a664 c8a72df
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Dec 20 20:45:02 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Dec 20 20:45:02 2016 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/Main.java | 5 +-
.../apache/tools/ant/taskdefs/AntStructure.java | 6 +-
.../apache/tools/ant/taskdefs/Available.java | 22 ++++--
.../org/apache/tools/ant/taskdefs/Truncate.java | 4 +-
.../tools/ant/taskdefs/cvslib/CvsTagDiff.java | 2 +-
.../ant/taskdefs/optional/PropertyFile.java | 2 +-
.../apache/tools/ant/taskdefs/optional/Rpm.java | 12 ++-
.../optional/depend/DirectoryIterator.java | 16 ++--
.../ant/taskdefs/optional/ejb/IPlanetEjbc.java | 3 +-
.../optional/extension/ExtensionUtil.java | 20 ++++-
.../taskdefs/optional/jdepend/JDependTask.java | 2 +-
.../ant/taskdefs/optional/jlink/jlink.java | 81 ++++++++++----------
.../taskdefs/optional/sound/AntSoundPlayer.java | 33 ++++----
.../tools/ant/types/resources/ResourceList.java | 15 ++--
.../tools/ant/types/resources/Tokens.java | 3 +-
.../types/selectors/ContainsRegexpSelector.java | 2 +-
.../ant/types/selectors/ContainsSelector.java | 4 +-
.../org/apache/tools/ant/util/FileUtils.java | 2 +-
src/main/org/apache/tools/zip/ZipFile.java | 4 +-
19 files changed, 144 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/89b267ef/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/89b267ef/src/main/org/apache/tools/ant/util/FileUtils.java
----------------------------------------------------------------------