[2/2] ant git commit: Merge 1.9.x branch into master
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
Authored: Tue Nov 6 16:16:52 2018 +0530
Committer: Jaikiran Pai
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 @@@
Yanos
+Matthias
+Bhend
+
+
Michael
- Barker
-
-
- Michael
Bayne
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);
[2/2] ant git commit: Merge 1.9.x branch into master
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/6f569185 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/6f569185 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/6f569185 Branch: refs/heads/master Commit: 6f569185973f1d3fd5075d90ade9171495e143fa Parents: 2a359a6 189ad7e Author: Jaikiran Pai Authored: Fri Oct 5 11:35:03 2018 +0530 Committer: Jaikiran Pai Committed: Fri Oct 5 11:35:03 2018 +0530 -- src/main/org/apache/tools/ant/AntClassLoader.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ant/blob/6f569185/src/main/org/apache/tools/ant/AntClassLoader.java --
[2/2] ant git commit: Merge 1.9.x branch into master
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/fde6b0e9 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/fde6b0e9 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/fde6b0e9 Branch: refs/heads/master Commit: fde6b0e941a7cd7a12e84950723523bcedfbb868 Parents: d7c5185 c07bd86 Author: Jaikiran Pai Authored: Fri Sep 7 10:48:37 2018 +0530 Committer: Jaikiran Pai Committed: Fri Sep 7 10:48:37 2018 +0530 -- WHATSNEW | 4 src/main/org/apache/tools/zip/ZipOutputStream.java | 5 - 2 files changed, 8 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ant/blob/fde6b0e9/WHATSNEW -- http://git-wip-us.apache.org/repos/asf/ant/blob/fde6b0e9/src/main/org/apache/tools/zip/ZipOutputStream.java --
[2/2] ant git commit: Merge 1.9.x branch into master
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/c9c41729 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c9c41729 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c9c41729 Branch: refs/heads/master Commit: c9c41729a6172a6072f06118b26ffbbe68d2c4b4 Parents: 063e112 94ef3d3 Author: Jaikiran Pai Authored: Mon Aug 13 20:29:09 2018 +0530 Committer: Jaikiran Pai Committed: Mon Aug 13 20:29:09 2018 +0530 -- src/etc/poms/ant-javamail/pom.xml | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ant/blob/c9c41729/src/etc/poms/ant-javamail/pom.xml -- diff --cc src/etc/poms/ant-javamail/pom.xml index 5045720,3dd9993..024efd2 --- a/src/etc/poms/ant-javamail/pom.xml +++ b/src/etc/poms/ant-javamail/pom.xml @@@ -45,12 -45,14 +45,14 @@@ xsi:schemaLocation="http://maven.apache compile - javax.mail - javax.mail-api + + com.sun.mail + javax.mail - 1.5.6 + 1.6.1 compile - +
[2/2] ant git commit: Merge 1.9.x branch into master
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/063e112e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/063e112e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/063e112e
Branch: refs/heads/master
Commit: 063e112ed48add153bac14fee811c54fc2234924
Parents: bd58cb2 4281299
Author: Jaikiran Pai
Authored: Mon Aug 13 20:15:35 2018 +0530
Committer: Jaikiran Pai
Committed: Mon Aug 13 20:15:35 2018 +0530
--
fetch.xml| 6 +-
lib/libraries.properties | 2 +-
manual/install.html | 8
3 files changed, 10 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ant/blob/063e112e/fetch.xml
--
http://git-wip-us.apache.org/repos/asf/ant/blob/063e112e/lib/libraries.properties
--
diff --cc lib/libraries.properties
index 5bdaee7,e7a6dc9..26eebb7
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@@ -48,18 -50,16 +48,18 @@@ jakarta-regexp.version=1.
# Later versions of Tomcat provide a jspc task
jasper-compiler.version=4.1.36
jasper-runtime.version=${jasper-compiler.version}
- javax.mail-api.version=1.6.1
-# Later versions are built with Java 7
-javax.mail.version=1.5.6
++javax.mail.version=1.6.1
jdepend.version=2.9.1
-# Later versions are built with Java 7
jruby.version=1.6.8
junit.version=4.12
-# Later versions are built with Java 6
-rhino.version=1.7R5
+rhino.version=1.7.10
+junit-platform-launcher.version=1.2.0
+# Only used for internal tests in Ant project
+junit-vintage-engine.version=5.2.0
+# Only used for internal tests in Ant project
+junit-jupiter-engine.version=5.2.0
jsch.version=0.1.54
-jython.version=2.5.3
+jython.version=2.7.0
# log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2
repo
log4j.version=1.2.14
oro.version=2.0.8
http://git-wip-us.apache.org/repos/asf/ant/blob/063e112e/manual/install.html
--
[2/2] ant git commit: Merge 1.9.x branch into master
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/f690f990 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/f690f990 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/f690f990 Branch: refs/heads/master Commit: f690f9908ee5702928f528d5dca4e016198b83f2 Parents: 7ade15c fc1ad44 Author: Jaikiran Pai Authored: Sat Feb 10 09:55:47 2018 +0530 Committer: Jaikiran Pai Committed: Sat Feb 10 09:55:47 2018 +0530 -- WHATSNEW | 9 + src/tests/antunit/taskdefs/copy-test.xml | 12 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ant/blob/f690f990/WHATSNEW -- diff --cc WHATSNEW index da5b9d4,8c2af62..d2eb5ca --- a/WHATSNEW +++ b/WHATSNEW @@@ -1,6 -1,15 +1,15 @@@ -Changes from Ant 1.9.10 TO Ant 1.9.11 +Changes from Ant 1.10.2 TO Ant 1.10.3 = + Changes that could break older environments: + --- + + * Previous versions of Ant's copy task would throw a BuildException +if the "name" of the resource to copy was null. Starting +this version, the copy task instead silently skips such resources +and no longer throws an exception. +ant-dev list https://www.mail-archive.com/dev@ant.apache.org/msg46634.html + Fixed bugs: --- http://git-wip-us.apache.org/repos/asf/ant/blob/f690f990/src/tests/antunit/taskdefs/copy-test.xml --
