From e3f9a7fda240f8c1b7a079cc74834c7507d18fc5 Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <corneil.du-plessis@broadcom.com>
Date: Thu, 11 Apr 2024 12:27:04 +0200
Subject: [PATCH] Added exclusions and fixed dependency versions. (#1409)

---
 pom.xml                    | 23 ++++++++++++++++++++---
 spring-ws-core/pom.xml     | 21 +++++++++++++++++++++
 spring-ws-security/pom.xml | 10 ++++++++++
 spring-ws-support/pom.xml  | 16 ++++++++++++++++
 4 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4e1706e2..56a339e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,14 +99,15 @@
         <commons-io.version>2.11.0</commons-io.version>
         <dom4j.version>1.6.1</dom4j.version>
         <easymock.version>4.3</easymock.version>
-        <eclipse-angus-mail.version>1.0.0</eclipse-angus-mail.version>
+        <eclipse-angus-mail.version>1.1.0</eclipse-angus-mail.version>
         <ehcache.version>2.10.9.2</ehcache.version>
         <greenmail.version>2.0.0-alpha-2</greenmail.version>
         <httpclient.version>4.5.3</httpclient.version>
         <httpclient5.version>5.2.1</httpclient5.version>
         <jakarta-annotation.version>2.1.1</jakarta-annotation.version>
         <jakarta-jms.version>3.1.0</jakarta-jms.version>
-        <jakarta-mail-api.version>2.1.0</jakarta-mail-api.version>
+        <jakarta-mail-api.version>2.1.3</jakarta-mail-api.version>
+        <jakarta.activation-api.version>2.1.2</jakarta.activation-api.version>
         <jakarta-servlet.version>6.0.0</jakarta-servlet.version>
         <jakarta-soap.version>3.0.1</jakarta-soap.version>
         <jakarta-xml-bind.version>4.0.2</jakarta-xml-bind.version>
@@ -140,7 +141,7 @@
 
         <spring-hateos.version>2.1.4</spring-hateos.version>
         <sun-mail.version>2.0.1</sun-mail.version>
-        <stax.version>2.0.1</stax.version>
+        <stax.version>2.1.0</stax.version>
         <woodstox.version>6.5.1</woodstox.version>
         <wsdl4j.version>1.6.3</wsdl4j.version>
         <wss4j.version>2.4.3</wss4j.version>
@@ -217,6 +218,14 @@
                     <groupId>com.sun.activation</groupId>
                     <artifactId>jakarta.activation</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.angus</groupId>
+                    <artifactId>angus-activation</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -224,6 +233,12 @@
             <groupId>org.jvnet.staxex</groupId>
             <artifactId>stax-ex</artifactId>
             <version>${stax.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -341,6 +356,8 @@
                 <jakarta-soap.version>2.0.1</jakarta-soap.version>
                 <jakarta-xml-bind.version>3.0.1</jakarta-xml-bind.version>
                 <saaj-impl.version>2.0.1</saaj-impl.version>
+                <stax.version>2.0.1</stax.version>
+                <eclipse-angus-mail.version>1.1.0</eclipse-angus-mail.version>
             </properties>
         </profile>
         <profile>
diff --git a/spring-ws-core/pom.xml b/spring-ws-core/pom.xml
index 8c2d983c..1e0d473f 100644
--- a/spring-ws-core/pom.xml
+++ b/spring-ws-core/pom.xml
@@ -53,6 +53,12 @@
             <groupId>jakarta.xml.soap</groupId>
             <artifactId>jakarta.xml.soap-api</artifactId>
             <version>${jakarta-soap.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -82,6 +88,10 @@
                     <groupId>jakarta.xml.bind</groupId>
                     <artifactId>jakarta.xml.bind-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.angus</groupId>
+                    <artifactId>angus-activation</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -283,11 +293,22 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
+                <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-security/pom.xml b/spring-ws-security/pom.xml
index 969381da..c4069749 100644
--- a/spring-ws-security/pom.xml
+++ b/spring-ws-security/pom.xml
@@ -164,6 +164,10 @@
                     <groupId>com.sun.activation</groupId>
                     <artifactId>jakarta.activation</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -171,6 +175,12 @@
             <groupId>org.jvnet.staxex</groupId>
             <artifactId>stax-ex</artifactId>
             <version>${stax.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>
diff --git a/spring-ws-support/pom.xml b/spring-ws-support/pom.xml
index 3f82ba2e..6ee0eb8d 100644
--- a/spring-ws-support/pom.xml
+++ b/spring-ws-support/pom.xml
@@ -58,6 +58,12 @@
 			<groupId>jakarta.mail</groupId>
 			<artifactId>jakarta.mail-api</artifactId>
 			<version>${jakarta-mail-api.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>jakarta.activation</groupId>
+					<artifactId>jakarta.activation-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.igniterealtime.smack</groupId>
@@ -210,6 +216,16 @@
                     <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>