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/04 04:28:55 UTC
[1/2] ant git commit: actually javax.activation is still there in
Java 10
Repository: ant
Updated Branches:
refs/heads/master bf85baf8e -> fbb53e0eb
actually javax.activation is still there in Java 10
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/b2da2751
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b2da2751
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b2da2751
Branch: refs/heads/master
Commit: b2da27513c7806357bf146bde44b3cc469757122
Parents: b7461ce
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Jul 4 06:27:37 2018 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Jul 4 06:27:37 2018 +0200
----------------------------------------------------------------------
manual/Tasks/mimemail.html | 7 ++++---
manual/install.html | 5 ++++-
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/b2da2751/manual/Tasks/mimemail.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/mimemail.html b/manual/Tasks/mimemail.html
index c86d614..5188273 100644
--- a/manual/Tasks/mimemail.html
+++ b/manual/Tasks/mimemail.html
@@ -34,9 +34,10 @@
<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>
+Activation Framework is part of the standard class library for Java 6
+to Java 10 but the <code>java.activation</code> module has been
+deprecated in Java 9 and must be enabled explicitly when running on
+Java 10. Alternatively it can be provided as an external library.</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/b2da2751/manual/install.html
----------------------------------------------------------------------
diff --git a/manual/install.html b/manual/install.html
index 2d232f0..84121e3 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -928,7 +928,10 @@ these tasks available. Please refer to the <a href="#optionalTasks"> Installing
</tr>
<tr>
<td>activation.jar<br/>
- (included in Java 6 to Java9 no longer included in Java10 and later)</td>
+ (included in Java 6 to Java 10 but
+ the <code>java.activation</code> module is deprecated and marked
+ for removal in Java 9 and needs to be enabled explicitly on Java
+ 10)</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://github.com/javaee/activation"
[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/fbb53e0e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/fbb53e0e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/fbb53e0e
Branch: refs/heads/master
Commit: fbb53e0ebe28d6579a4726b7fc06e3306a90c545
Parents: bf85baf b2da275
Author: Stefan Bodewig <bo...@apache.org>
Authored: Wed Jul 4 06:28:20 2018 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Wed Jul 4 06:28:20 2018 +0200
----------------------------------------------------------------------
manual/Tasks/mimemail.html | 7 ++++---
manual/install.html | 5 ++++-
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/fbb53e0e/manual/Tasks/mimemail.html
----------------------------------------------------------------------
diff --cc manual/Tasks/mimemail.html
index a92c213,5188273..f2e72f5
--- a/manual/Tasks/mimemail.html
+++ b/manual/Tasks/mimemail.html
@@@ -24,74 -24,81 +24,75 @@@
<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://javaee.github.io/javamail/"
+target="_top">JavaMail</a>
+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>
+ Activation Framework is part of the standard class library for Java 6
+ to Java 10 but the <code>java.activation</code> module has been
+ deprecated in Java 9 and must be enabled explicitly when running on
+ Java 10. Alternatively it can be provided as an external library.</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/fbb53e0e/manual/install.html
----------------------------------------------------------------------
diff --cc manual/install.html
index ad5f801,84121e3..9bc54f1
--- a/manual/install.html
+++ b/manual/install.html
@@@ -898,11 -928,14 +898,14 @@@ these tasks available. Please refer to
</tr>
<tr>
<td>activation.jar<br/>
- (included in Java 6 to Java9 no longer included in Java10 and later)</td>
+ (included in Java 6 to Java 10 but
+ the <code>java.activation</code> module is deprecated and marked
+ for removal in Java 9 and needs to be enabled explicitly on Java
+ 10)</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://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>