[ant] 02/04: Merge tag 'upstream/1.9.8'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Jan 6 00:31:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ant.
commit ceecec59eb17a1941730a10f659f207cb792a4c7
Merge: fe198ce 2992beb
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jan 6 01:24:02 2017 +0100
Merge tag 'upstream/1.9.8'
Upstream version 1.9.8
CONTRIBUTORS | 5 +
WHATSNEW | 112 +++++++++++
bootstrap.bat | 1 +
build.xml | 10 +-
contributors.xml | 20 ++
lib/libraries.properties | 2 +-
manual/Tasks/get.html | 5 +-
manual/Tasks/javac.html | 30 ++-
manual/Tasks/javah.html | 18 +-
manual/Tasks/junit.html | 59 +++++-
manual/Tasks/native2ascii.html | 13 +-
manual/Tasks/rmic.html | 12 +-
manual/Tasks/scp.html | 6 +
manual/Tasks/style.html | 77 +++++++-
manual/Tasks/touch.html | 6 +-
manual/Types/fileset.html | 2 +-
manual/Types/filterchain.html | 34 ++++
manual/Types/resources.html | 5 +-
manual/Types/selectors.html | 9 +-
manual/cover.html | 6 +-
manual/credits.html | 2 +-
manual/properties.html | 6 +-
src/etc/junit-frames.xsl | 6 +-
src/etc/junit-noframes.xsl | 6 +-
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/rmic/rmic.xml | 52 ++---
src/etc/testcases/taskdefs/zip.xml | 19 ++
src/main/org/apache/tools/ant/AntClassLoader.java | 12 +-
.../tools/ant/ArgumentProcessorRegistry.java | 4 +-
src/main/org/apache/tools/ant/ComponentHelper.java | 2 +-
src/main/org/apache/tools/ant/Diagnostics.java | 2 +-
.../org/apache/tools/ant/DirectoryScanner.java | 2 +-
.../org/apache/tools/ant/IntrospectionHelper.java | 16 +-
src/main/org/apache/tools/ant/Main.java | 27 ++-
src/main/org/apache/tools/ant/Project.java | 10 +-
.../apache/tools/ant/ProjectHelperRepository.java | 12 +-
.../org/apache/tools/ant/RuntimeConfigurable.java | 5 +-
src/main/org/apache/tools/ant/UnknownElement.java | 3 +-
src/main/org/apache/tools/ant/XmlLogger.java | 6 +-
src/main/org/apache/tools/ant/antlib.xml | 2 +
.../{UniqFilter.java => Native2AsciiFilter.java} | 32 ++--
.../apache/tools/ant/filters/ReplaceTokens.java | 7 +-
.../org/apache/tools/ant/filters/SortFilter.java | 2 +-
.../org/apache/tools/ant/filters/UniqFilter.java | 7 +-
.../apache/tools/ant/helper/ProjectHelperImpl.java | 3 +-
.../tools/ant/input/DefaultInputHandler.java | 6 +-
src/main/org/apache/tools/ant/launch/Launcher.java | 8 +-
.../org/apache/tools/ant/listener/MailLogger.java | 6 +-
.../tools/ant/taskdefs/AbstractJarSignerTask.java | 1 -
.../apache/tools/ant/taskdefs/AntStructure.java | 9 +-
.../org/apache/tools/ant/taskdefs/Available.java | 22 ++-
.../org/apache/tools/ant/taskdefs/Classloader.java | 3 +-
src/main/org/apache/tools/ant/taskdefs/Concat.java | 2 +-
.../org/apache/tools/ant/taskdefs/Execute.java | 4 +-
.../org/apache/tools/ant/taskdefs/ExecuteJava.java | 9 +-
src/main/org/apache/tools/ant/taskdefs/Expand.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/Get.java | 43 +++--
.../org/apache/tools/ant/taskdefs/HostInfo.java | 4 +-
src/main/org/apache/tools/ant/taskdefs/Jar.java | 5 +-
src/main/org/apache/tools/ant/taskdefs/Java.java | 7 +-
src/main/org/apache/tools/ant/taskdefs/Javac.java | 63 +++++-
.../org/apache/tools/ant/taskdefs/Javadoc.java | 11 +-
.../org/apache/tools/ant/taskdefs/KeySubst.java | 6 +-
src/main/org/apache/tools/ant/taskdefs/Length.java | 2 +-
.../apache/tools/ant/taskdefs/LogOutputStream.java | 2 +-
.../org/apache/tools/ant/taskdefs/MacroDef.java | 4 +-
.../apache/tools/ant/taskdefs/MacroInstance.java | 14 +-
.../org/apache/tools/ant/taskdefs/Manifest.java | 2 +-
.../org/apache/tools/ant/taskdefs/Parallel.java | 10 +-
.../tools/ant/taskdefs/ProcessDestroyer.java | 10 +-
.../apache/tools/ant/taskdefs/RecorderEntry.java | 2 +-
.../apache/tools/ant/taskdefs/StreamPumper.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/SubAnt.java | 4 +-
src/main/org/apache/tools/ant/taskdefs/Sync.java | 3 +-
src/main/org/apache/tools/ant/taskdefs/Touch.java | 34 ++--
.../org/apache/tools/ant/taskdefs/Truncate.java | 2 +-
.../org/apache/tools/ant/taskdefs/XSLTLiaison.java | 6 +-
.../org/apache/tools/ant/taskdefs/XSLTProcess.java | 95 +++++++++-
.../org/apache/tools/ant/taskdefs/XmlProperty.java | 6 +-
src/main/org/apache/tools/ant/taskdefs/Zip.java | 12 +-
.../taskdefs/compilers/CompilerAdapterFactory.java | 3 +-
.../taskdefs/compilers/DefaultCompilerAdapter.java | 95 +++++++---
.../tools/ant/taskdefs/condition/AntVersion.java | 6 +-
.../tools/ant/taskdefs/cvslib/ChangeLogParser.java | 17 +-
.../tools/ant/taskdefs/cvslib/ChangeLogWriter.java | 14 +-
.../tools/ant/taskdefs/cvslib/CvsTagDiff.java | 2 +-
.../ant/taskdefs/optional/EchoProperties.java | 18 ++
.../tools/ant/taskdefs/optional/NetRexxC.java | 2 +-
.../tools/ant/taskdefs/optional/PropertyFile.java | 4 +-
.../apache/tools/ant/taskdefs/optional/Rpm.java | 12 +-
.../tools/ant/taskdefs/optional/TraXLiaison.java | 71 +++++--
.../ant/taskdefs/optional/ccm/CCMCreateTask.java | 4 +-
.../ant/taskdefs/optional/clearcase/ClearCase.java | 2 +-
.../tools/ant/taskdefs/optional/depend/Depend.java | 2 +-
.../optional/depend/DirectoryIterator.java | 16 +-
.../taskdefs/optional/depend/JarFileIterator.java | 4 +-
.../ant/taskdefs/optional/ejb/IPlanetEjbc.java | 10 +-
.../taskdefs/optional/extension/ExtensionUtil.java | 20 +-
.../tools/ant/taskdefs/optional/image/Image.java | 3 +-
.../tools/ant/taskdefs/optional/javacc/JavaCC.java | 4 +-
.../ant/taskdefs/optional/javah/ForkingJavah.java | 72 +++++++
.../optional/javah/JavahAdapterFactory.java | 6 +
.../ant/taskdefs/optional/javah/SunJavah.java | 2 +-
.../ant/taskdefs/optional/jdepend/JDependTask.java | 4 +-
.../tools/ant/taskdefs/optional/jlink/jlink.java | 83 ++++----
.../ant/taskdefs/optional/jsp/JspNameMangler.java | 2 +-
.../optional/junit/AggregateTransformer.java | 42 +++-
.../taskdefs/optional/junit/FailureRecorder.java | 5 +-
.../ant/taskdefs/optional/junit/JUnitTask.java | 165 ++++++++++++++--
.../taskdefs/optional/junit/JUnitTestRunner.java | 3 +-
.../optional/junit/PlainJUnitResultFormatter.java | 6 +-
.../optional/native2ascii/BuiltinNative2Ascii.java | 104 ++++++++++
.../native2ascii/Native2AsciiAdapterFactory.java | 29 ++-
.../tools/ant/taskdefs/optional/net/FTP.java | 10 +-
.../tools/ant/taskdefs/optional/net/FTPTask.java | 6 +-
.../taskdefs/optional/net/FTPTaskMirrorImpl.java | 4 +-
.../tools/ant/taskdefs/optional/net/RExecTask.java | 12 +-
.../ant/taskdefs/optional/net/TelnetTask.java | 12 +-
.../tools/ant/taskdefs/optional/sos/SOS.java | 4 +-
.../tools/ant/taskdefs/optional/sos/SOSCmd.java | 2 +-
.../taskdefs/optional/sound/AntSoundPlayer.java | 39 ++--
.../ant/taskdefs/optional/splash/SplashTask.java | 9 +-
.../taskdefs/optional/ssh/AbstractSshMessage.java | 22 +++
.../tools/ant/taskdefs/optional/ssh/Scp.java | 19 +-
.../ant/taskdefs/optional/ssh/ScpFromMessage.java | 27 ++-
.../ant/taskdefs/optional/ssh/ScpToMessage.java | 95 +++++++++-
.../tools/ant/taskdefs/optional/unix/Symlink.java | 4 +-
.../tools/ant/taskdefs/optional/vss/MSVSS.java | 2 +-
.../ant/taskdefs/rmic/DefaultRmicAdapter.java | 14 ++
.../apache/tools/ant/taskdefs/rmic/KaffeRmic.java | 2 +-
.../ant/taskdefs/rmic/RmicAdapterFactory.java | 11 +-
.../apache/tools/ant/taskdefs/rmic/SunRmic.java | 16 +-
.../apache/tools/ant/types/AbstractFileSet.java | 12 ++
.../apache/tools/ant/types/AntFilterReader.java | 3 +-
.../apache/tools/ant/types/CommandlineJava.java | 4 +-
.../org/apache/tools/ant/types/FilterChain.java | 3 +-
src/main/org/apache/tools/ant/types/Mapper.java | 2 +-
src/main/org/apache/tools/ant/types/Path.java | 4 +-
.../org/apache/tools/ant/types/Permissions.java | 2 +-
.../org/apache/tools/ant/types/XMLCatalog.java | 2 +-
.../tools/ant/types/resources/ArchiveResource.java | 2 +-
.../tools/ant/types/resources/MappedResource.java | 2 +-
.../ant/types/resources/ResourceDecorator.java | 16 +-
.../tools/ant/types/resources/ResourceList.java | 15 +-
.../tools/ant/types/resources/StringResource.java | 13 +-
.../apache/tools/ant/types/resources/Tokens.java | 3 +-
.../tools/ant/types/resources/URLResource.java | 2 +-
.../tools/ant/types/resources/selectors/Date.java | 13 +-
.../tools/ant/types/selectors/BaseSelector.java | 17 +-
.../types/selectors/ContainsRegexpSelector.java | 11 +-
.../ant/types/selectors/ContainsSelector.java | 4 +-
.../tools/ant/types/selectors/DateSelector.java | 14 +-
.../modifiedselector/PropertiesfileCache.java | 4 +-
.../org/apache/tools/ant/util/Base64Converter.java | 2 +-
.../org/apache/tools/ant/util/CollectionUtils.java | 5 +-
.../apache/tools/ant/util/DOMElementWriter.java | 2 +-
src/main/org/apache/tools/ant/util/FileUtils.java | 4 +-
.../org/apache/tools/ant/util/JavaEnvUtils.java | 87 ++++++---
.../tools/ant/util/LayoutPreservingProperties.java | 2 +-
.../apache/tools/ant/util/Native2AsciiUtils.java | 89 +++++++++
.../tools/ant/util/OutputStreamFunneler.java | 8 +-
src/main/org/apache/tools/ant/util/ProxySetup.java | 4 +-
.../apache/tools/ant/util/ReaderInputStream.java | 2 +-
.../org/apache/tools/ant/util/ResourceUtils.java | 4 +-
.../org/apache/tools/ant/util/StringUtils.java | 4 +-
.../apache/tools/ant/util/SymbolicLinkUtils.java | 23 ++-
src/main/org/apache/tools/ant/util/UUEncoder.java | 2 +-
src/main/org/apache/tools/ant/util/WorkerAnt.java | 8 +-
.../tools/ant/util/depend/AbstractAnalyzer.java | 3 +-
.../ant/util/depend/bcel/AncestorAnalyzer.java | 2 +-
.../tools/ant/util/depend/bcel/FullAnalyzer.java | 2 +-
.../tools/ant/util/optional/JavaxScriptRunner.java | 2 +-
.../org/apache/tools/bzip2/BZip2Constants.java | 2 +-
src/main/org/apache/tools/bzip2/BlockSort.java | 16 +-
src/main/org/apache/tools/bzip2/CRC.java | 2 +-
src/main/org/apache/tools/tar/TarEntry.java | 9 +-
src/main/org/apache/tools/tar/TarInputStream.java | 2 +-
src/main/org/apache/tools/tar/TarOutputStream.java | 4 +-
src/main/org/apache/tools/tar/TarUtils.java | 6 +-
.../tools/zip/AbstractUnicodeExtraField.java | 2 +-
src/main/org/apache/tools/zip/AsiExtraField.java | 2 +-
src/main/org/apache/tools/zip/ExtraFieldUtils.java | 6 +-
.../org/apache/tools/zip/GeneralPurposeBit.java | 2 +-
.../tools/zip/UnsupportedZipFeatureException.java | 6 +-
src/main/org/apache/tools/zip/ZipEntry.java | 4 +-
src/main/org/apache/tools/zip/ZipFile.java | 10 +-
src/main/org/apache/tools/zip/ZipLong.java | 2 +-
src/main/org/apache/tools/zip/ZipOutputStream.java | 12 +-
src/main/org/apache/tools/zip/ZipShort.java | 2 +-
src/script/ant | 64 ++++++-
src/tests/antunit/antunit-base.xml | 4 +-
src/tests/antunit/filters/native2ascii-test.xml | 53 ++++++
src/tests/antunit/taskdefs/javac-test.xml | 79 +++++---
src/tests/antunit/taskdefs/optional/javah-test.xml | 70 +++++++
.../taskdefs/optional/native2ascii-test.xml | 67 +++++++
src/tests/antunit/types/fileset-test.xml | 18 ++
.../org/apache/tools/ant/AntClassLoaderTest.java | 4 -
.../tools/ant/taskdefs/RmicAdvancedTest.java | 32 +++-
.../org/apache/tools/ant/taskdefs/ZipTest.java | 8 +
.../compilers/DefaultCompilerAdapterTest.java | 107 ++++++++++-
.../ant/taskdefs/optional/TraXLiaisonTest.java | 91 ++++++---
.../taskdefs/optional/junit/JUnitReportTest.java | 168 ++++++++--------
.../ant/taskdefs/optional/junit/JUnitTaskTest.java | 211 +++++++++++++++++++++
.../optional/junit/JUnitTestRunnerTest.java | 30 ++-
.../ant/types/selectors/DateSelectorTest.java | 2 +-
.../apache/tools/ant/util/JavaEnvUtilsTest.java | 13 +-
.../tools/ant/util/Native2AsciiUtilsTest.java | 76 ++++++++
230 files changed, 3113 insertions(+), 860 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