From 5a8a99345a08cfaf568f15731b94d69d2396eaa2 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Tue, 1 Dec 2020 14:49:06 -0600
Subject: [PATCH] Upgrade to Spring Framework 5.3.

Resolves #1172.
---
 Jenkinsfile                                   | 55 --------------
 pom.xml                                       | 74 +------------------
 .../transport/mail/MailIntegrationTest.java   |  4 -
 3 files changed, 2 insertions(+), 131 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a3164318..39fecdb5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,17 +50,6 @@ pipeline {
 						sh "PROFILE=springnext,convergence ci/test.sh"
 					}
 				}
-				stage("Test: springnext-buildsnapshot (jdk8)") {
-					agent {
-						docker {
-							image 'adoptopenjdk/openjdk8:latest'
-							args '-v $HOME/.m2:/root/.m2'
-						}
-					}
-					steps {
-						sh "PROFILE=springnext-buildsnapshot,convergence ci/test.sh"
-					}
-				}
 				stage("Test: spring-buildsnapshot (jdk8)") {
 					agent {
 						docker {
@@ -83,28 +72,6 @@ pipeline {
 						sh "PROFILE=distribute,java11,convergence ci/test.sh"
 					}
 				}
-				stage("Test: springnext (jdk11)") {
-					agent {
-						docker {
-							image 'adoptopenjdk/openjdk11:latest'
-							args '-v $HOME/.m2:/root/.m2'
-						}
-					}
-					steps {
-						sh "PROFILE=springnext,java11,convergence ci/test.sh"
-					}
-				}
-				stage("Test: springnext-buildsnapshot (jdk11)") {
-					agent {
-						docker {
-							image 'adoptopenjdk/openjdk11:latest'
-							args '-v $HOME/.m2:/root/.m2'
-						}
-					}
-					steps {
-						sh "PROFILE=springnext-buildsnapshot,java11,convergence ci/test.sh"
-					}
-				}
 				stage("Test: spring-buildsnapshot (jdk11)") {
 					agent {
 						docker {
@@ -127,28 +94,6 @@ pipeline {
 						sh "PROFILE=distribute,java11,convergence ci/test.sh"
 					}
 				}
-				stage("Test: springnext (jdk15)") {
-					agent {
-						docker {
-							image 'adoptopenjdk/openjdk15:latest'
-							args '-v $HOME/.m2:/root/.m2'
-						}
-					}
-					steps {
-						sh "PROFILE=springnext,java11,convergence ci/test.sh"
-					}
-				}
-				stage("Test: springnext-buildsnapshot (jdk15)") {
-					agent {
-						docker {
-							image 'adoptopenjdk/openjdk15:latest'
-							args '-v $HOME/.m2:/root/.m2'
-						}
-					}
-					steps {
-						sh "PROFILE=springnext-buildsnapshot,java11,convergence ci/test.sh"
-					}
-				}
 				stage("Test: spring-buildsnapshot (jdk15)") {
 					agent {
 						docker {
diff --git a/pom.xml b/pom.xml
index e8f89444..66530e40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
 		<slf4j.version>1.7.25</slf4j.version>
 		<smack.version>4.2.1</smack.version>
 		<soap-api.version>1.4.0</soap-api.version>
-		<spring.version>5.0.19.RELEASE</spring.version>
+		<spring.version>5.3.1</spring.version>
 		<spring-security.version>5.0.9.RELEASE</spring-security.version>
 		<stax.version>1.7.8</stax.version>
 		<sun-mail.version>1.6.0</sun-mail.version>
@@ -240,7 +240,7 @@
 			<id>spring-buildsnapshot</id>
 			<properties>
 				<aspectj.version>1.9.1</aspectj.version>
-				<spring.version>5.0.11.BUILD-SNAPSHOT</spring.version>
+				<spring.version>5.3.2-SNAPSHOT</spring.version>
 				<spring-security.version>5.0.10.BUILD-SNAPSHOT</spring-security.version>
 			</properties>
 			<repositories>
@@ -271,76 +271,6 @@
 			</repositories>
 		</profile>
 
-		<profile>
-			<id>springnext</id>
-			<properties>
-				<aspectj.version>1.9.1</aspectj.version>
-				<spring.version>5.1.2.RELEASE</spring.version>
-				<spring-security.version>5.1.1.RELEASE</spring-security.version>
-			</properties>
-			<repositories>
-				<repository>
-					<id>spring-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/snapshot</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</repository>
-				<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-release</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-			</repositories>
-		</profile>
-
-		<profile>
-			<id>springnext-buildsnapshot</id>
-			<properties>
-				<aspectj.version>1.9.1</aspectj.version>
-				<spring.version>5.1.3.BUILD-SNAPSHOT</spring.version>
-				<spring-security.version>5.1.2.BUILD-SNAPSHOT</spring-security.version>
-			</properties>
-			<repositories>
-				<repository>
-					<id>spring-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/snapshot</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</repository>
-				<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-release</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-			</repositories>
-		</profile>
-
 		<profile>
 			<id>convergence</id>
 
diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java
index 68bb8ff9..3e9af0a0 100644
--- a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java
+++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java
@@ -23,7 +23,6 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.jvnet.mock_javamail.Mailbox;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.ws.client.core.WebServiceTemplate;
@@ -37,8 +36,6 @@ public class MailIntegrationTest {
 
 	@Autowired private WebServiceTemplate webServiceTemplate;
 
-	@Autowired private GenericApplicationContext applicationContext;
-
 	@AfterEach
 	public void clearMailbox() {
 		Mailbox.clearAll();
@@ -50,7 +47,6 @@ public class MailIntegrationTest {
 		String content = "<root xmlns='http://springframework.org/spring-ws'><child/></root>";
 		StringResult result = new StringResult();
 		webServiceTemplate.sendSourceAndReceiveToResult(new StringSource(content), result);
-		applicationContext.close();
 
 		assertThat(Mailbox.get("server@example.com")).isEmpty();
 		assertThat(Mailbox.get("client@example.com")).hasSize(1);