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 @@
1.7.25
4.2.1
1.4.0
- 5.0.19.RELEASE
+ 5.3.1
5.0.9.RELEASE
1.7.8
1.6.0
@@ -240,7 +240,7 @@
spring-buildsnapshot
1.9.1
- 5.0.11.BUILD-SNAPSHOT
+ 5.3.2-SNAPSHOT
5.0.10.BUILD-SNAPSHOT
@@ -271,76 +271,6 @@
-
- springnext
-
- 1.9.1
- 5.1.2.RELEASE
- 5.1.1.RELEASE
-
-
-
- spring-snapshots
- Spring Snapshots
- https://repo.spring.io/snapshot
-
- true
-
-
-
- spring-milestones
- Spring Milestones
- https://repo.spring.io/milestone
-
- false
-
-
-
- spring-release
- Spring Releases
- https://repo.spring.io/release
-
- false
-
-
-
-
-
-
- springnext-buildsnapshot
-
- 1.9.1
- 5.1.3.BUILD-SNAPSHOT
- 5.1.2.BUILD-SNAPSHOT
-
-
-
- spring-snapshots
- Spring Snapshots
- https://repo.spring.io/snapshot
-
- true
-
-
-
- spring-milestones
- Spring Milestones
- https://repo.spring.io/milestone
-
- false
-
-
-
- spring-release
- Spring Releases
- https://repo.spring.io/release
-
- false
-
-
-
-
-
convergence
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 = "";
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);