From de4620ca411f4b2d56cf3045dad7b5a4400a9150 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Thu, 17 Nov 2022 16:35:29 -0600
Subject: [PATCH] Build JAX-WS airline client module with Spring WS 4.0.

---
 airline/client/jax-ws/pom.xml                 | 84 ++++++++-----------
 .../airline/client/jaxws/JaxWsMain.java       |  3 +-
 pom.xml                                       | 32 +++----
 3 files changed, 48 insertions(+), 71 deletions(-)

diff --git a/airline/client/jax-ws/pom.xml b/airline/client/jax-ws/pom.xml
index ab664da..0c588c0 100644
--- a/airline/client/jax-ws/pom.xml
+++ b/airline/client/jax-ws/pom.xml
@@ -31,63 +31,45 @@
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
 			<artifactId>spring-ws-core</artifactId>
-<!--			<version>${spring-ws.version}</version>-->
 		</dependency>
 
-	</dependencies>
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-tools</artifactId>
+            <version>${jaxws-tools.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.jws</groupId>
+            <artifactId>jakarta.jws-api</artifactId>
+            <version>${jws-api.version}</version>
+        </dependency>
+
+    </dependencies>
 
 	<build>
 
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
-				<dependencies>
-					<dependency>
-						<groupId>com.sun.xml.ws</groupId>
-						<artifactId>jaxws-tools</artifactId>
-						<version>${jax-ws.version}</version>
-					</dependency>
-					<dependency>
-						<groupId>com.sun</groupId>
-						<artifactId>tools</artifactId>
-						<version>1.5.0</version>
-						<scope>system</scope>
-						<systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<phase>generate-sources</phase>
-						<configuration>
-							<tasks>
-								<taskdef name="wsimport"
-								         classname="com.sun.tools.ws.ant.WsImport">
-									<classpath refid="maven.compile.classpath"/>
-								</taskdef>
-
-								<mkdir dir="${sourcesDir}" />
-								<mkdir dir="${classesDir}" />
-
-								<wsimport
-										destdir="${classesDir}"
-										sourcedestdir="${sourcesDir}"
-										keep="true"
-										verbose="true"
-										extension="true"
-										wsdl="${wsdl}"
-										package="org.springframework.ws.samples.airline.client.jaxws">
-									<produces dir="${classesDir}" includes="**/*.class" />
-								</wsimport>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+            <plugin>
+                <groupId>com.sun.xml.ws</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- The name of your generated source package -->
+                    <wsdlFiles>${project.basedir}/../airline.wsdl</wsdlFiles>
+                    <packageName>org.springframework.ws.samples.airline.client.jaxws</packageName>
+                    <sourceDestDir>${sourcesDir}</sourceDestDir>
+                    <destDir>${classesDir}</destDir>
+                    <extension>true</extension>
+                </configuration>
+            </plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
diff --git a/airline/client/jax-ws/src/main/java/org/springframework/ws/samples/airline/client/jaxws/JaxWsMain.java b/airline/client/jax-ws/src/main/java/org/springframework/ws/samples/airline/client/jaxws/JaxWsMain.java
index a2b31fe..1d48ca9 100644
--- a/airline/client/jax-ws/src/main/java/org/springframework/ws/samples/airline/client/jaxws/JaxWsMain.java
+++ b/airline/client/jax-ws/src/main/java/org/springframework/ws/samples/airline/client/jaxws/JaxWsMain.java
@@ -16,6 +16,8 @@
 
 package org.springframework.ws.samples.airline.client.jaxws;
 
+import jakarta.xml.ws.soap.SOAPFaultException;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -24,7 +26,6 @@ import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
-import javax.xml.ws.soap.SOAPFaultException;
 
 /**
  * Simple client that calls the <code>GetFlights</code> and <code>BookFlight</code> operations using JAX-WS.
diff --git a/pom.xml b/pom.xml
index 6e4bdb1..54756b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.4</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -42,13 +42,22 @@
 		</license>
 	</licenses>
 
+    <properties>
+        <java.version>17</java.version>
+        <jaxws-tools.version>3.0.1</jaxws-tools.version>
+        <jws-api.version>3.0.0</jws-api.version>
+        <sourcesDir>${project.basedir}/target/generated-sources/jaxws</sourcesDir>
+        <classesDir>${project.basedir}/target/classes</classesDir>
+        <wsdl>${project.basedir}/airline/client/airline.wsdl</wsdl>
+    </properties>
+
 	<modules>
-		<module>airline/client/axis1</module>
+<!--		<module>airline/client/axis1</module>-->
 		<module>airline/client/jax-ws</module>
-		<module>airline/client/jms</module>
+<!--		<module>airline/client/jms</module>-->
 		<module>airline/client/saaj</module>
 		<module>airline/client/spring-ws</module>
-		<module>airline/server</module>
+<!--		<module>airline/server</module>-->
 		<module>echo/client/saaj</module>
 		<module>echo/client/spring-ws</module>
 		<module>echo/server</module>
@@ -57,21 +66,6 @@
 		<module>tutorial</module>
 	</modules>
 
-    <profiles>
-        <profile>
-            <id>spring-ws-3.1-snapshots</id>
-            <properties>
-                <spring-ws.version>3.1.4-SNAPSHOT</spring-ws.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>spring-ws-3.2</id>
-            <properties>
-                <spring-ws.version>3.2.0-SNAPSHOT</spring-ws.version>
-            </properties>
-        </profile>
-    </profiles>
-
 	<dependencies>
 
 		<dependency>