From 72edb8559177432001e9c4ca884a152f9e2304c9 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sun, 9 Jan 2022 07:37:17 -0800
Subject: [PATCH 1/5] Use detached plugin

---
 pom.xml                                    | 12 ++++--------
 src/test/java/hudson/tasks/MailerTest.java |  7 ++++++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 966855a4..2bd252e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <java.level>8</java.level>
-    <jenkins.version>2.289.1</jenkins.version>
+    <jenkins.version>2.329-rc31978.fa_f50a_a_d3e46</jenkins.version> <!-- TODO https://github.com/jenkinsci/jenkins/pull/6165 -->
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
   </properties>
 
@@ -31,8 +31,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.289.x</artifactId>
-        <version>1075.v14bef33e5d7b</version>
+        <artifactId>bom-weekly</artifactId>
+        <version>1090.v0a_33df40457a_</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -53,10 +53,6 @@
           <groupId>org.hamcrest</groupId>
           <artifactId>hamcrest-core</artifactId>
         </exclusion>
-        <exclusion> <!-- TODO pending https://github.com/jenkinsci/plugin-util-api-plugin/releases/tag/v2.9.0 in bom -->
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -79,7 +75,7 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>javax-mail-api</artifactId>
-      <version>1.6.2-2</version>
+      <version>1.6.2-5</version>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
diff --git a/src/test/java/hudson/tasks/MailerTest.java b/src/test/java/hudson/tasks/MailerTest.java
index 9f1e3fd1..64ee3b4b 100644
--- a/src/test/java/hudson/tasks/MailerTest.java
+++ b/src/test/java/hudson/tasks/MailerTest.java
@@ -62,6 +62,7 @@
 import jenkins.model.JenkinsLocationConfiguration;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 import java.util.Optional;
@@ -297,7 +298,11 @@ public CleanJenkinsLocationConfiguration() {
 
         @Override
         public synchronized void load() {
-            getConfigFile().delete();
+            try {
+                getConfigFile().delete();
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
             super.load();
         }
     };

From 818d13a000d8ea028d971dc488e56efdd3506aad Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Fri, 21 Jan 2022 09:58:01 -0800
Subject: [PATCH 2/5] Bump plugin BOM from 1090.v0a_33df40457a_ to
 1117.v62a_f6a_01de98

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

diff --git a/pom.xml b/pom.xml
index 2bd252e6..7064b362 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-weekly</artifactId>
-        <version>1090.v0a_33df40457a_</version>
+        <version>1117.v62a_f6a_01de98</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

From 7deeda155287f04384088e250f40c59ef151d305 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Fri, 21 Jan 2022 09:58:12 -0800
Subject: [PATCH 3/5] Use released version of Jenkins core

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

diff --git a/pom.xml b/pom.xml
index 7064b362..73f533bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <java.level>8</java.level>
-    <jenkins.version>2.329-rc31978.fa_f50a_a_d3e46</jenkins.version> <!-- TODO https://github.com/jenkinsci/jenkins/pull/6165 -->
+    <jenkins.version>2.331</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
   </properties>
 

From 3ccdaa1df551ea8728a005b98deff0a86754b5ba Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 27 Apr 2022 07:07:17 -0700
Subject: [PATCH 4/5] Update pom.xml

---
 pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 151610f0..3282992e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   </licenses>
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
-    <jenkins.version>2.289.1</jenkins.version>
+    <jenkins.version>2.332.1</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
   </properties>
 
@@ -30,8 +30,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-weekly</artifactId>
-        <version>1117.v62a_f6a_01de98</version>
+        <artifactId>bom-2.332.x</artifactId>
+        <version>1155.v77b_fd92a_26fc</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -74,7 +74,6 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>javax-mail-api</artifactId>
-      <version>1.6.2-5</version>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>

From 4cee55b6201c79c975c37f2cad5492ceda1ab486 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Tue, 19 Jul 2022 10:16:07 -0400
Subject: [PATCH 5/5] Missing import

---
 src/test/java/hudson/tasks/MailerTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/hudson/tasks/MailerTest.java b/src/test/java/hudson/tasks/MailerTest.java
index 14e58ec0..ab489fc0 100644
--- a/src/test/java/hudson/tasks/MailerTest.java
+++ b/src/test/java/hudson/tasks/MailerTest.java
@@ -60,6 +60,7 @@
 import jenkins.model.JenkinsLocationConfiguration;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.Collection;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;