Merge 1.9.x branch into master
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/f410119c Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/f410119c Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/f410119c Branch: refs/heads/master Commit: f410119cf936f36a09265cb8ee2b81ce803aed85 Parents: 551cb55 8cc8fee Author: Jaikiran Pai <jaiki...@apache.org> Authored: Tue Nov 6 16:16:52 2018 +0530 Committer: Jaikiran Pai <jaiki...@apache.org> Committed: Tue Nov 6 16:16:52 2018 +0530 ---------------------------------------------------------------------- CONTRIBUTORS | 1 - WHATSNEW | 5 ----- contributors.xml | 4 ---- src/etc/testcases/core/directoryscanner.xml | 5 ----- src/main/org/apache/tools/ant/DirectoryScanner.java | 12 ------------ src/main/org/apache/tools/ant/taskdefs/Delete.java | 14 +------------- .../org/apache/tools/ant/DirectoryScannerTest.java | 14 -------------- 7 files changed, 1 insertion(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/f410119c/CONTRIBUTORS ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/f410119c/WHATSNEW ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/f410119c/contributors.xml ---------------------------------------------------------------------- diff --cc contributors.xml index 3c95e6e,a62b1d4..ebf03ee --- a/contributors.xml +++ b/contributors.xml @@@ -1152,15 -1074,7 +1152,11 @@@ <last>Yanos</last> </name> <name> + <first>Matthias</first> + <last>Bhend</last> + </name> + <name> <first>Michael</first> - <last>Barker</last> - </name> - <name> - <first>Michael</first> <last>Bayne</last> </name> <name> http://git-wip-us.apache.org/repos/asf/ant/blob/f410119c/src/main/org/apache/tools/ant/DirectoryScanner.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/f410119c/src/main/org/apache/tools/ant/taskdefs/Delete.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/f410119c/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java ---------------------------------------------------------------------- diff --cc src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java index e332a9c,819d4e5..6dab26c --- a/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java +++ b/src/tests/junit/org/apache/tools/ant/DirectoryScannerTest.java @@@ -131,24 -133,11 +131,10 @@@ public class DirectoryScannerTest } @Test - public void testAllowRecursiveSymlinks() { - - assumeTrue("Current system does not support Symlinks", supportsSymlinks); - - buildRule.getProject().executeTarget("symlink-nested-setup"); - DirectoryScanner ds = new DirectoryScanner(); - ds.setBasedir(new File(buildRule.getProject().getProperty("output"))); - ds.setIncludes(new String[] {"alpha/beta/gamma/"}); - ds.scan(); - compareFiles(ds, new String[] {"alpha/beta/gamma/gamma.xml"}, - new String[] {"alpha/beta/gamma"}); - } - - @Test public void testProhibitSymlinks() { assumeTrue("Current system does not support Symlinks", supportsSymlinks); - buildRule.getProject().executeTarget("symlink-setup"); - DirectoryScanner ds = new DirectoryScanner(); + ds.setBasedir(new File(buildRule.getProject().getProperty("output"))); ds.setIncludes(new String[] {"alpha/beta/gamma/"}); ds.setFollowSymlinks(false);