Merge pull request #321 from basil/angus

Adapt to Jakarta Activation and Jakarta Mail upgrades
jenkinsci · May 20, 2024 · 550b779 · 550b779
2 parents 75dda1d + f46ae7e
commit 550b779
Showing 1 changed file with 35 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -86,6 +86,18 @@ THE SOFTWARE.
         <artifactId>javax.annotation-api</artifactId>
         <version>1.3.2</version>
       </dependency>
+      <!-- TODO Remove once in BOM -->
+      <dependency>
+        <groupId>io.jenkins.plugins</groupId>
+        <artifactId>jakarta-activation-api</artifactId>
+        <version>2.1.3-1</version>
+      </dependency>
+      <!-- TODO Remove once in BOM -->
+      <dependency>
+        <groupId>io.jenkins.plugins</groupId>
+        <artifactId>jakarta-mail-api</artifactId>
+        <version>2.1.3-1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -760,29 +772,39 @@ THE SOFTWARE.
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>jakarta-mail-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.jvnet.mock-javamail</groupId>
       <artifactId>mock-javamail</artifactId>
-      <version>2.1</version>
+      <version>2.2</version>
       <scope>test</scope>
       <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>
         <!-- Provided by jakarta-mail-api plugin -->
         <exclusion>
-          <groupId>com.sun.mail</groupId>
-          <artifactId>jakarta.mail</artifactId>
+          <groupId>jakarta.mail</groupId>
+          <artifactId>jakarta.mail-api</artifactId>
+        </exclusion>
+        <!-- Provided by jakarta-activation-api plugin -->
+        <exclusion>
+          <groupId>org.eclipse.angus</groupId>
+          <artifactId>angus-activation</artifactId>
+        </exclusion>
+        <!-- Provided by jakarta-mail-api plugin -->
+        <exclusion>
+          <groupId>org.eclipse.angus</groupId>
+          <artifactId>angus-mail</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>io.jenkins.plugins</groupId>
-      <artifactId>jakarta-mail-api</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.test</groupId>
       <artifactId>sample-plexus-component</artifactId>
@@ -831,6 +853,9 @@ THE SOFTWARE.
           <configuration>
             <systemPropertyVariables>
               <buildDirectory>${project.build.directory}</buildDirectory>
+              <mail.smtp.class>org.jvnet.mock_javamail.MockTransport</mail.smtp.class>
+              <mail.pop3.class>org.jvnet.mock_javamail.MockStore</mail.pop3.class>
+              <mail.imap.class>org.jvnet.mock_javamail.MockStore</mail.imap.class>
             </systemPropertyVariables>
           </configuration>
         </plugin>