From 132761b508b916f0cfc9dc339375becd6448706f Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 3 Jan 2024 14:42:22 -0800
Subject: [PATCH] Upgrade to Jakarta Mail API 2.1.3 and Angus Mail

---
 pom.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 64406b0..bc5b7bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,21 +42,35 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.sun.mail</groupId>
-      <artifactId>jakarta.mail</artifactId>
-      <version>2.0.1</version>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>jakarta-activation-api</artifactId>
+      <!-- TODO https://github.com/jenkinsci/jakarta-activation-api-plugin/pull/13 -->
+      <version>2.0.1-4-rc83.1e5dc136a_d96</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.mail</groupId>
+      <artifactId>jakarta.mail-api</artifactId>
+      <!-- TODO https://github.com/jakartaee/mail-api/pull/701 -->
+      <version>2.1.3-20240103.222508-1</version>
       <exclusions>
         <!-- Provided by jakarta-activation-api plugin -->
         <exclusion>
-          <groupId>com.sun.activation</groupId>
-          <artifactId>jakarta.activation</artifactId>
+          <groupId>jakarta.activation</groupId>
+          <artifactId>jakarta.activation-api</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>io.jenkins.plugins</groupId>
-      <artifactId>jakarta-activation-api</artifactId>
-      <version>2.0.1-3</version>
+      <groupId>org.eclipse.angus</groupId>
+      <artifactId>angus-mail</artifactId>
+      <version>2.0.2</version>
+      <exclusions>
+        <!-- Provided by jakarta-activation-api plugin -->
+        <exclusion>
+          <groupId>org.eclipse.angus</groupId>
+          <artifactId>angus-activation</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 
@@ -65,6 +79,13 @@
       <id>repo.jenkins-ci.org</id>
       <url>https://repo.jenkins-ci.org/public/</url>
     </repository>
+    <repository>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>snapshots</id>
+      <url>https://repo.jenkins-ci.org/snapshots/</url>
+    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
@@ -76,6 +97,24 @@
   <!-- The javax-mail-api plugin also provides these same classes, so we need to mask them to avoid conflicts. -->
   <build>
     <plugins>
+      <!-- TODO https://github.com/jenkinsci/jakarta-activation-api-plugin/pull/13 -->
+      <plugin>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>no-snapshots-in-release</id>
+            <configuration>
+              <rules>
+                <requireReleaseDeps>
+                  <excludes>
+                    <exclude>jakarta.mail:jakarta.mail-api</exclude>
+                  </excludes>
+                </requireReleaseDeps>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.jenkins-ci.tools</groupId>
         <artifactId>maven-hpi-plugin</artifactId>