From 201ba9214874b7822484432e0a5e1e32445b36e6 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Fri, 21 Jan 2022 10:39:34 -0800
Subject: [PATCH 1/3] Use detached plugin

---
 pom.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 919040c6..7bc443ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
     <properties>
         <revision>2.25</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins.version>2.263.1</jenkins.version>
+        <jenkins.version>2.331</jenkins.version>
         <java.level>8</java.level>
         <useBeta>true</useBeta>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
@@ -73,8 +73,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.263.x</artifactId>
-                <version>984.vb5eaac999a7e</version>
+                <artifactId>bom-weekly</artifactId>
+                <version>1117.v62a_f6a_01de98</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -143,6 +143,12 @@
             <artifactId>javadoc</artifactId>
             <version>1.6</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jenkins-ci</groupId>
+                    <artifactId>symbol-annotation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>

From d2ef6c4f16d6d7b430e9edb162b93de1f6ad6b46 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Fri, 21 Jan 2022 10:45:01 -0800
Subject: [PATCH 2/3] Migrate to Jakarta Mail

---
 pom.xml                                                  | 9 +++++----
 .../org/jenkinsci/plugins/workflow/steps/MailStep.java   | 8 ++++----
 .../jenkinsci/plugins/workflow/steps/CoreStepTest.java   | 2 +-
 .../jenkinsci/plugins/workflow/steps/MailStepTest.java   | 4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7bc443ce..bc196030 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>mailer</artifactId>
+            <version>410.va_7940d9ded39</version> <!-- TODO https://github.com/jenkinsci/mailer-plugin/pull/144 -->
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -161,12 +162,12 @@
             <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>
         <!--
@@ -174,8 +175,8 @@
         -->
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
-            <artifactId>javax-mail-api</artifactId>
-            <version>1.6.2-5</version>
+            <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
index 6568f399..277fa59e 100644
--- 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
index 8a0fa401..6b535022 100644
--- 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
index 64dd4ed3..aaf170ac 100644
--- 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;

From 47442fb3459786d05e81884b67b702c392ebae90 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Tue, 19 Jul 2022 12:45:09 -0400
Subject: [PATCH 3/3] https://github.com/jenkinsci/mailer-plugin/pull/144
 released

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fd943262..cea85034 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>mailer</artifactId>
-            <version>410.va_7940d9ded39</version> <!-- TODO https://github.com/jenkinsci/mailer-plugin/pull/144 -->
+            <version>435.v79ef3972b_5c7</version> <!-- TODO until in BOM -->
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>