SAK-45950 Update javax.mail 2.0.1 (sakaiproject#9534)

vaibhav-s · Aug 11, 2021 · 93cd2b5 · 93cd2b5
1 parent 6484390
commit 93cd2b5
Show file tree

Hide file tree

Showing 35 changed files with 112 additions and 109 deletions.
diff --git a/common/import-handlers/content-handlers/pom.xml b/common/import-handlers/content-handlers/pom.xml
@@ -28,8 +28,8 @@
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.activation</groupId>
-      <artifactId>javax.activation-api</artifactId>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.common</groupId>

diff --git a/common/import-impl/pom.xml b/common/import-impl/pom.xml
@@ -19,8 +19,8 @@
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.activation</groupId>
-      <artifactId>javax.activation-api</artifactId>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
     </dependency>
     <dependency>
       <groupId>jaxen</groupId>

diff --git a/common/import-util/pom.xml b/common/import-util/pom.xml
@@ -28,8 +28,8 @@
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.activation</groupId>
-      <artifactId>javax.activation-api</artifactId>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.common</groupId>

diff --git a/deploy/pom.xml b/deploy/pom.xml
@@ -658,8 +658,8 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>javax.activation-api</artifactId>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
             <scope>compile</scope>
         </dependency>
         <!-- caching -->

diff --git a/feedback/pom.xml b/feedback/pom.xml
@@ -101,8 +101,8 @@
             <artifactId>commons-text</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>javax.activation-api</artifactId>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>

diff --git a/feedback/src/java/org/sakaiproject/feedback/tool/entityproviders/FeedbackEntityProvider.java b/feedback/src/java/org/sakaiproject/feedback/tool/entityproviders/FeedbackEntityProvider.java
@@ -29,8 +29,8 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
 
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/feedback/src/java/org/sakaiproject/feedback/util/FileItemDataSource.java b/feedback/src/java/org/sakaiproject/feedback/util/FileItemDataSource.java
@@ -18,7 +18,7 @@
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.io.FilenameUtils;
 
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

diff --git a/kernel/api/pom.xml b/kernel/api/pom.xml
@@ -110,5 +110,9 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+          <groupId>jakarta.activation</groupId>
+          <artifactId>jakarta.activation-api</artifactId>
+         </dependency>
     </dependencies>
 </project>
diff --git a/kernel/api/src/main/java/org/sakaiproject/email/api/Attachment.java b/kernel/api/src/main/java/org/sakaiproject/email/api/Attachment.java
@@ -21,8 +21,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Optional;
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataSource;
+import jakarta.activation.FileDataSource;
 
 /**
  * Holds an attachment for an email message. The attachment will be included with the message.
@@ -77,7 +77,7 @@ public Attachment(DataSource dataSource)
 	 *             from.
 	 * @param filename The filename to call the attachment when sent out, doesn't have to match
 	 *                 the file from which the content is loaded.
-	 * @deprecated {@link org.sakaiproject.email.api.Attachment#Attachment(javax.activation.DataSource)}
+	 * @deprecated {@link org.sakaiproject.email.api.Attachment#Attachment(jakarta.activation.DataSource)}
 	 */
 	public Attachment(File file, String filename)
 	{

diff --git a/kernel/api/src/main/java/org/sakaiproject/email/api/EmailService.java b/kernel/api/src/main/java/org/sakaiproject/email/api/EmailService.java
@@ -25,8 +25,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.InternetAddress;
 
 import org.sakaiproject.email.api.EmailAddress.RecipientType;
 import org.sakaiproject.user.api.User;

diff --git a/kernel/api/src/main/java/org/sakaiproject/email/cover/EmailService.java b/kernel/api/src/main/java/org/sakaiproject/email/cover/EmailService.java
@@ -54,9 +54,9 @@ public static org.sakaiproject.email.api.EmailService getInstance()
 
 	private static org.sakaiproject.email.api.EmailService m_instance = null;
 
-	public static void sendMail(javax.mail.internet.InternetAddress param0, javax.mail.internet.InternetAddress[] param1,
-			java.lang.String param2, java.lang.String param3, javax.mail.internet.InternetAddress[] param4,
-			javax.mail.internet.InternetAddress[] param5, java.util.List param6)
+	public static void sendMail(jakarta.mail.internet.InternetAddress param0, jakarta.mail.internet.InternetAddress[] param1,
+			java.lang.String param2, java.lang.String param3, jakarta.mail.internet.InternetAddress[] param4,
+			jakarta.mail.internet.InternetAddress[] param5, java.util.List param6)
 	{
 		org.sakaiproject.email.api.EmailService service = getInstance();
 		if (service == null) return;

diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml
@@ -227,8 +227,8 @@
             <artifactId>jakarta.mail</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>javax.activation-api</artifactId>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -338,7 +338,7 @@
         <dependency>
             <groupId>com.github.davidmoten</groupId>
             <artifactId>subethasmtp</artifactId>
-            <version>5.2.8</version>
+            <version>6.0.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/email/impl/BasicEmailService.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/email/impl/BasicEmailService.java
@@ -27,21 +27,21 @@
 import java.util.*;
 import java.util.Map.Entry;
 
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-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 javax.mail.internet.MimeUtility;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.mail.Address;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+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 jakarta.mail.internet.MimeUtility;
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.Setter;
@@ -568,9 +568,9 @@ private void checkFrom(MimeMessage msg) {
 					msg.setFrom(from);
 				}
 			}
-	    } catch (javax.mail.internet.AddressException e) {
+	    } catch (jakarta.mail.internet.AddressException e) {
 			log.info("checkfrom address exception " + e);
-	    } catch (javax.mail.MessagingException e) {
+	    } catch (jakarta.mail.MessagingException e) {
 			log.info("checkfrom messaging exception " + e);
 	    }
 	}
