You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2018/08/13 14:46:27 UTC
[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 <ja...@apache.org>
Authored: Mon Aug 13 20:15:35 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
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
----------------------------------------------------------------------