From 1ee6231f3ccbafdb1245484e74f011842f7bb79d Mon Sep 17 00:00:00 2001
From: twogee <g.grigelionis@gmail.com>
Date: Thu, 4 Mar 2021 14:50:08 +0100
Subject: [PATCH] Breaking change: use Jakarta namespace

---
 build.xml                                     |  2 +-
 lib/libraries.properties                      |  2 +-
 .../tools/ant/taskdefs/email/EmailTask.java   |  4 +-
 .../tools/ant/taskdefs/email/MimeMailer.java  | 37 ++++++++++---------
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/build.xml b/build.xml
index 2e93125b3c..95a672b830 100644
--- a/build.xml
+++ b/build.xml
@@ -505,7 +505,7 @@
                classname="org.apache.bcel.Constants"
                classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="javamail.present"
-               classname="javax.mail.Transport"
+               classname="jakarta.mail.Transport"
                classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
     <available property="graaljs.present"
                classname="com.oracle.truffle.js.scriptengine.GraalJSScriptEngine"
diff --git a/lib/libraries.properties b/lib/libraries.properties
index 6da81323fd..77e5c41fa0 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -48,7 +48,7 @@ hamcrest-core.version=1.3
 hamcrest-library.version=${hamcrest-core.version}
 jai-core.version=1.1.3
 jai-codec.version=1.1.3
-jakarta.mail.version=1.6.4
+jakarta.mail.version=2.0.0
 jakarta-regexp.version=1.4
 # Later versions of Tomcat provide a jspc task
 jasper-compiler.version=4.1.36
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
index 54f811743c..9972a288b9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
@@ -454,8 +454,8 @@ public void execute() {
                 try {
                     //check to make sure that activation.jar
                     //and mail.jar are available - see bug 31969
-                    Class.forName("javax.activation.DataHandler");
-                    Class.forName("javax.mail.internet.MimeMessage");
+                    Class.forName("jakarta.activation.DataHandler");
+                    Class.forName("jakarta.mail.internet.MimeMessage");
 
                     mailer = ClasspathUtils.newInstance(
                             "org.apache.tools.ant.taskdefs.email.MimeMailer",
diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
index 319c1dc7ca..7df898ad94 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
@@ -34,21 +34,22 @@
 import java.util.StringTokenizer;
 import java.util.Vector;
 
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-import javax.mail.Address;
-import javax.mail.Authenticator;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.PasswordAuthentication;
-import javax.mail.SendFailedException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.activation.FileDataSource;
+import jakarta.mail.Address;
+import jakarta.mail.Authenticator;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.PasswordAuthentication;
+import jakarta.mail.SendFailedException;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -70,12 +71,12 @@ public class MimeMailer extends Mailer {
         = System.getProperty("file.encoding");
 
     // To work properly with national charsets we have to use
-    // implementation of interface javax.activation.DataSource
+    // implementation of interface jakarta.activation.DataSource
     /**
      * String data source implementation.
      * @since Ant 1.6
      */
-    class StringDataSource implements javax.activation.DataSource {
+    class StringDataSource implements DataSource {
         private String data = null;
         private String type = null;
         private String charset = null;
@@ -211,7 +212,7 @@ public void send() {
                     message.setCharset(charset);
                 }
             }
-            // Using javax.activation.DataSource paradigm
+            // Using jakarta.activation.DataSource paradigm
             final StringDataSource sds = new StringDataSource();
             sds.setContentType(message.getMimeType());
             sds.setCharset(charset);