Merge 1.9.x branch into master

fetch.xml

@@ -333,7 +333,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"/>
+    <!-- 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"

lib/libraries.properties

@@ -48,7 +48,7 @@ jakarta-regexp.version=1.4
 # 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
+javax.mail.version=1.6.1
 jdepend.version=2.9.1
 jruby.version=1.6.8
 junit.version=4.12

manual/install.html

@@ -891,10 +891,10 @@ these tasks available. Please refer to the <a href="#optionalTasks">Installing A
     <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 <em><u>deprecated</u></em> <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>
+    <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>
   <tr>
     <td>activation.jar<br/>