From b94982f0c28090b7145bcc5bd3aa41bffad91e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <stephane.nicoll@broadcom.com>
Date: Wed, 19 Feb 2025 16:07:57 +0100
Subject: [PATCH] Polish "Harmonize dependency management"

See gh-1455
---
 pom.xml                   | 12 ++++++++++--
 spring-ws-core/pom.xml    |  9 ---------
 spring-ws-support/pom.xml | 12 ------------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4bf4dd61..fc30f6c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,6 +322,11 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+			<dependency>
+				<groupId>com.sun.mail</groupId>
+				<artifactId>jakarta.mail</artifactId>
+				<version>${sun-mail.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>jakarta.activation</groupId>
 				<artifactId>jakarta.activation-api</artifactId>
@@ -522,6 +527,11 @@
 				<artifactId>easymock</artifactId>
 				<version>${easymock.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.eclipse.angus</groupId>
+				<artifactId>angus-mail</artifactId>
+				<version>${eclipse-angus-mail.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.glassfish.jaxb</groupId>
 				<artifactId>jaxb-runtime</artifactId>
@@ -672,8 +682,6 @@
 				<jakarta-annotation.version>2.0.0</jakarta-annotation.version>
 				<jakarta-jms.version>3.0.0</jakarta-jms.version>
 				<jakarta-mail-api.version>2.0.1</jakarta-mail-api.version>
-				<jakarta-mail-ee9-impl.version>2.0.1</jakarta-mail-ee9-impl.version>
-				<jakarta-mail-ee-10-impl.version>2.1.0</jakarta-mail-ee-10-impl.version>
 				<jakarta-servlet.version>6.0.0</jakarta-servlet.version>
 				<jakarta-soap.version>2.0.1</jakarta-soap.version>
 				<jakarta-xml-bind.version>3.0.1</jakarta-xml-bind.version>
diff --git a/spring-ws-core/pom.xml b/spring-ws-core/pom.xml
index 65d43f47..9d72138a 100644
--- a/spring-ws-core/pom.xml
+++ b/spring-ws-core/pom.xml
@@ -220,7 +220,6 @@
 				<dependency>
 					<groupId>com.sun.mail</groupId>
 					<artifactId>jakarta.mail</artifactId>
-					<version>${sun-mail.version}</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>
@@ -234,19 +233,11 @@
 				<dependency>
 					<groupId>jakarta.mail</groupId>
 					<artifactId>jakarta.mail-api</artifactId>
-					<version>${jakarta-mail-api.version}</version>
 				</dependency>
 				<dependency>
 					<groupId>org.eclipse.angus</groupId>
 					<artifactId>angus-mail</artifactId>
-					<version>${eclipse-angus-mail.version}</version>
 					<scope>test</scope>
-					<exclusions>
-						<exclusion>
-							<groupId>jakarta.mail</groupId>
-							<artifactId>jakarta.mail-api</artifactId>
-						</exclusion>
-					</exclusions>
 				</dependency>
 			</dependencies>
 		</profile>
diff --git a/spring-ws-support/pom.xml b/spring-ws-support/pom.xml
index c26475a3..a4c8e93e 100644
--- a/spring-ws-support/pom.xml
+++ b/spring-ws-support/pom.xml
@@ -143,7 +143,6 @@
 				<dependency>
 					<groupId>com.sun.mail</groupId>
 					<artifactId>jakarta.mail</artifactId>
-					<version>${sun-mail.version}</version>
 				</dependency>
 			</dependencies>
 		</profile>
@@ -157,17 +156,6 @@
 				<dependency>
 					<groupId>org.eclipse.angus</groupId>
 					<artifactId>angus-mail</artifactId>
-					<version>${eclipse-angus-mail.version}</version>
-					<exclusions>
-						<exclusion>
-							<groupId>jakarta.activation</groupId>
-							<artifactId>jakarta.activation-api</artifactId>
-						</exclusion>
-						<exclusion>
-							<groupId>jakarta.mail</groupId>
-							<artifactId>jakarta.mail-api</artifactId>
-						</exclusion>
-					</exclusions>
 				</dependency>
 			</dependencies>
 		</profile>