From 8462c9b638424303d4c992164b059f0b6a264ce2 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Wed, 2 Mar 2022 13:16:01 -0600
Subject: [PATCH] Upgrade samples to better support current Spring Boot +
 Spring WS.

* Ensure each module is pointed back at the parent.
* Parent now carries the version of Spring Boot.
* Migrate one Axis JAR file.
* Override Spring Boot's version of Spring WS, ensuring we are buliding against latest snapshot.
* Point Jenkinsfile at Spring WS's main job.
---
 airline/client/axis1/pom.xml  |  3 +-
 airline/client/jax-ws/pom.xml |  5 +--
 airline/server/pom.xml        |  8 ++---
 echo/server/pom.xml           |  8 ++---
 mtom/server/pom.xml           |  8 ++---
 pom.xml                       | 64 ++++++++++++++++++++++++++++-------
 tutorial/pom.xml              |  8 ++---
 7 files changed, 73 insertions(+), 31 deletions(-)

diff --git a/airline/client/axis1/pom.xml b/airline/client/axis1/pom.xml
index 39a322b..01e36c7 100644
--- a/airline/client/axis1/pom.xml
+++ b/airline/client/axis1/pom.xml
@@ -35,7 +35,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>axis</groupId>
+			<groupId>org.apache.axis</groupId>
 			<artifactId>axis-jaxrpc</artifactId>
 			<version>${axis.version}</version>
 		</dependency>
@@ -48,6 +48,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.8</version>
 				<dependencies>
 					<dependency>
 						<groupId>axis</groupId>
diff --git a/airline/client/jax-ws/pom.xml b/airline/client/jax-ws/pom.xml
index d7f8e31..e2c968c 100644
--- a/airline/client/jax-ws/pom.xml
+++ b/airline/client/jax-ws/pom.xml
@@ -20,7 +20,7 @@
 		<java.version>1.8</java.version>
 		<jax-ws.version>2.1.7</jax-ws.version>
 		<log4j2.version>2.15.0</log4j2.version>
-		<spring-ws.version>2.1.4.RELEASE</spring-ws.version>
+<!--		<spring-ws.version>2.1.4.RELEASE</spring-ws.version>-->
 		<sourcesDir>${project.basedir}/target/generated-sources/jaxws</sourcesDir>
 		<classesDir>${project.basedir}/target/classes</classesDir>
 		<wsdl>${project.basedir}/../airline.wsdl</wsdl>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
 			<artifactId>spring-ws-core</artifactId>
-			<version>${spring-ws.version}</version>
+<!--			<version>${spring-ws.version}</version>-->
 		</dependency>
 
 	</dependencies>
@@ -42,6 +42,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.8</version>
 				<dependencies>
 					<dependency>
 						<groupId>com.sun.xml.ws</groupId>
diff --git a/airline/server/pom.xml b/airline/server/pom.xml
index d73bfa3..625f544 100644
--- a/airline/server/pom.xml
+++ b/airline/server/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.7</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<groupId>org.springframework.ws</groupId>
+		<artifactId>spring-ws-samples</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../../</relativePath> <!-- lookup parent from repository -->
 	</parent>
 
 	<groupId>org.springframework.ws</groupId>
diff --git a/echo/server/pom.xml b/echo/server/pom.xml
index 26d5b16..9d405f1 100644
--- a/echo/server/pom.xml
+++ b/echo/server/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.7</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<groupId>org.springframework.ws</groupId>
+		<artifactId>spring-ws-samples</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../../</relativePath> <!-- lookup parent from repository -->
 	</parent>
 
 	<groupId>org.springframework.ws</groupId>
diff --git a/mtom/server/pom.xml b/mtom/server/pom.xml
index 6dac636..3513eaf 100644
--- a/mtom/server/pom.xml
+++ b/mtom/server/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.7</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<groupId>org.springframework.ws</groupId>
+		<artifactId>spring-ws-samples</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../../</relativePath> <!-- lookup parent from repository -->
 	</parent>
 
 	<groupId>org.springframework.ws</groupId>
diff --git a/pom.xml b/pom.xml
index 286bc8c..0e57c9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
 <?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">
+		 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>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.7</version>
+		<version>2.6.4</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -57,24 +57,64 @@
 		<module>tutorial</module>
 	</modules>
 
+	<properties>
+		<spring-ws.version>3.1.3-SNAPSHOT</spring-ws.version>
+	</properties>
+
 	<dependencies>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.junit.vintage</groupId>
-					<artifactId>junit-vintage-engine</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-logging</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 
 	</dependencies>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<repositories>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>https://repo.spring.io/snapshot</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>https://repo.spring.io/snapshot</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</pluginRepository>
+	</pluginRepositories>
+
 </project>
diff --git a/tutorial/pom.xml b/tutorial/pom.xml
index 713792f..a003379 100644
--- a/tutorial/pom.xml
+++ b/tutorial/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.7</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<groupId>org.springframework.ws</groupId>
+		<artifactId>spring-ws-samples</artifactId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../</relativePath> <!-- lookup parent from repository -->
 	</parent>
 
 	<groupId>org.springframework.ws</groupId>