@@ -1007,7 +1007,7 @@ public List<EmailAddress> send(EmailMessage msg, boolean messagingException) thr
 
 	/**
 	 * Converts a {@link java.util.List} of {@link EmailAddress} to
-	 * {@link javax.mail.internet.InternetAddress}.
+	 * {@link jakarta.mail.internet.InternetAddress}.
 	 *
 	 * @param emails
 	 * @return Array will be the same size as the list with converted addresses. If list is null,

diff --git a/kernel/kernel-impl/src/test/java/org/sakaiproject/email/impl/test/EmailServiceTest.java b/kernel/kernel-impl/src/test/java/org/sakaiproject/email/impl/test/EmailServiceTest.java
@@ -28,7 +28,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.InternetAddress;
 
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/kernel/kernel-util/src/main/java/org/sakaiproject/util/Web.java b/kernel/kernel-util/src/main/java/org/sakaiproject/util/Web.java
@@ -534,7 +534,7 @@ public static String encodeFileName(HttpServletRequest req, String fileName )
 			if ( agent != null && agent.indexOf("MSIE")>=0 )
 				fileName = java.net.URLEncoder.encode(fileName, "UTF8");
 			else if ( agent != null && agent.indexOf("Mozilla")>=0 && agent.indexOf("Safari") == -1 )
-				fileName = javax.mail.internet.MimeUtility.encodeText(fileName, "UTF8", "B");
+				fileName = jakarta.mail.internet.MimeUtility.encodeText(fileName, "UTF8", "B");
 			else
 				fileName = java.net.URLEncoder.encode(fileName, "UTF8");
 		}

diff --git a/...larchive-impl/impl/src/java/org/sakaiproject/mailarchive/impl/BaseMailArchiveService.java b/...larchive-impl/impl/src/java/org/sakaiproject/mailarchive/impl/BaseMailArchiveService.java
@@ -27,7 +27,7 @@
 import java.util.Stack;
 import java.util.Vector;
 
-import javax.mail.internet.MimeUtility;
+import jakarta.mail.internet.MimeUtility;
 
 import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.alias.api.AliasService;

diff --git a/mailarchive/mailarchive-subetha/pom.xml b/mailarchive/mailarchive-subetha/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.github.davidmoten</groupId>
             <artifactId>subethasmtp</artifactId>
-            <version>5.2.8</version>
+            <version>6.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>

diff --git a/...mailarchive-subetha/src/java/org/sakaiproject/mailarchive/SakaiMessageHandlerFactory.java b/...mailarchive-subetha/src/java/org/sakaiproject/mailarchive/SakaiMessageHandlerFactory.java
@@ -1,5 +1,4 @@
 /**
- * Copyright (c) 2014-2017 The Apereo Foundation
  *
  * Licensed under the Educational Community License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,17 +36,17 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import javax.mail.BodyPart;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.Part;
-import javax.mail.Session;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeUtility;
-import javax.mail.internet.ParseException;
+import jakarta.mail.BodyPart;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.Part;
+import jakarta.mail.Session;
+import jakarta.mail.internet.ContentType;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeUtility;
+import jakarta.mail.internet.ParseException;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;

diff --git a/mailsender/impl/src/java/org/sakaiproject/mailsender/logic/impl/ExternalLogicImpl.java b/mailsender/impl/src/java/org/sakaiproject/mailsender/logic/impl/ExternalLogicImpl.java
@@ -28,7 +28,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.mail.MessagingException;
+import jakarta.mail.MessagingException;
 
 import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.authz.api.FunctionManager;

diff --git a/mailsender/impl/src/test/org/sakaiproject/mailsender/logic/impl/ExternalLogicImplTest.java b/mailsender/impl/src/test/org/sakaiproject/mailsender/logic/impl/ExternalLogicImplTest.java
@@ -68,7 +68,7 @@
 import org.sakaiproject.user.api.UserDirectoryService;
 import org.sakaiproject.user.api.UserNotDefinedException;
 
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
 
 /**
  * @author chall

diff --git a/mailsender/tool/pom.xml b/mailsender/tool/pom.xml
@@ -90,5 +90,9 @@
 			<version>${project.version}</version>
 			<type>war</type>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.activation</groupId>
+			<artifactId>jakarta.activation-api</artifactId>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/master/pom.xml b/master/pom.xml
@@ -663,9 +663,9 @@
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>javax.activation-api</artifactId>
-        <version>1.2.0</version>
+        <groupId>jakarta.activation</groupId>
+        <artifactId>jakarta.activation-api</artifactId>
+        <version>2.0.1</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -1018,19 +1018,7 @@
       <dependency>
         <groupId>com.sun.mail</groupId>
         <artifactId>jakarta.mail</artifactId>
-        <version>1.6.7</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>javax.mail</groupId>
-        <artifactId>mail</artifactId>
-        <version>1.5.0-b01</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.mail</groupId>
-        <artifactId>javax.mail</artifactId>
-        <version>1.6.2</version>
+        <version>2.0.1</version>
         <scope>provided</scope>
       </dependency>
       <!-- KERNEL -->

diff --git a/...ageforums-api/src/java/org/sakaiproject/api/app/messageforums/SynopticMsgcntrManager.java b/...ageforums-api/src/java/org/sakaiproject/api/app/messageforums/SynopticMsgcntrManager.java
@@ -18,8 +18,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
 import org.sakaiproject.api.app.messageforums.ui.PrivateMessageManager;
 import org.sakaiproject.entity.api.Reference;
 

diff --git a/...eforums-api/src/java/org/sakaiproject/api/app/messageforums/ui/PrivateMessageManager.java b/...eforums-api/src/java/org/sakaiproject/api/app/messageforums/ui/PrivateMessageManager.java
@@ -24,8 +24,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
 import org.sakaiproject.entity.api.Reference;
 import org.sakaiproject.api.app.messageforums.Area;
 import org.sakaiproject.api.app.messageforums.Attachment;

diff --git a/msgcntr/messageforums-app/pom.xml b/msgcntr/messageforums-app/pom.xml
@@ -123,6 +123,10 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
         </dependency>
+        <dependency>
+          <groupId>jakarta.activation</groupId>
+          <artifactId>jakarta.activation-api</artifactId>
+         </dependency>
 	</dependencies>
 	<build>
 		<resources>

diff --git a/...mpl/src/java/org/sakaiproject/component/app/messageforums/SynopticMsgcntrManagerImpl.java b/...mpl/src/java/org/sakaiproject/component/app/messageforums/SynopticMsgcntrManagerImpl.java
@@ -27,8 +27,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
 
 import java.util.Set;
 

diff --git a/...l/src/java/org/sakaiproject/component/app/messageforums/ui/PrivateMessageManagerImpl.java b/...l/src/java/org/sakaiproject/component/app/messageforums/ui/PrivateMessageManagerImpl.java
@@ -35,9 +35,9 @@
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
 
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;