Merge pull request #168 from basil/javamail-migrate

Migrate to Jakarta Mail
jenkinsci · Jul 19, 2022 · 82219ae · 82219ae
2 parents 8d89be9 + 47442fb
commit 82219ae
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -86,6 +86,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>mailer</artifactId>
+            <version>435.v79ef3972b_5c7</version> <!-- TODO until in BOM -->
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -159,20 +160,21 @@
             <scope>test</scope>
         </dependency>
         <!--
-            This must come before javax-mail-api in the class path in order to avoid eclipse-ee4j/mail#350.
+            This must come before jakarta-mail-api in the class path in order to avoid eclipse-ee4j/mail#350.
         -->
         <dependency>
             <groupId>org.jvnet.mock-javamail</groupId>
             <artifactId>mock-javamail</artifactId>
-            <version>1.12</version>
+            <version>2.0</version>
             <scope>test</scope>
         </dependency>
         <!--
             This must come after mock-javamail in the class path in order to avoid eclipse-ee4j/mail#350.
         -->
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
-            <artifactId>javax-mail-api</artifactId>
+            <artifactId>jakarta-mail-api</artifactId>
+            <version>2.0.0-5</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.main</groupId>

diff --git a/src/main/java/org/jenkinsci/plugins/workflow/steps/MailStep.java b/src/main/java/org/jenkinsci/plugins/workflow/steps/MailStep.java
@@ -37,10 +37,10 @@
 import org.kohsuke.stapler.DataBoundSetter;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.Transport;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.Address;
+import jakarta.mail.Message;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.MimeMessage;
 
 /**
  * Simple email sender step.

diff --git a/src/test/java/org/jenkinsci/plugins/workflow/steps/CoreStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/steps/CoreStepTest.java
@@ -38,7 +38,7 @@
 import java.io.IOException;
 import java.util.List;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javax.mail.internet.InternetAddress;
+import jakarta.mail.internet.InternetAddress;
 import jenkins.plugins.mailer.tasks.i18n.Messages;
 import jenkins.tasks.SimpleBuildStep;
 import org.hamcrest.Matchers;

diff --git a/src/test/java/org/jenkinsci/plugins/workflow/steps/MailStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/steps/MailStepTest.java
@@ -25,8 +25,8 @@
 
 import hudson.model.Result;
 import java.util.List;
-import javax.mail.Message;
-import javax.mail.internet.MimeMultipart;
+import jakarta.mail.Message;
+import jakarta.mail.internet.MimeMultipart;
 import org.hamcrest.Matchers;
 import org.jenkinsci.plugins.workflow.actions.ArgumentsAction;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;