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/03/28 14:10:29 UTC
[4/5] ant git commit: Merge branch '1.9.x'
Merge branch '1.9.x'
Conflicts:
src/main/org/apache/tools/zip/ZipFile.java
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/48cdc84c
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/48cdc84c
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/48cdc84c
Branch: refs/heads/master
Commit: 48cdc84cc8c309dcc3bcfe61e6cc7a1700fa21ee
Parents: 1591c1f a8d6367
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon Mar 28 14:08:39 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Mar 28 14:09:25 2016 +0200
----------------------------------------------------------------------
.../tools/ant/ArgumentProcessorRegistry.java | 7 ++----
.../org/apache/tools/ant/DefaultLogger.java | 4 +---
.../org/apache/tools/ant/DemuxOutputStream.java | 7 ++----
.../tools/ant/listener/AnsiColorLogger.java | 9 ++-----
src/main/org/apache/tools/ant/taskdefs/Ant.java | 6 +----
.../org/apache/tools/ant/taskdefs/CVSPass.java | 8 +------
.../org/apache/tools/ant/taskdefs/Javadoc.java | 8 ++-----
.../org/apache/tools/ant/taskdefs/Property.java | 8 +------
.../tools/ant/taskdefs/PumpStreamHandler.java | 8 +++----
.../apache/tools/ant/taskdefs/Redirector.java | 17 +++----------
.../ant/taskdefs/optional/EchoProperties.java | 8 +------
.../optional/ejb/GenericDeploymentTool.java | 25 ++++----------------
.../ant/taskdefs/optional/ejb/IPlanetEjbc.java | 8 +++----
.../optional/extension/JarLibManifestTask.java | 9 ++-----
.../ant/taskdefs/optional/jlink/jlink.java | 8 +------
.../junit/SummaryJUnitResultFormatter.java | 7 ++----
.../optional/net/FTPTaskMirrorImpl.java | 16 ++-----------
.../tools/ant/types/resources/TarResource.java | 4 +---
.../compilers/DefaultCompilerAdapterTest.java | 3 ---
19 files changed, 34 insertions(+), 136 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/48cdc84c/src/main/org/apache/tools/ant/taskdefs/Property.java
----------------------------------------------------------------------