Sorry, I have no idea what this is... should it be reverted?
(I'm a Git noob and this is something that my IntelliJ git plugin seems to have
done).
Maarten
Van: "[email protected]" <[email protected]>
Aan: [email protected]
Verzonden: donderdag 5 april 11:33 2018
Onderwerp: [2/2] ant git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/ant
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ant
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/f2459248
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/f2459248
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/f2459248
Branch: refs/heads/master
Commit: f2459248f23aa439e2c5ab642d9d9d7e6cffc933
Parents: 277906b 26c8789
Author: Maarten Coene <[email protected]>
Authored: Thu Apr 5 11:32:22 2018 +0200
Committer: Maarten Coene <[email protected]>
Committed: Thu Apr 5 11:32:22 2018 +0200
----------------------------------------------------------------------
.../org/apache/tools/ant/AntClassLoader.java | 16 +-
.../org/apache/tools/ant/DefaultLogger.java | 3 +-
.../org/apache/tools/ant/DirectoryScanner.java | 1 +
src/main/org/apache/tools/ant/Main.java | 2 +-
.../org/apache/tools/ant/PathTokenizer.java | 6 +-
src/main/org/apache/tools/ant/Project.java | 8 +-
.../org/apache/tools/ant/ProjectHelper.java | 6 +-
.../org/apache/tools/ant/PropertyHelper.java | 30 ++--
.../apache/tools/ant/RuntimeConfigurable.java | 25 ++--
.../tools/ant/TaskConfigurationChecker.java | 10 +-
src/main/org/apache/tools/ant/XmlLogger.java | 3 +-
.../tools/ant/attribute/BaseIfAttribute.java | 3 +-
.../tools/ant/filters/ClassConstants.java | 31 ++--
.../apache/tools/ant/filters/ConcatFilter.java | 8 +-
.../tools/ant/filters/ExpandProperties.java | 4 +-
.../apache/tools/ant/filters/HeadFilter.java | 8 +-
.../tools/ant/filters/LineContainsRegExp.java | 6 +-
.../apache/tools/ant/filters/SortFilter.java | 5 +-
.../tools/ant/filters/StripJavaComments.java | 3 +-
.../apache/tools/ant/filters/TailFilter.java | 8 +-
.../tools/ant/filters/util/JavaClassHelper.java | 15 +-
.../apache/tools/ant/helper/ProjectHelper2.java | 150 ++++++++++---------
.../tools/ant/helper/ProjectHelperImpl.java | 75 ++++++----
.../org/apache/tools/ant/launch/Locator.java | 2 +-
.../apache/tools/ant/taskdefs/AntStructure.java | 33 ++--
.../org/apache/tools/ant/taskdefs/Concat.java | 11 +-
.../org/apache/tools/ant/taskdefs/Copy.java | 14 +-
.../org/apache/tools/ant/taskdefs/EchoXML.java | 2 +-
.../org/apache/tools/ant/taskdefs/Expand.java | 23 +--
src/main/org/apache/tools/ant/taskdefs/Get.java | 15 +-
src/main/org/apache/tools/ant/taskdefs/Jar.java | 5 +-
.../org/apache/tools/ant/taskdefs/Javac.java | 6 +-
.../org/apache/tools/ant/taskdefs/Manifest.java | 29 +---
.../org/apache/tools/ant/taskdefs/Recorder.java | 3 +-
.../org/apache/tools/ant/taskdefs/Replace.java | 2 +-
.../org/apache/tools/ant/taskdefs/Rmic.java | 5 +-
src/main/org/apache/tools/ant/taskdefs/Tar.java | 4 +-
.../org/apache/tools/ant/taskdefs/UpToDate.java | 13 +-
.../compilers/DefaultCompilerAdapter.java | 7 +-
.../ant/taskdefs/condition/IsReference.java | 19 +--
.../apache/tools/ant/taskdefs/condition/Os.java | 4 +-
.../ant/taskdefs/cvslib/ChangeLogParser.java | 8 +-
.../taskdefs/launcher/VmsCommandLauncher.java | 2 +-
.../tools/ant/taskdefs/optional/NetRexxC.java | 6 +-
.../ant/taskdefs/optional/RenameExtensions.java | 1 +
.../ant/taskdefs/optional/SchemaValidate.java | 26 ++--
.../taskdefs/optional/depend/AntAnalyzer.java | 4 +-
.../ant/taskdefs/optional/ejb/IPlanetEjbc.java | 33 ++--
.../taskdefs/optional/jdepend/JDependTask.java | 2 +
.../optional/jlink/ClassNameReader.java | 3 +-
.../compilers/DefaultJspCompilerAdapter.java | 11 +-
.../ant/taskdefs/optional/junit/JUnitTask.java | 21 +--
.../junit/SummaryJUnitResultFormatter.java | 14 +-
.../AbstractJUnitResultFormatter.java | 4 -
.../junitlauncher/JUnitLauncherTask.java | 2 -
.../LegacyPlainResultFormatter.java | 4 +-
.../junitlauncher/LegacyXmlResultFormatter.java | 1 -
.../native2ascii/BuiltinNative2Ascii.java | 18 +--
.../tools/ant/taskdefs/optional/net/FTP.java | 11 +-
.../optional/net/FTPTaskMirrorImpl.java | 3 +-
.../ant/taskdefs/optional/ssh/SSHExec.java | 2 +-
.../taskdefs/optional/ssh/ScpFromMessage.java | 4 +-
.../optional/ssh/ScpFromMessageBySftp.java | 6 +-
.../apache/tools/ant/types/AbstractFileSet.java | 8 +-
.../org/apache/tools/ant/types/Commandline.java | 19 +--
.../apache/tools/ant/types/CommandlineJava.java | 13 +-
.../org/apache/tools/ant/types/PropertySet.java | 3 +-
.../ant/types/resources/PropertyResource.java | 5 +-
.../tools/ant/types/resources/TarResource.java | 34 ++++-
.../tools/ant/types/resources/URLResource.java | 6 +-
.../comparators/ResourceComparator.java | 5 +-
.../ant/types/selectors/SelectorUtils.java | 2 +
.../apache/tools/ant/util/DOMElementWriter.java | 27 ++--
.../org/apache/tools/ant/util/DateUtils.java | 4 +-
.../org/apache/tools/ant/util/FileUtils.java | 12 +-
.../org/apache/tools/ant/util/JavaEnvUtils.java | 1 +
.../ant/util/LayoutPreservingProperties.java | 2 +-
.../apache/tools/ant/util/LazyHashtable.java | 6 +-
.../LineOrientedOutputStreamRedirector.java | 9 +-
.../apache/tools/ant/util/ResourceUtils.java | 9 +-
.../org/apache/tools/ant/util/StringUtils.java | 2 +-
.../ant/util/regexp/Jdk14RegexpMatcher.java | 3 +-
src/main/org/apache/tools/bzip2/BlockSort.java | 6 +-
.../apache/tools/bzip2/CBZip2InputStream.java | 8 +-
src/main/org/apache/tools/tar/TarEntry.java | 18 +--
.../apache/tools/zip/ZipEightByteInteger.java | 6 +-
src/main/org/apache/tools/zip/ZipLong.java | 5 +-
src/main/org/apache/tools/zip/ZipShort.java | 5 +-
.../org/apache/tools/ant/DispatchTaskTest.java | 2 +-
.../tools/ant/IntrospectionHelperTest.java | 53 +++----
.../junit/org/apache/tools/ant/ProjectTest.java | 3 +-
.../apache/tools/ant/PropertyExpansionTest.java | 5 +-
.../tools/ant/taskdefs/AbstractCvsTaskTest.java | 6 +-
.../tools/ant/taskdefs/AntStructureTest.java | 18 ++-
.../org/apache/tools/ant/taskdefs/AntTest.java | 22 +--
.../apache/tools/ant/taskdefs/CVSPassTest.java | 2 +-
.../tools/ant/taskdefs/CallTargetTest.java | 6 +-
.../apache/tools/ant/taskdefs/ConcatTest.java | 7 +-
.../org/apache/tools/ant/taskdefs/CopyTest.java | 3 +-
.../tools/ant/taskdefs/DefaultExcludesTest.java | 7 +-
.../apache/tools/ant/taskdefs/DirnameTest.java | 5 +-
.../org/apache/tools/ant/taskdefs/EchoTest.java | 2 +-
.../tools/ant/taskdefs/ExecuteWatchdogTest.java | 5 +-
.../apache/tools/ant/taskdefs/FixCrLfTest.java | 4 +-
.../org/apache/tools/ant/taskdefs/GetTest.java | 15 +-
.../org/apache/tools/ant/taskdefs/JarTest.java | 2 +-
.../apache/tools/ant/taskdefs/ManifestTest.java | 3 +-
.../org/apache/tools/ant/taskdefs/MoveTest.java | 39 ++---
.../tools/ant/taskdefs/RmicAdvancedTest.java | 4 +-
.../apache/tools/ant/taskdefs/SQLExecTest.java | 3 +-
.../apache/tools/ant/taskdefs/SignJarTest.java | 2 +-
.../org/apache/tools/ant/taskdefs/SyncTest.java | 11 +-
.../ant/taskdefs/condition/ContainsTest.java | 3 +-
.../ant/taskdefs/condition/EqualsTest.java | 5 +-
.../taskdefs/condition/IsFileSelectedTest.java | 6 +-
.../ant/taskdefs/condition/IsReachableTest.java | 6 +-
.../ant/taskdefs/condition/IsReferenceTest.java | 2 +-
.../taskdefs/condition/ParserSupportsTest.java | 6 +-
.../ant/taskdefs/condition/TypeFoundTest.java | 6 +-
.../tools/ant/taskdefs/email/EmailTaskTest.java | 4 +-
.../tools/ant/taskdefs/optional/PvcsTest.java | 2 +-
.../taskdefs/optional/SchemaValidateTest.java | 12 +-
.../ant/taskdefs/optional/XmlValidateTest.java | 4 +-
.../tools/ant/taskdefs/optional/XsltTest.java | 2 +-
.../ant/taskdefs/optional/image/ImageTest.java | 18 +--
.../taskdefs/optional/jdepend/JDependTest.java | 15 +-
.../taskdefs/optional/script/ScriptDefTest.java | 20 +--
.../org/apache/tools/ant/types/AddTypeTest.java | 22 +--
.../org/apache/tools/ant/types/PolyTest.java | 11 +-
.../tools/ant/types/RedirectorElementTest.java | 4 +-
.../ant/types/optional/ScriptSelectorTest.java | 2 +-
.../types/selectors/ModifiedSelectorTest.java | 4 +-
.../tools/ant/util/CollectionUtilsTest.java | 37 ++---
.../apache/tools/ant/util/FileUtilsTest.java | 2 +-
.../apache/tools/ant/util/JavaEnvUtilsTest.java | 2 +
.../util/LayoutPreservingPropertiesTest.java | 14 +-
.../apache/tools/ant/util/XMLFragmentTest.java | 4 +-
.../ant/util/facade/FacadeTaskHelperTest.java | 2 +-
138 files changed, 660 insertions(+), 811 deletions(-)
----------------------------------------------------------------------
