[ant] 01/03: Merge tag 'upstream/1.9.6'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ant.

commit d6496d901f3e84cfcf130a80f16626efb3943eee
Merge: f0efff8 8c8b4a2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 6 10:09:18 2015 +0200

    Merge tag 'upstream/1.9.6'
    
    Upstream version 1.9.6

 CONTRIBUTORS                                       |  1 +
 WHATSNEW                                           | 19 +++++
 build.xml                                          |  6 +-
 contributors.xml                                   |  4 ++
 manual/Tasks/makeurl.html                          |  8 +--
 manual/Tasks/replaceregexp.html                    | 39 +++++++++-
 manual/Tasks/schemavalidate.html                   |  4 +-
 manual/Tasks/setproxy.html                         |  8 +--
 manual/Tasks/signjar.html                          |  2 +-
 manual/Tasks/subant.html                           |  8 +--
 manual/Tasks/tempfile.html                         |  8 +--
 manual/Types/antlib.html                           |  5 +-
 manual/Types/resources.html                        | 44 +++++++++++-
 manual/cover.html                                  |  6 +-
 manual/credits.html                                |  2 +-
 manual/developlist.html                            |  4 +-
 manual/stylesheets/antmanual.css                   | 20 ------
 manual/tutorial-tasks-filesets-properties.html     |  6 +-
 manual/using.html                                  |  3 +-
 src/etc/poms/ant-antlr/pom.xml                     |  6 +-
 src/etc/poms/ant-apache-bcel/pom.xml               |  6 +-
 src/etc/poms/ant-apache-bsf/pom.xml                |  6 +-
 src/etc/poms/ant-apache-log4j/pom.xml              |  6 +-
 src/etc/poms/ant-apache-oro/pom.xml                |  6 +-
 src/etc/poms/ant-apache-regexp/pom.xml             |  6 +-
 src/etc/poms/ant-apache-resolver/pom.xml           |  6 +-
 src/etc/poms/ant-apache-xalan2/pom.xml             |  6 +-
 src/etc/poms/ant-commons-logging/pom.xml           |  6 +-
 src/etc/poms/ant-commons-net/pom.xml               |  6 +-
 src/etc/poms/ant-jai/pom.xml                       |  6 +-
 src/etc/poms/ant-javamail/pom.xml                  |  6 +-
 src/etc/poms/ant-jdepend/pom.xml                   |  6 +-
 src/etc/poms/ant-jmf/pom.xml                       |  6 +-
 src/etc/poms/ant-jsch/pom.xml                      |  6 +-
 src/etc/poms/ant-junit/pom.xml                     |  6 +-
 src/etc/poms/ant-junit4/pom.xml                    |  6 +-
 src/etc/poms/ant-launcher/pom.xml                  |  4 +-
 src/etc/poms/ant-netrexx/pom.xml                   |  6 +-
 src/etc/poms/ant-swing/pom.xml                     |  6 +-
 src/etc/poms/ant-testutil/pom.xml                  |  6 +-
 src/etc/poms/ant/pom.xml                           |  6 +-
 src/etc/poms/pom.xml                               |  2 +-
 .../testcases/taskdefs/conditions/antversion.xml   | 84 +++++++++++-----------
 .../org/apache/tools/ant/types/defaults.properties |  1 +
 .../ant/types/resources/JavaConstantResource.java  | 13 ++--
 src/main/org/apache/tools/zip/ZipEntry.java        |  2 +-
 src/tests/antunit/types/resources/test.xml         | 57 +++++++++++++++
 47 files changed, 309 insertions(+), 177 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git