You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2018/07/03 16:32:14 UTC
[1/2] ant git commit: update links and "included in Java" info for JAF
Repository: ant
Updated Branches:
refs/heads/master 142c2e796 -> bf85baf8e
update links and "included in Java" info for JAF
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/b7461ce2
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b7461ce2
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b7461ce2
Branch: refs/heads/master
Commit: b7461ce2e43bda44a1ba5355f78288c85da773bc
Parents: 5addfa6
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Jul 3 18:28:55 2018 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Jul 3 18:28:55 2018 +0200
----------------------------------------------------------------------
manual/Tasks/mimemail.html | 9 ++++++---
manual/install.html | 6 +++---
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/b7461ce2/manual/Tasks/mimemail.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/mimemail.html b/manual/Tasks/mimemail.html
index ba066a6..c86d614 100644
--- a/manual/Tasks/mimemail.html
+++ b/manual/Tasks/mimemail.html
@@ -31,9 +31,12 @@
<h3>Description</h3>
<p>Sends SMTP mail with MIME attachments.
-<a href="http://www.oracle.com/technetwork/java/index-138643.html">JavaMail</a>
-and <a href="http://www.oracle.com/technetwork/java/javase/jaf-135115.html">Java
-Activation Framework</a> are required for this task.</p>
+<a href="https://javaee.github.io/javamail/">JavaMail</a>
+and <a href="https://github.com/javaee/activation">Java
+Activation Framework</a> are required for this task. The Java
+Activation Framework is part of the standard class library for Java6
+to Java9 but must be provided as an external library for Java10 and
+later again.</p>
<p>Multiple files can be attached using <a href="../Types/fileset.html">FileSets.</a></p>
<h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0">
http://git-wip-us.apache.org/repos/asf/ant/blob/b7461ce2/manual/install.html
----------------------------------------------------------------------
diff --git a/manual/install.html b/manual/install.html
index ccaeb3e..2d232f0 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -928,11 +928,11 @@ these tasks available. Please refer to the <a href="#optionalTasks"> Installing
</tr>
<tr>
<td>activation.jar<br/>
- (included in Java 6 and later runtime)</td>
+ (included in Java 6 to Java9 no longer included in Java10 and later)</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><a href="http://www.oracle.com/technetwork/java/javase/jaf-135115.html"
- target="_top">http://www.oracle.com/technetwork/java/javase/jaf-135115.html</a></td>
+ <td><a href="https://github.com/javaee/activation"
+ target="_top">https://github.com/javaee/activation</a></td>
</tr>
<tr>
<td>jdepend.jar</td>
[2/2] ant git commit: Merge branch '1.9.x'
Posted by bo...@apache.org.
Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/bf85baf8
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/bf85baf8
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/bf85baf8
Branch: refs/heads/master
Commit: bf85baf8eb7011582c38ef4cb4f6b7c0cf79dd3b
Parents: 142c2e7 b7461ce
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Jul 3 18:31:57 2018 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Jul 3 18:31:57 2018 +0200
----------------------------------------------------------------------
manual/Tasks/mimemail.html | 9 ++++++---
manual/install.html | 5 +++--
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/bf85baf8/manual/Tasks/mimemail.html
----------------------------------------------------------------------
diff --cc manual/Tasks/mimemail.html
index 99af872,c86d614..a92c213
--- a/manual/Tasks/mimemail.html
+++ b/manual/Tasks/mimemail.html
@@@ -24,71 -24,80 +24,74 @@@
<body>
-<h2><a name="mimemail">MimeMail</a></h2>
+<h2 id="mimemail">MimeMail</h2>
-<h3><i>Deprecated</i></h3>
-<p><i>This task has been deprecated. Use the <a href="../Tasks/mail.html">mail</a> task instead.</i></p>
+<h3><em><u>Deprecated</u></em></h3>
+<p><em>This task has been <u>deprecated</u>. Use the <a href="../Tasks/mail.html">mail</a> task instead.</em></p>
<h3>Description</h3>
-<p>Sends SMTP mail with MIME attachments.
-<a href="https://javaee.github.io/javamail/">JavaMail</a>
-and <a href="https://github.com/javaee/activation">Java
+<p>Sends SMTP mail with MIME
- attachments. <a href="https://www.oracle.com/technetwork/java/index-138643.html"
++attachments. <a href="https://javaee.github.io/javamail/"
+target="_top">JavaMail</a>
- and <a href="https://www.oracle.com/technetwork/java/javase/jaf-135115.html" target="_top">Java
- Activation Framework</a> are required for this task.</p>
++and <a href="https://github.com/javaee/activation" target="_top">Java
+ Activation Framework</a> are required for this task. The Java
+ Activation Framework is part of the standard class library for Java6
+ to Java9 but must be provided as an external library for Java10 and
+ later again.</p>
<p>Multiple files can be attached using <a href="../Types/fileset.html">FileSets.</a></p>
<h3>Parameters</h3>
-<table border="1" cellpadding="2" cellspacing="0">
+<table class="attr">
<tr>
- <td valign="top"><b>Attribute</b></td>
- <td valign="top"><b>Description</b></td>
- <td align="center" valign="top"><b>Required</b></td>
+ <th scope="col">Attribute</th>
+ <th scope="col">Description</th>
+ <th scope="col">Required</th>
</tr>
<tr>
- <td valign="top">message</td>
- <td valign="top">The message body</td>
- <td valign="top" align="center" rowspan="2">No, but only one of of 'message' or
- 'messageFile' may be specified. If not specified, a fileset must be
- provided.</td>
+ <td>message</td>
+ <td>The message body</td>
+ <td rowspan="2">Exactly one of these, or a nested fileset</td>
</tr>
<tr>
- <td valign="top">messageFile</td>
- <td valign="top">A filename to read and used as the message body</td>
+ <td>messageFile</td>
+ <td class="left">A filename to read and used as the message body</td>
</tr>
<tr>
- <td valign="top">messageMimeType</td>
- <td valign="top">MIME type to use for 'message' or 'messageFile' when
- attached.</td>
- <td align="center" valign="top">No, defaults to "text/plain"</td>
+ <td>messageMimeType</td>
+ <td>MIME type to use for <var>message</var> or <var>messageFile</var> when attached.</td>
+ <td>No; defaults to <q>text/plain</q></td>
</tr>
<tr>
- <td valign="top">tolist</td>
- <td valign="top">Comma-separated list of To: recipients</td>
- <td valign="top" align="center" rowspan="3">Yes, at least one of 'tolist', 'cclist',
- or 'bcclist' must be specified.</td>
+ <td>tolist</td>
+ <td>Comma-separated list of <code>To:</code> recipients</td>
+ <td rowspan="3">Yes, at least one of these</td>
</tr>
<tr>
- <td valign="top">cclist</td>
- <td valign="top">Comma-separated list of CC: recipients</td>
- <td valign="top" align="center"> </td>
+ <td>cclist</td>
+ <td class="left">Comma-separated list of <code>CC:</code> recipients</td>
</tr>
<tr>
- <td valign="top">bcclist</td>
- <td valign="top">Comma-separated list of BCC: recipients</td>
- <td valign="top" align="center"> </td>
+ <td>bcclist</td>
+ <td class="left">Comma-separated list of <code>BCC:</code> recipients</td>
</tr>
<tr>
- <td valign="top">mailhost</td>
- <td valign="top">Host name of the mail server.</td>
- <td valign="top" align="center">No, default to "localhost"</td>
+ <td>mailhost</td>
+ <td>Host name of the mail server.</td>
+ <td>No; default to <q>localhost</q></td>
</tr>
<tr>
- <td valign="top">subject</td>
- <td valign="top">Email subject line.</td>
- <td valign="top" align="center">No</td>
+ <td>subject</td>
+ <td>Email subject line.</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">from</td>
- <td valign="top">Email address of sender.</td>
- <td valign="top" align="center">Yes</td>
+ <td>from</td>
+ <td>Email address of sender.</td>
+ <td>Yes</td>
</tr>
<tr>
- <td valign="top">failonerror</td>
- <td valign="top">Stop the build process if an error occurs sending the
- e-mail.</td>
- <td valign="top" align="center">No, default to "true"</td>
+ <td>failonerror</td>
+ <td>Stop the build process if an error occurs sending the e-mail.</td>
+ <td>No; default to <q>true</q></td>
</tr>
</table>
<h3>Examples</h3>
http://git-wip-us.apache.org/repos/asf/ant/blob/bf85baf8/manual/install.html
----------------------------------------------------------------------
diff --cc manual/install.html
index edf7375,2d232f0..ad5f801
--- a/manual/install.html
+++ b/manual/install.html
@@@ -893,15 -922,17 +893,16 @@@ these tasks available. Please refer to
<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><a href="https://javaee.github.io/javamail/"
- target="_top">https://javaee.github.io/javamail/</a></td>
+ 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>
</tr>
<tr>
- <td>activation.jar<br/>(included in Java 6 and later runtime)</td>
+ <td>activation.jar<br/>
+ (included in Java 6 to Java9 no longer included in Java10 and later)</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>
+ and <em><u>deprecated</u></em> <a href="Tasks/mimemail.html">mimemail</a> task</td>
- <td><a href="https://www.oracle.com/technetwork/java/javase/jaf-135115.html"
+ <td><a href="https://github.com/javaee/activation"
- target="_top">https://github.com/javaee/activation</a></td>
+ target="_top">https://www.oracle.com/technetwork/java/javase/jaf-135115.html</a></td>
</tr>
<tr>
<td>jdepend.jar</td>