From 42812995d072792497dba1faeb60a3f2ad61f364 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jaikiran@apache.org>
Date: Mon, 13 Aug 2018 20:05:11 +0530
Subject: [PATCH] Fetch the right jars and dependencies for the mail task

---
 fetch.xml                | 7 +++++--
 lib/libraries.properties | 2 +-
 manual/install.html      | 5 ++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/fetch.xml b/fetch.xml
index 51b438b2a..679aceb4a 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"
diff --git a/lib/libraries.properties b/lib/libraries.properties
index 19c6e1dbf..e7a6dc9d3 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
diff --git a/manual/install.html b/manual/install.html
index 84121e369..9327da23f 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>