@@ -34,6 +34,9 @@ Other changes: | |||||
* prefer https over http when building ant itself, and in the ant | * prefer https over http when building ant itself, and in the ant | ||||
documentation and sources | documentation and sources | ||||
* changed the references and Maven coordinates of JavaMail dependency | |||||
to Jakarta Mail and thus javax.mail to jakarta.mail - and upgraded | |||||
the dependency to 1.6.3. | |||||
Changes from Ant 1.10.5 TO Ant 1.10.6 | Changes from Ant 1.10.5 TO Ant 1.10.6 | ||||
===================================== | ===================================== | ||||
@@ -329,14 +329,14 @@ Set -Ddest=LOCATION on the command line | |||||
<f2 project="which"/> | <f2 project="which"/> | ||||
</target> | </target> | ||||
<target name="javamail" | |||||
description="load Java Mail" | |||||
<target name="jakartamail" | |||||
description="load Jakarta Mail" | |||||
depends="init"> | depends="init"> | ||||
<!-- We only need this one dependency as per | <!-- We only need this one dependency as per | ||||
the project doc https://javaee.github.io/javamail/#Download_JavaMail_Release | |||||
the project doc https://eclipse-ee4j.github.io/mail/ | |||||
This alone should bring in all necessary dependencies (including the API | This alone should bring in all necessary dependencies (including the API | ||||
jars and the activation jars --> | jars and the activation jars --> | ||||
<f2 project="com.sun.mail" archive="javax.mail"/> | |||||
<f2 project="com.sun.mail" archive="jakarta.mail"/> | |||||
</target> | </target> | ||||
<target name="jspc" | <target name="jspc" | ||||
@@ -397,5 +397,5 @@ Set -Ddest=LOCATION on the command line | |||||
<target name="all" | <target name="all" | ||||
description="load all the libraries (except jython)" | description="load all the libraries (except jython)" | ||||
depends="antunit,ivy,logging,junit,junitlauncher,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script, | depends="antunit,ivy,logging,junit,junitlauncher,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script, | ||||
javamail,jspc,jai,xz,netrexx,junit-engine-vintage,junit-engine-jupiter"/> | |||||
jakartamail,jspc,jai,xz,netrexx,junit-engine-vintage,junit-engine-jupiter"/> | |||||
</project> | </project> |
@@ -50,7 +50,7 @@ jakarta-regexp.version=1.4 | |||||
# Later versions of Tomcat provide a jspc task | # Later versions of Tomcat provide a jspc task | ||||
jasper-compiler.version=4.1.36 | jasper-compiler.version=4.1.36 | ||||
jasper-runtime.version=${jasper-compiler.version} | jasper-runtime.version=${jasper-compiler.version} | ||||
javax.mail.version=1.6.2 | |||||
jakarta.mail.version=1.6.3 | |||||
jdepend.version=2.9.1 | jdepend.version=2.9.1 | ||||
jruby.version=1.6.8 | jruby.version=1.6.8 | ||||
junit.version=4.12 | junit.version=4.12 | ||||
@@ -31,14 +31,17 @@ | |||||
<h3>Description</h3> | <h3>Description</h3> | ||||
<p>Sends SMTP mail with MIME | <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 | |||||
attachments. <a href="https://eclipse-ee4j.github.io/mail/" | |||||
target="_top">Jakarta Mail</a> | |||||
and <a href="https://eclipse-ee4j.github.io/jaf/" target="_top">Jakarta | |||||
Activation</a> are required for this task. The Java | |||||
Activation Framework is part of the standard class library for Java 6 | Activation Framework is part of the standard class library for Java 6 | ||||
to Java 10 but the <code>java.activation</code> module has been | to Java 10 but the <code>java.activation</code> module has been | ||||
deprecated in Java 9 and must be enabled explicitly when running on | deprecated in Java 9 and must be enabled explicitly when running on | ||||
Java 10. Alternatively it can be provided as an external library.</p> | |||||
Java 10. Alternatively it can be provided as an external | |||||
library. Javamail has bcome Jakarta Mail and the Java activation | |||||
Framework has become Jakarta Activation and both are part of the | |||||
Jakarta effort at Eclipse.</p> | |||||
<p>Multiple files can be attached using <a href="../Types/fileset.html">FileSets.</a></p> | <p>Multiple files can be attached using <a href="../Types/fileset.html">FileSets.</a></p> | ||||
<h3>Parameters</h3> | <h3>Parameters</h3> | ||||
<table class="attr"> | <table class="attr"> | ||||
@@ -891,11 +891,11 @@ 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> | <td><a href="https://commons.apache.org/bcel/" target="_top">https://commons.apache.org/bcel/</a></td> | ||||
</tr> | </tr> | ||||
<tr> | <tr> | ||||
<td>javax.mail.jar</td> | |||||
<td>jakarta.mail.jar</td> | |||||
<td><a href="Tasks/mail.html">mail</a> task | <td><a href="Tasks/mail.html">mail</a> task | ||||
and <em><u>deprecated</u></em> <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://javaee.github.io/javamail/" | |||||
target="_top">https://javaee.github.io/javamail/</a></td> | |||||
<td><a href="https://eclipse-ee4j.github.io/mail/" | |||||
target="_top">https://eclipse-ee4j.github.io/mail/</a></td> | |||||
</tr> | </tr> | ||||
<tr> | <tr> | ||||
<td>activation.jar<br/> | <td>activation.jar<br/> | ||||
@@ -46,10 +46,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m | |||||
</dependency> | </dependency> | ||||
<dependency> | <dependency> | ||||
<!-- This brings in the necessary dependencies. | <!-- This brings in the necessary dependencies. | ||||
See https://javaee.github.io/javamail/#Download_JavaMail_Release --> | |||||
See https://eclipse-ee4j.github.io/mail/ --> | |||||
<groupId>com.sun.mail</groupId> | <groupId>com.sun.mail</groupId> | ||||
<artifactId>javax.mail</artifactId> | |||||
<version>1.6.1</version> | |||||
<artifactId>jakarta.mail</artifactId> | |||||
<version>1.6.3</version> | |||||
<scope>compile</scope> | <scope>compile</scope> | ||||
</dependency> | </dependency> | ||||
</dependencies> | </dependencies> | ||||