From 6d22695a0e130ce4bc3d7d1cb52ef23309f88d7e Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Tue, 30 Nov 2021 10:31:56 -0600
Subject: [PATCH] Replace jakarta.jakartaee-api with spec-specific JARs.

Resolves #1215.
---
 pom.xml                   |  10 +---
 spring-ws-core/pom.xml    |  10 ++++
 spring-ws-support/pom.xml | 118 ++++++++++++++++++++------------------
 3 files changed, 75 insertions(+), 63 deletions(-)

diff --git a/pom.xml b/pom.xml
index 19ff80ae..072756be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,9 +95,11 @@
         <ehcache.version>2.10.6</ehcache.version>
         <greenmail.version>2.0.0-alpha-2</greenmail.version>
         <httpclient.version>4.5.3</httpclient.version>
-        <jakarta-api.version>9.0.0</jakarta-api.version>
+        <jakarta-annotation.version>2.0.0</jakarta-annotation.version>
         <jakarta-jms.version>3.0.0</jakarta-jms.version>
         <jakarta-mail.version>2.0.1</jakarta-mail.version>
+        <jakarta-servlet.version>5.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>
         <jaxen.version>1.1.4</jaxen.version>
         <jdom2.version>2.0.6</jdom2.version>
@@ -159,12 +161,6 @@
             <artifactId>spring-core</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>jakarta.platform</groupId>
-            <artifactId>jakarta.jakartaee-api</artifactId>
-            <version>${jakarta-api.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.sun.xml.messaging.saaj</groupId>
             <artifactId>saaj-impl</artifactId>
diff --git a/spring-ws-core/pom.xml b/spring-ws-core/pom.xml
index 2d28e26b..8a2fb6f0 100644
--- a/spring-ws-core/pom.xml
+++ b/spring-ws-core/pom.xml
@@ -43,6 +43,16 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.soap</groupId>
+            <artifactId>jakarta.xml.soap-api</artifactId>
+            <version>${jakarta-soap.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
diff --git a/spring-ws-support/pom.xml b/spring-ws-support/pom.xml
index 5290c91a..90721116 100644
--- a/spring-ws-support/pom.xml
+++ b/spring-ws-support/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -41,24 +41,30 @@
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>${jakarta-annotation.version}</version>
+			<scope>test</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>jakarta.jms</groupId>
-            <artifactId>jakarta.jms-api</artifactId>
-            <version>${jakarta-jms.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.mail</groupId>
-            <artifactId>jakarta.mail-api</artifactId>
-            <version>${jakarta-mail.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>jakarta.mail</artifactId>
-            <version>${jakarta-mail.version}</version>
-        </dependency>
-        <dependency>
+		<dependency>
+			<groupId>jakarta.jms</groupId>
+			<artifactId>jakarta.jms-api</artifactId>
+			<version>${jakarta-jms.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.mail</groupId>
+			<artifactId>jakarta.mail-api</artifactId>
+			<version>${jakarta-mail.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.mail</groupId>
+			<artifactId>jakarta.mail</artifactId>
+			<version>${jakarta-mail.version}</version>
+		</dependency>
+		<dependency>
 			<groupId>org.igniterealtime.smack</groupId>
 			<artifactId>smack-tcp</artifactId>
 			<version>${smack.version}</version>
@@ -90,45 +96,45 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>artemis-jakarta-server</artifactId>
-            <version>${activemq.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.jms</groupId>
-                    <artifactId>jakarta.jms-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>artemis-jakarta-server</artifactId>
+			<version>${activemq.version}</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>jakarta.jms</groupId>
+					<artifactId>jakarta.jms-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 
-        <!-- TODO: Remove pending https://issues.apache.org/jira/browse/ARTEMIS-3546 -->
-        <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
-            <version>1.1.4</version>
-            <scope>test</scope>
-        </dependency>
+		<!-- TODO: Remove pending https://issues.apache.org/jira/browse/ARTEMIS-3546 -->
+		<dependency>
+			<groupId>javax.json</groupId>
+			<artifactId>javax.json-api</artifactId>
+			<version>1.1.4</version>
+			<scope>test</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>com.icegreen</groupId>
-            <artifactId>greenmail</artifactId>
-            <version>${greenmail.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.icegreen</groupId>
-            <artifactId>greenmail-junit5</artifactId>
-            <version>${greenmail.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.icegreen</groupId>
-            <artifactId>greenmail-spring</artifactId>
-            <version>${greenmail.version}</version>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>com.icegreen</groupId>
+			<artifactId>greenmail</artifactId>
+			<version>${greenmail.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.icegreen</groupId>
+			<artifactId>greenmail-junit5</artifactId>
+			<version>${greenmail.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.icegreen</groupId>
+			<artifactId>greenmail-spring</artifactId>
+			<version>${greenmail.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<profiles>