Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Framework 5.3.

Browse Source 
Resolves #1172.
This commit is contained in:
Greg L. Turnquist
2020-12-01 14:49:06 -06:00
parent 61d0a8d718
commit 5a8a99345a
3 changed files with 2 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Jenkinsfile vendored
View File

@@ -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 {

74
pom.xml
View File

@@ -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>

4
spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java
View File

@@ -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);