Skip to content

Commit 5a8a993

Browse files
gregturngregturn
committed
Upgrade to Spring Framework 5.3.
Resolves #1172.
1 parent 61d0a8d commit 5a8a993

File tree

3 files changed

+2
-131
lines changed

3 files changed

+2
-131
lines changed

‎Jenkinsfile‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,6 @@ pipeline {
5050
sh "PROFILE=springnext,convergence ci/test.sh"
5151
}
5252
}
53-
stage("Test: springnext-buildsnapshot (jdk8)") {
54-
agent {
55-
docker {
56-
image 'adoptopenjdk/openjdk8:latest'
57-
args '-v $HOME/.m2:/root/.m2'
58-
}
59-
}
60-
steps {
61-
sh "PROFILE=springnext-buildsnapshot,convergence ci/test.sh"
62-
}
63-
}
6453
stage("Test: spring-buildsnapshot (jdk8)") {
6554
agent {
6655
docker {
@@ -83,28 +72,6 @@ pipeline {
8372
sh "PROFILE=distribute,java11,convergence ci/test.sh"
8473
}
8574
}
86-
stage("Test: springnext (jdk11)") {
87-
agent {
88-
docker {
89-
image 'adoptopenjdk/openjdk11:latest'
90-
args '-v $HOME/.m2:/root/.m2'
91-
}
92-
}
93-
steps {
94-
sh "PROFILE=springnext,java11,convergence ci/test.sh"
95-
}
96-
}
97-
stage("Test: springnext-buildsnapshot (jdk11)") {
98-
agent {
99-
docker {
100-
image 'adoptopenjdk/openjdk11:latest'
101-
args '-v $HOME/.m2:/root/.m2'
102-
}
103-
}
104-
steps {
105-
sh "PROFILE=springnext-buildsnapshot,java11,convergence ci/test.sh"
106-
}
107-
}
10875
stage("Test: spring-buildsnapshot (jdk11)") {
10976
agent {
11077
docker {
@@ -127,28 +94,6 @@ pipeline {
12794
sh "PROFILE=distribute,java11,convergence ci/test.sh"
12895
}
12996
}
130-
stage("Test: springnext (jdk15)") {
131-
agent {
132-
docker {
133-
image 'adoptopenjdk/openjdk15:latest'
134-
args '-v $HOME/.m2:/root/.m2'
135-
}
136-
}
137-
steps {
138-
sh "PROFILE=springnext,java11,convergence ci/test.sh"
139-
}
140-
}
141-
stage("Test: springnext-buildsnapshot (jdk15)") {
142-
agent {
143-
docker {
144-
image 'adoptopenjdk/openjdk15:latest'
145-
args '-v $HOME/.m2:/root/.m2'
146-
}
147-
}
148-
steps {
149-
sh "PROFILE=springnext-buildsnapshot,java11,convergence ci/test.sh"
150-
}
151-
}
15297
stage("Test: spring-buildsnapshot (jdk15)") {
15398
agent {
15499
docker {

‎pom.xml‎

Lines changed: 2 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<slf4j.version>1.7.25</slf4j.version>
111111
<smack.version>4.2.1</smack.version>
112112
<soap-api.version>1.4.0</soap-api.version>
113-
<spring.version>5.0.19.RELEASE</spring.version>
113+
<spring.version>5.3.1</spring.version>
114114
<spring-security.version>5.0.9.RELEASE</spring-security.version>
115115
<stax.version>1.7.8</stax.version>
116116
<sun-mail.version>1.6.0</sun-mail.version>
@@ -240,7 +240,7 @@
240240
<id>spring-buildsnapshot</id>
241241
<properties>
242242
<aspectj.version>1.9.1</aspectj.version>
243-
<spring.version>5.0.11.BUILD-SNAPSHOT</spring.version>
243+
<spring.version>5.3.2-SNAPSHOT</spring.version>
244244
<spring-security.version>5.0.10.BUILD-SNAPSHOT</spring-security.version>
245245
</properties>
246246
<repositories>
@@ -271,76 +271,6 @@
271271
</repositories>
272272
</profile>
273273

274-
<profile>
275-
<id>springnext</id>
276-
<properties>
277-
<aspectj.version>1.9.1</aspectj.version>
278-
<spring.version>5.1.2.RELEASE</spring.version>
279-
<spring-security.version>5.1.1.RELEASE</spring-security.version>
280-
</properties>
281-
<repositories>
282-
<repository>
283-
<id>spring-snapshots</id>
284-
<name>Spring Snapshots</name>
285-
<url>https://repo.spring.io/snapshot</url>
286-
<snapshots>
287-
<enabled>true</enabled>
288-
</snapshots>
289-
</repository>
290-
<repository>
291-
<id>spring-milestones</id>
292-
<name>Spring Milestones</name>
293-
<url>https://repo.spring.io/milestone</url>
294-
<snapshots>
295-
<enabled>false</enabled>
296-
</snapshots>
297-
</repository>
298-
<repository>
299-
<id>spring-release</id>
300-
<name>Spring Releases</name>
301-
<url>https://repo.spring.io/release</url>
302-
<snapshots>
303-
<enabled>false</enabled>
304-
</snapshots>
305-
</repository>
306-
</repositories>
307-
</profile>
308-
309-
<profile>
310-
<id>springnext-buildsnapshot</id>
311-
<properties>
312-
<aspectj.version>1.9.1</aspectj.version>
313-
<spring.version>5.1.3.BUILD-SNAPSHOT</spring.version>
314-
<spring-security.version>5.1.2.BUILD-SNAPSHOT</spring-security.version>
315-
</properties>
316-
<repositories>
317-
<repository>
318-
<id>spring-snapshots</id>
319-
<name>Spring Snapshots</name>
320-
<url>https://repo.spring.io/snapshot</url>
321-
<snapshots>
322-
<enabled>true</enabled>
323-
</snapshots>
324-
</repository>
325-
<repository>
326-
<id>spring-milestones</id>
327-
<name>Spring Milestones</name>
328-
<url>https://repo.spring.io/milestone</url>
329-
<snapshots>
330-
<enabled>false</enabled>
331-
</snapshots>
332-
</repository>
333-
<repository>
334-
<id>spring-release</id>
335-
<name>Spring Releases</name>
336-
<url>https://repo.spring.io/release</url>
337-
<snapshots>
338-
<enabled>false</enabled>
339-
</snapshots>
340-
</repository>
341-
</repositories>
342-
</profile>
343-
344274
<profile>
345275
<id>convergence</id>
346276

‎spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.junit.jupiter.api.extension.ExtendWith;
2424
import org.jvnet.mock_javamail.Mailbox;
2525
import org.springframework.beans.factory.annotation.Autowired;
26-
import org.springframework.context.support.GenericApplicationContext;
2726
import org.springframework.test.context.ContextConfiguration;
2827
import org.springframework.test.context.junit.jupiter.SpringExtension;
2928
import org.springframework.ws.client.core.WebServiceTemplate;
@@ -37,8 +36,6 @@ public class MailIntegrationTest {
3736

3837
@Autowired private WebServiceTemplate webServiceTemplate;
3938

40-
@Autowired private GenericApplicationContext applicationContext;
41-
4239
@AfterEach
4340
public void clearMailbox() {
4441
Mailbox.clearAll();
@@ -50,7 +47,6 @@ public void testMailTransport() throws Exception {
5047
String content = "<root xmlns='http://springframework.org/spring-ws'><child/></root>";
5148
StringResult result = new StringResult();
5249
webServiceTemplate.sendSourceAndReceiveToResult(new StringSource(content), result);
53-
applicationContext.close();
5450

5551
assertThat(Mailbox.get("[email protected]")).isEmpty();
5652
assertThat(Mailbox.get("[email protected]")).hasSize(1);

0 commit comments

Comments
 (0)