Skip to content

Commit

Permalink
Upgrade to Jakarta Mail API 2.1.3 and Angus Mail
Browse files Browse the repository at this point in the history
  • Loading branch information
basil committed Jan 3, 2024
1 parent 5a95bb7 commit 132761b
Showing 1 changed file with 47 additions and 8 deletions.
55 changes: 47 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 132761b

Please sign in to comment.