[ant] 02/05: Merge tag 'upstream/1.9.7'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Apr 14 10:23:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ant.
commit 0b3001983fd292502eaa98d1293ebddca5d742d7
Merge: 35d10aa 54d05f3
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Apr 14 11:27:52 2016 +0200
Merge tag 'upstream/1.9.7'
Upstream version 1.9.7
CONTRIBUTORS | 5 +
NOTICE | 2 +-
WHATSNEW | 92 ++++-
build.xml | 16 +-
contributors.xml | 20 +
manual/Tasks/apply.html | 7 +-
manual/Tasks/conditions.html | 7 +
manual/Tasks/exec.html | 7 +-
manual/Tasks/jar.html | 4 +-
manual/Tasks/java.html | 62 ++-
manual/Tasks/javac.html | 88 +++-
manual/Tasks/scp.html | 39 +-
manual/Tasks/sshexec.html | 17 +
manual/Tasks/style.html | 3 +-
manual/cover.html | 6 +-
manual/credits.html | 2 +-
manual/properties.html | 17 +-
src/etc/copyrightcheck.sh | 63 +++
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 | 12 +-
src/etc/testcases/taskdefs/java.xml | 23 ++
src/etc/yearcheck.sh | 101 -----
src/main/org/apache/tools/ant/AntClassLoader.java | 34 +-
.../tools/ant/ArgumentProcessorRegistry.java | 7 +-
src/main/org/apache/tools/ant/DefaultLogger.java | 4 +-
.../org/apache/tools/ant/DemuxOutputStream.java | 7 +-
src/main/org/apache/tools/ant/Main.java | 13 +-
src/main/org/apache/tools/ant/Project.java | 2 +-
src/main/org/apache/tools/ant/ProjectHelper.java | 7 +
.../apache/tools/ant/listener/AnsiColorLogger.java | 9 +-
.../apache/tools/ant/loader/AntClassLoader5.java | 20 +-
src/main/org/apache/tools/ant/taskdefs/Ant.java | 6 +-
.../org/apache/tools/ant/taskdefs/BUnzip2.java | 4 +-
.../org/apache/tools/ant/taskdefs/CVSPass.java | 8 +-
.../org/apache/tools/ant/taskdefs/Definer.java | 2 +-
.../org/apache/tools/ant/taskdefs/Execute.java | 4 +-
src/main/org/apache/tools/ant/taskdefs/GUnzip.java | 4 +-
.../org/apache/tools/ant/taskdefs/ImportTask.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/Jar.java | 1 +
src/main/org/apache/tools/ant/taskdefs/Java.java | 67 +++-
src/main/org/apache/tools/ant/taskdefs/Javac.java | 443 ++++++++++++++++++++-
.../org/apache/tools/ant/taskdefs/Javadoc.java | 8 +-
.../org/apache/tools/ant/taskdefs/Property.java | 8 +-
.../tools/ant/taskdefs/PumpStreamHandler.java | 8 +-
.../org/apache/tools/ant/taskdefs/Redirector.java | 17 +-
.../org/apache/tools/ant/taskdefs/Replace.java | 23 +-
src/main/org/apache/tools/ant/taskdefs/Unpack.java | 12 +-
.../taskdefs/compilers/DefaultCompilerAdapter.java | 64 +++
.../apache/tools/ant/taskdefs/condition/Http.java | 12 +-
.../ant/taskdefs/optional/EchoProperties.java | 8 +-
.../optional/depend/constantpool/ConstantPool.java | 2 +-
.../optional/ejb/GenericDeploymentTool.java | 25 +-
.../ant/taskdefs/optional/ejb/IPlanetEjbc.java | 8 +-
.../optional/ejb/WeblogicDeploymentTool.java | 7 +-
.../optional/ejb/WebsphereDeploymentTool.java | 7 +-
.../optional/extension/JarLibManifestTask.java | 9 +-
.../tools/ant/taskdefs/optional/jlink/jlink.java | 8 +-
.../junit/SummaryJUnitResultFormatter.java | 7 +-
.../taskdefs/optional/net/FTPTaskMirrorImpl.java | 16 +-
.../tools/ant/taskdefs/optional/ssh/SSHBase.java | 48 +++
.../tools/ant/taskdefs/optional/ssh/Scp.java | 107 ++++-
.../ant/taskdefs/optional/ssh/ScpToMessage.java | 72 +++-
.../org/apache/tools/ant/types/Commandline.java | 18 +-
.../apache/tools/ant/types/CommandlineJava.java | 232 ++++++++++-
src/main/org/apache/tools/ant/types/Resource.java | 3 +
.../tools/ant/types/resources/FileResource.java | 6 +-
.../tools/ant/types/resources/TarResource.java | 4 +-
.../org/apache/tools/ant/util/ScriptRunner.java | 2 +-
.../apache/tools/ant/util/ScriptRunnerCreator.java | 12 +-
src/main/org/apache/tools/tar/TarEntry.java | 6 +-
src/main/org/apache/tools/tar/TarInputStream.java | 12 +-
src/main/org/apache/tools/zip/ZipFile.java | 3 +-
src/main/org/apache/tools/zip/ZipOutputStream.java | 2 +-
src/script/ant | 8 +-
src/tests/antunit/core/magic-names-test.xml | 6 +-
src/tests/antunit/taskdefs/bunzip2-test.xml | 26 +-
src/tests/antunit/taskdefs/gunzip-test.xml | 62 +++
src/tests/antunit/taskdefs/replace-test.xml | 171 ++++++++
.../org/apache/tools/ant/AntClassLoaderTest.java | 47 ++-
.../tools/ant/loader/AntClassLoader5Test.java | 73 ----
.../org/apache/tools/ant/taskdefs/JavaTest.java | 88 +++-
.../org/apache/tools/ant/taskdefs/JavacTest.java | 85 ++++
.../compilers/DefaultCompilerAdapterTest.java | 210 ++++++++++
.../tools/ant/taskdefs/optional/ssh/ScpTest.java | 43 +-
.../ant/types/resources/FileResourceTest.java | 15 +
.../ant/types/selectors/TokenizedPatternTest.java | 13 +
108 files changed, 2406 insertions(+), 586 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git
More information about the pkg-java-commits
mailing list