diff options
| -rw-r--r-- | WHATSNEW | 3 | ||||
| -rw-r--r-- | fetch.xml | 10 | ||||
| -rw-r--r-- | lib/libraries.properties | 2 | ||||
| -rw-r--r-- | manual/Tasks/mimemail.html | 13 | ||||
| -rw-r--r-- | manual/install.html | 6 | ||||
| -rw-r--r-- | src/etc/poms/ant-javamail/pom.xml | 6 |
6 files changed, 23 insertions, 17 deletions
@@ -34,6 +34,9 @@ Other changes: * prefer https over http when building ant itself, and in the ant 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 ===================================== @@ -329,14 +329,14 @@ Set -Ddest=LOCATION on the command line <f2 project="which"/> </target> - <target name="javamail" - description="load Java Mail" + <target name="jakartamail" + description="load Jakarta Mail" depends="init"> <!-- 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 jars and the activation jars --> - <f2 project="com.sun.mail" archive="javax.mail"/> + <f2 project="com.sun.mail" archive="jakarta.mail"/> </target> <target name="jspc" @@ -397,5 +397,5 @@ Set -Ddest=LOCATION on the command line <target name="all" description="load all the libraries (except jython)" 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> diff --git a/lib/libraries.properties b/lib/libraries.properties index adf5e8ce8..4cad5ec05 100644 --- a/lib/libraries.properties +++ b/lib/libraries.properties @@ -50,7 +50,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.version=1.6.2 +jakarta.mail.version=1.6.3 jdepend.version=2.9.1 jruby.version=1.6.8 junit.version=4.12 diff --git a/manual/Tasks/mimemail.html b/manual/Tasks/mimemail.html index 308a22d8e..579cc84d5 100644 --- a/manual/Tasks/mimemail.html +++ b/manual/Tasks/mimemail.html @@ -31,14 +31,17 @@ <h3>Description</h3> <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 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> +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> <h3>Parameters</h3> <table class="attr"> diff --git a/manual/install.html b/manual/install.html index 5f91b0f39..4938e632b 100644 --- a/manual/install.html +++ b/manual/install.html @@ -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> </tr> <tr> - <td>javax.mail.jar</td> + <td>jakarta.mail.jar</td> <td><a href="Tasks/mail.html">mail</a> task 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> <td>activation.jar<br/> diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml index f8055c18e..798c8fd99 100644 --- a/src/etc/poms/ant-javamail/pom.xml +++ b/src/etc/poms/ant-javamail/pom.xml @@ -46,10 +46,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/m </dependency> <dependency> <!-- 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> - <artifactId>javax.mail</artifactId> - <version>1.6.1</version> + <artifactId>jakarta.mail</artifactId> + <version>1.6.3</version> <scope>compile</scope> </dependency> </dependencies> |