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:26 UTC
[1/2] ant git commit: Fetch the right jars and dependencies for the
mail task
Repository: ant
Updated Branches:
refs/heads/master bd58cb294 -> 063e112ed
Fetch the right jars and dependencies for the mail task
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/42812995
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/42812995
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/42812995
Branch: refs/heads/master
Commit: 42812995d072792497dba1faeb60a3f2ad61f364
Parents: 6a52411
Author: Jaikiran Pai <ja...@apache.org>
Authored: Mon Aug 13 20:05:11 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Mon Aug 13 20:05:11 2018 +0530
----------------------------------------------------------------------
fetch.xml | 7 +++++--
lib/libraries.properties | 2 +-
manual/install.html | 5 ++---
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/42812995/fetch.xml
----------------------------------------------------------------------
diff --git a/fetch.xml b/fetch.xml
index 51b438b..679aceb 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -315,8 +315,11 @@ Set -Ddest=LOCATION on the command line
<target name="javamail"
description="load Java Mail"
depends="init">
- <f2 project="javax.mail" archive="javax.mail-api"/>
- <f2 project="javax.activation" archive="activation"/>
+ <!-- We only need this one dependency as per
+ the project doc https://javaee.github.io/javamail/#Download_JavaMail_Release
+ This alone should bring in all necessary dependencies (including the API
+ jars and the activation jars -->
+ <f2 project="com.sun.mail" archive="javax.mail"/>
</target>
<target name="jspc"
http://git-wip-us.apache.org/repos/asf/ant/blob/42812995/lib/libraries.properties
----------------------------------------------------------------------
diff --git a/lib/libraries.properties b/lib/libraries.properties
index 19c6e1d..e7a6dc9 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -51,7 +51,7 @@ jakarta-regexp.version=1.4
jasper-compiler.version=4.1.36
jasper-runtime.version=${jasper-compiler.version}
# Later versions are built with Java 7
-javax.mail-api.version=1.5.6
+javax.mail.version=1.5.6
jdepend.version=2.9.1
# Later versions are built with Java 7
jruby.version=1.6.8
http://git-wip-us.apache.org/repos/asf/ant/blob/42812995/manual/install.html
----------------------------------------------------------------------
diff --git a/manual/install.html b/manual/install.html
index 84121e3..9327da2 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -920,9 +920,8 @@ these tasks available. Please refer to the <a href="#optionalTasks"> Installing
<td><a href="https://commons.apache.org/bcel/" target="_top">https://commons.apache.org/bcel/</a></td>
</tr>
<tr>
- <td>javax.mail-api.jar</td>
- <td><a href="Tasks/mail.html">mail</a> task with MIME encoding,
- and <i>deprecated</i> <a href="Tasks/mimemail.html">mimemail</a> task</td>
+ <td>javax.mail.jar</td>
+ <td><a href="Tasks/mail.html">mail</a> task and <i>deprecated</i> <a href="Tasks/mimemail.html">mimemail</a> task</td>
<td><a href="https://javaee.github.io/javamail/"
target="_top">https://javaee.github.io/javamail/</a></td>
</tr>
[2/2] ant git commit: Merge 1.9.x branch into master
Posted by ja...@apache.org.
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
----------------------------------------------------------------------