From 7c9fe22db741b351cbc66146f66f8bec16811d49 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Tue, 29 Nov 2022 12:55:15 -0600
Subject: [PATCH] Polishing.

---
 airline/client/jax-ws/pom.xml    | 91 ++++++++++++++++----------------
 airline/client/jms/pom.xml       |  5 +-
 airline/client/spring-ws/pom.xml |  3 --
 3 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/airline/client/jax-ws/pom.xml b/airline/client/jax-ws/pom.xml
index 19996c0..9fb8f09 100644
--- a/airline/client/jax-ws/pom.xml
+++ b/airline/client/jax-ws/pom.xml
@@ -1,34 +1,33 @@
 <?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">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.springframework.ws</groupId>
-		<artifactId>spring-ws-samples</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
-		<relativePath>../../../</relativePath> <!-- lookup parent from repository -->
-	</parent>
+    <parent>
+        <groupId>org.springframework.ws</groupId>
+        <artifactId>spring-ws-samples</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <relativePath>../../../</relativePath> <!-- lookup parent from repository -->
+    </parent>
 
-	<groupId>org.springframework.ws</groupId>
-	<artifactId>airline-client-jax-ws</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>Spring Web Services Samples - Airline - Client - JAX-WS</name>
-	<description>Demo project for Spring Web Services</description>
+    <artifactId>airline-client-jax-ws</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>Spring Web Services Samples - Airline - Client - JAX-WS</name>
+    <description>Demo project for Spring Web Services</description>
 
-	<properties>
-		<jax-ws.version>2.1.7</jax-ws.version>
-		<sourcesDir>${project.basedir}/target/generated-sources/jaxws</sourcesDir>
-		<classesDir>${project.basedir}/target/classes</classesDir>
-		<wsdl>${project.basedir}/../airline.wsdl</wsdl>
-	</properties>
+    <properties>
+        <jax-ws.version>2.1.7</jax-ws.version>
+        <sourcesDir>${project.basedir}/target/generated-sources/jaxws</sourcesDir>
+        <classesDir>${project.basedir}/target/classes</classesDir>
+        <wsdl>${project.basedir}/../airline.wsdl</wsdl>
+    </properties>
 
-	<dependencies>
+    <dependencies>
 
-		<dependency>
-			<groupId>org.springframework.ws</groupId>
-			<artifactId>spring-ws-core</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework.ws</groupId>
+            <artifactId>spring-ws-core</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
@@ -44,9 +43,9 @@
 
     </dependencies>
 
-	<build>
+    <build>
 
-		<plugins>
+        <plugins>
             <plugin>
                 <groupId>com.sun.xml.ws</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
@@ -67,27 +66,27 @@
                     <extension>true</extension>
                 </configuration>
             </plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.1</version>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>process-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>${sourcesDir}</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${sourcesDir}</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
 
-	</build>
+    </build>
 
 </project>
diff --git a/airline/client/jms/pom.xml b/airline/client/jms/pom.xml
index 7edc491..24d5617 100644
--- a/airline/client/jms/pom.xml
+++ b/airline/client/jms/pom.xml
@@ -10,7 +10,6 @@
 		<relativePath>../../../</relativePath> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>org.springframework.ws</groupId>
 	<artifactId>airline-client-jms</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>Spring Web Services Samples - Airline - Client - JMS</name>
@@ -18,9 +17,7 @@
 
 	<properties>
 		<activemq.version>4.1.2</activemq.version>
-		<java.version>17</java.version>
-        <jakarta-jms.version>3.1.0</jakarta-jms.version>
-		<log4j2.version>2.15.0</log4j2.version>
+		<jakarta-jms.version>3.1.0</jakarta-jms.version>
 		<sourcesDir>${project.basedir}/target/generated-sources/jaxws</sourcesDir>
 		<classesDir>${project.basedir}/target/classes</classesDir>
 		<wsdl>${project.basedir}/../airline.wsdl</wsdl>
diff --git a/airline/client/spring-ws/pom.xml b/airline/client/spring-ws/pom.xml
index 5aab356..a2a032a 100644
--- a/airline/client/spring-ws/pom.xml
+++ b/airline/client/spring-ws/pom.xml
@@ -10,15 +10,12 @@
 		<relativePath>../../../</relativePath> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>org.springframework.ws</groupId>
 	<artifactId>airline-client-spring-ws</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>Spring Web Services Samples - Airline - Client - Spring WS</name>
 	<description>Demo project for Spring Web Services</description>
 
 	<properties>
-		<jax-ws.version>2.1.7</jax-ws.version>
-		<xmlbeans.version>2.4.0</xmlbeans.version>
 		<sourcesDir>${project.basedir}/target/generated-sources/xjc</sourcesDir>
 		<classesDir>${project.basedir}/target/classes</classesDir>
 		<schema>${project.basedir}/../../server/src/main/resources</schema>