Upgrade to Jakarta Mail API 2.1.0 and Angus Mail

jenkinsci · Sep 4, 2022 · f9d8e7f · f9d8e7f
1 parent 4a8069f
commit f9d8e7f
Showing 1 changed file with 21 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -41,21 +41,34 @@
 
   <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-2-rc41.c73cc44f5b_c6</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.mail</groupId>
+      <artifactId>jakarta.mail-api</artifactId>
+      <version>2.1.0</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-1</version>
+      <groupId>org.eclipse.angus</groupId>
+      <artifactId>angus-mail</artifactId>
+      <version>1.0.0</version>
+      <exclusions>
+        <!-- Provided by jakarta-activation-api plugin -->
+        <exclusion>
+          <groupId>org.eclipse.angus</groupId>
+          <artifactId>angus-activation</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>