diff --git a/bom/pom.xml b/bom/pom.xml
index 3fc576fae329..bc95cdf69a12 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -319,11 +319,6 @@ THE SOFTWARE.
symbol-annotation
1.1
-
- com.sun.mail
- jakarta.mail
- 1.6.5
-
diff --git a/core/pom.xml b/core/pom.xml
index 0b10a40a0d22..28fbaaaf812b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -280,10 +280,6 @@ THE SOFTWARE.
org.apache.commons
commons-compress
-
- com.sun.mail
- jakarta.mail
-
jaxen
jaxen
diff --git a/core/src/main/resources/jenkins/split-plugin-cycles.txt b/core/src/main/resources/jenkins/split-plugin-cycles.txt
index 3cec061d7eb0..17f997f98970 100644
--- a/core/src/main/resources/jenkins/split-plugin-cycles.txt
+++ b/core/src/main/resources/jenkins/split-plugin-cycles.txt
@@ -32,3 +32,5 @@ junit jaxb
bouncycastle-api jaxb
command-launcher jaxb
jdk-tool jaxb
+
+javax-activation-api javax-mail-api
diff --git a/core/src/main/resources/jenkins/split-plugins.txt b/core/src/main/resources/jenkins/split-plugins.txt
index 0bb03189d9c8..eeab9467a13b 100644
--- a/core/src/main/resources/jenkins/split-plugins.txt
+++ b/core/src/main/resources/jenkins/split-plugins.txt
@@ -34,3 +34,6 @@ trilead-api 2.184 1.0.4
# JENKINS-64107
sshd 2.281 3.0.1
+
+javax-activation-api 2.328 1.2.0-1
+javax-mail-api 2.328 1.6.2-1
diff --git a/test/pom.xml b/test/pom.xml
index 336a6e6322ed..e3304968c32c 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -121,6 +121,12 @@ THE SOFTWARE.
391.ve4a_38c1b_cf4b_
test
+
+ io.jenkins.plugins
+ javax-mail-api
+ 1.6.2-1
+ test
+
org.jenkins-ci.plugins
matrix-auth
diff --git a/war/pom.xml b/war/pom.xml
index e71473d30ca0..a9c806ca30e0 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -367,6 +367,18 @@ THE SOFTWARE.
1.0.4
hpi
+
+ io.jenkins.plugins
+ javax-activation-api
+ 1.2.0-1
+ hpi
+
+
+ io.jenkins.plugins
+ javax-mail-api
+ 1.6.2-1
+ hpi
+
${project.build.directory}/${project.build.finalName}/WEB-INF/detached-plugins
true