diff --git a/pom.xml b/pom.xml
index 08d8f575e..2cd1e5495 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
 		<gson.version>2.9.1</gson.version>
 		<hibernate-core.version>6.1.4.Final</hibernate-core.version>
 		<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
-		<jakarta.mail-api.version>2.0.1</jakarta.mail-api.version>
+		<jakarta.mail-api.version>2.1.0</jakarta.mail-api.version>
 		<jakarta.jms-api.version>3.1.0</jakarta.jms-api.version>
 		<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
 		<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
@@ -102,7 +102,7 @@
 		<jakarta.el.version>4.0.2</jakarta.el.version>
 		<jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
 		<jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
-		<jakarta.mail.version>2.0.1</jakarta.mail.version>
+		<angus-mail.version>1.0.0</angus-mail.version>
 		<woodstox-core.version>6.3.1</woodstox-core.version>
 		<aspectj.version>1.9.9.1</aspectj.version>
 		<mysql-connector-j.version>8.0.31</mysql-connector-j.version>
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index 18dc0bf7a..867134a04 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -386,9 +386,9 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.mail</groupId>
-			<artifactId>jakarta.mail</artifactId>
-			<version>${jakarta.mail.version}</version>
+			<groupId>org.eclipse.angus</groupId>
+			<artifactId>angus-mail</artifactId>
+			<version>${angus-mail.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>